Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,232 Commits 4 Branches 180 Tags
fd77dfd66dc34522de042c633b1dd9dc54c95f5e
Commit Graph

158 Commits

Author SHA1 Message Date
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
2108aab523 Added usage of OS.getAppDataDirectory() 2018-05-20 21:52:45 -04:00
Anuken
ed232248a2 Updated polish bundle 2018-05-20 16:05:24 -04:00
Anuken
fc320fb9ee Moved Platform.java, basic iOS image loading 2018-05-19 10:35:48 -07:00
Anuken
97cac33773 New build limits, recipe refactoring 2018-05-16 14:27:25 -07:00
Anuken
00e70cbb6a Massive amount of refactoring for local multiplayer, annotations 2018-05-12 07:30:23 -07:00
Anuken
959f756ff5 Local multiplayer initial commit 2018-05-11 07:59:10 -07:00
Anuken
ce2b73b737 Updated Bullet to use floats 2018-05-09 09:46:24 -07:00
Anuken
c931bbf107 Merged with master 2018-05-06 01:43:12 -04:00
Anuken
c1163a078a Updated translation bundles, added autowrap to menu 2018-05-05 13:18:21 -04:00
Anuken
5b8ee48600 Merge fixes 2018-04-28 16:29:23 -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
cbbd5ffc62 Renamed 'android' usage to 'mobile' 2018-04-28 11:22:35 -04:00
Anuken
8cc3a865e2 iOS fixes 2018-04-27 23:42:59 -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
Anuken
4261e6242c Implemented JPS badly 2018-04-20 19:55:41 -04:00
Anuken
7df232c65d Added block rubble, more liquid interaction 2018-04-19 19:06:52 -04:00
Anuken
e7a4ce2e19 Implemented entity pooling, effect saving, other fixes 2018-04-17 18:57:03 -04:00
Anuken
739e636a2c Added 'sleeping entity' optimization 2018-04-17 17:07:04 -04:00
Anuken
b020bf6816 Variable name refactorings / Untested entity sleeping 2018-04-17 09:31:41 -04:00
Anuken
98ec2dcf44 Implemented passable liquids 2018-04-07 23:24:33 -04:00
Anuken
05356776c5 Static effects / Better shell ejections / Implemented new cannon turret 2018-04-04 21:13:49 -04:00
Anuken
3418979f4d Content class reorganization, beginning work on unit factory 2018-03-25 13:12:32 -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
5323ef68ca Added ukranian lang, updated uCore, minor fixes 2018-03-19 20:46:40 -04:00
Anuken
172ac78466 New map format, completely broke loading or playing 2018-03-17 21:21:24 -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
ac4369ce3b Main menu rework [currently incomplete] 2018-03-16 17:00:11 -04:00
Anuken
155f3945a6 Progress on implementing unit teams 2018-03-15 00:19:05 -04:00
Anuken
01ba051c43 Fixed compilation errors 2018-03-14 20:15:25 -04:00
Anuken
1cd30e9057 Mass-deletion of enemy code 2018-03-14 18:02:35 -04:00
Anuken
8743a60d02 Added in-game changelogs 2018-03-09 17:11:01 -05:00
Anuken
2122d04f78 Completely new continuous collision system to prevent piercing 2018-03-03 01:14:14 -05:00
Anuken
a6737c5a54 Added german language 2018-02-23 14:49:33 -05:00
Anuken
edc124c90d Added better block debugging 2018-02-19 14:31:35 -05:00
Anuken
03079e9611 Updated uCore, recorder fix 2018-02-19 12:47:57 -05:00
Anuken
dbd84103cb Added variable to control block syncing 2018-02-17 23:39:31 -05:00
Anuken
b0f26a0cf4 Updated discord link to point to #rules 2018-02-11 16:20:36 -05:00
Anuken
1f4a72d459 Added completely new build version system 2018-02-08 23:41:07 -05:00
Anuken
714a4895bf Minor UI fixes 2018-02-07 23:25:03 -05:00
Anuken
2059fb39f7 Added version info to main menu 2018-02-07 21:52:00 -05:00
Anuken
f4227b99ff Added visual interpolation for slow tickrates 2018-02-07 17:56:39 -05:00
Anuken
460558bc87 Implemented toggling of multithreading 2018-02-07 14:47:39 -05:00
Anuken
ed34bbff5a Fixed language not switching to english 2018-02-04 11:30:15 -05:00
Anuken
a31c4b273d Various multiplayer tweaks 2018-02-03 12:20:36 -05:00
Anuken
608343b9d1 Added HTTP methods to Net 2018-02-03 00:57:42 -05:00
Anuken
5be256212c Fixed many crashes with B14, added color customization 2018-01-31 00:35:27 -05:00