mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-11 07:39:39 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,346 Commits 4 Branches 160 Tags 2.1 GiB
b609b5909b
Commit Graph

144 Commits

Author SHA1 Message Date
Anuken
b609b5909b Implemented elevation in editor and mechanically in-game 2018-06-11 15:18:25 -04:00
Anuken
3fe7e4e8da mess cleanup 2018-06-02 00:47:22 -04:00
Anuken
1bc4b16d38 Added map import button 2018-06-01 14:45:55 -04:00
Gureumi
8f283b2226
Update bundle_ko.properties 
Early update language file!
may be?
 2018-05-31 20:53:38 +09:00
Anuken
fae7bfa8c5 Dynamic layout for unlocking blocks 2018-05-30 22:41:52 -04:00
Anuken
e9e7d2e289 Place menu scrolling, fixed some settings menu bugs 2018-05-30 18:32:01 -04:00
Anuken
9693de8885 Added new screen for managing and viewing maps, many editor fixes 2018-05-23 21:40:59 -04:00
Anuken
fd77dfd66d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Logic.java
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/core/NetServer.java
#	core/src/io/anuke/mindustry/core/UI.java
#	core/src/io/anuke/mindustry/editor/MapSaveDialog.java
#	core/src/io/anuke/mindustry/input/GestureHandler.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
#	gradle/wrapper/gradle-wrapper.properties
#	server/src/io/anuke/mindustry/server/ServerControl.java
 2018-05-23 10:36:59 -04:00
Anuken
c920fa6740 Added all export/import menus, fixed bad icons for editor blocks 2018-05-22 23:56:29 -04:00
Anuken
b20f026c7b Added dialogs for saving/loading maps directly, work on web support 2018-05-22 17:28:21 -04:00
Anuken
f0fa126e7b Changed map edit menu, added map info dialog 2018-05-22 14:16:12 -04:00
Anuken
2d65c9734c Added IndexedRenderer rotation, map editor rotation 2018-05-21 23:00:40 -04:00
Anuken
ed232248a2 Updated polish bundle 2018-05-20 16:05:24 -04:00
Anuken
e215324292 Updated spanish bundle, added missing formatted text 2018-05-20 15:50:01 -04:00
Anuken
8d66d43a98 Some more sharing revisions 2018-05-19 20:19:47 -07:00
Anuken
adfebdb3f6
Merge pull request #122 from Prosta4okua/patch-1 
Update bundle_ru.properties[Work in progress]
 2018-05-19 15:58:41 -06:00
Prosta4okua
dbe06b0a93
Update bundle_ru.properties 2018-05-19 22:50:50 +03:00
Prosta4okua
b2ea733b45
Update bundle_ru.properties 2018-05-19 21:49:29 +03:00
Anuken
cf1148e7c8 iOS plist fixes, re-added music 2018-05-16 11:06:15 -07:00
Anuken
ca24e64c42 Implemented local multiplayer fully 2018-05-13 20:48:44 -07:00
Gureumi
cbdf252fe6
fix missing tranlate lang and update about info 2018-05-09 20:33:53 +09:00
Prosta4okua
665f0ee03e
Update bundle_ru.properties 2018-05-06 09:45:17 +03:00
Anuken
c931bbf107 Merged with master 2018-05-06 01:43:12 -04:00
Anuken
f7e0dc4818 Changed music back 2018-05-05 13:50:32 -04:00
Anuken
b496f51afc Added turk bundle, updated wrapping, added fastshoot kick message 2018-05-05 13:45:04 -04:00
Anuken
c1163a078a Updated translation bundles, added autowrap to menu 2018-05-05 13:18:21 -04:00
Gureumi
3dd1fc2efe
Update translate file to Mindustry 4.0 2018-05-04 13:13:12 +00:00
Anuken
d0a44906fe API changes for getting traces and upgrades 2018-04-28 19:52:38 -04:00
Anuken
e5f6b7f66c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-28 16:28:58 -04:00
Anuken
941ebd39bf Added new royalty-free music 2018-04-28 13:44:46 -04:00
Anuken
cbbd5ffc62 Renamed 'android' usage to 'mobile' 2018-04-28 11:22:35 -04:00
Anuken
91c3cb93f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/assets/bundles/bundle_es_LA.properties
#	core/assets/version.properties
 2018-04-25 20:45:39 -04:00
Anuken
ff6dc98bbe Added spanish bundle 2018-04-23 21:47:39 -04:00
Anuken
1a9d701d32 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java
 2018-04-21 18:47:43 -04:00
Anuken
90716ebaad Added italian bundle 2018-04-21 18:32:56 -04:00
Commodore64x
0e50fbf3f2 Fixed rendering and other issues. 2018-04-16 09:08:44 +10:00
Commodore64x
c17b34c70d Added Placement Preview 2018-04-15 19:40:22 +10:00
Anuken
1789fadbf6 Merged with master 2018-04-08 10:46:48 -04:00
Anuken
59530909d6 Added terrain exporting and importing 2018-03-25 00:44:25 -04:00
Anuken
8eb2a13efd Added host/join info text 2018-03-24 12:25:56 -04:00
Anuken
9e309c9592 Changed uranium to thorium, fixed faulty vault transfer issues 2018-03-24 00:53:26 -04:00
Anuken
4e9d1d348e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-23 22:48:51 -04:00
Anuken
216b3969ed Minor admin bugfixes, made players wait 30 seconds after being kicked 2018-03-20 18:27:19 -04:00
Anuken
5323ef68ca Added ukranian lang, updated uCore, minor fixes 2018-03-19 20:46:40 -04:00
Anuken
4a7c722673 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-16 22:18:58 -04:00
Anuken
5846af9453 Finished new menu layout, added submenu for playing 2018-03-16 19:36:44 -04:00
Anuken
ac4369ce3b Main menu rework [currently incomplete] 2018-03-16 17:00:11 -04:00
Anuken
b9f565f5fc Minor cleanup of gamemode description PR 2018-03-16 00:39:39 -04:00
Cedric L'homme
4dff6d834a add an info button for descriptions of the game mode. 2018-03-15 21:18:06 +01:00
Anuken
b4ec2ccb90 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-15 12:57:03 -04:00