Commit Graph

290 Commits

Author SHA1 Message Date
Anuken
4a7c722673 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-16 22:18:58 -04:00
Anuken
714fdc751a Added test unit type 2018-03-16 21:48:44 -04:00
Anuken
e2effa1c5d Minor scroll fix 2018-03-16 21:28:03 -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
Anuken
52c0a8e573 Fixed compile errors, unitification 2018-03-15 21:42:23 -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
2037ebaaba Fixed many placement mode bugs 2018-03-15 14:25:45 -04:00
Anuken
b4ec2ccb90 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-15 12:57:03 -04:00
Anuken
ae89a004a6 Fixed port bug, possible random disconnect fix 2018-03-15 12:53:47 -04:00
Anuken
0b2a933faa Fixed startup crash, implemented basic player animations 2018-03-14 23:03:27 -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
f056edded7 Fixed getting oldest version instead of latest one 2018-03-13 14:30:46 -04:00
Anuken
ea9b3cc7dd Fixed some minor bugs with teleporters an changelog 2018-03-13 13:40:57 -04:00
Anuken
e67ddf9430 Added liquid silos, general liquid cleanup 2018-03-12 16:09:14 -04:00
Anuken
9d49c7d836 Implemented new display/icon system for power lasers/batteries 2018-03-10 23:32:13 -05:00
Anuken
c9342d60d7 Fixed invalid FR bundle format 2018-03-10 14:03:23 -05:00
Anuken
83452b1e36 Fixed many crashes, refactored block bars 2018-03-10 12:13:42 -05:00
Anuken
9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/version.properties
2018-03-09 20:58:21 -05:00
Anuken
8743a60d02 Added in-game changelogs 2018-03-09 17:11:01 -05:00
Anuken
3131e8c7e9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-08 22:34:26 -05:00
Anuken
c611066791 Completely borked liquid/power/inventory system 2018-03-07 22:54:12 -05:00
Anuken
565c3ed12f Updated to build 32, UI layout fixes 2018-03-07 00:04:37 -05:00
Anuken
a8ce961268 Added server version display and compatibility checking 2018-03-06 23:18:34 -05:00
Anuken
686e526e8c Added UUID banning 2018-03-06 19:22:50 -05:00
Anuken
292dbf101b More reorganization, implemented multiblock drills, API changes 2018-03-04 22:00:32 -05:00
Anuken
9b3c9aaea2 Storage blocks, organized sprites, liquid tunnel implementation 2018-03-03 23:46:51 -05:00
Anuken
6de48b4535 Merge branches '4.0' and 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts:
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/world/Tile.java
2018-03-03 18:06:57 -05:00
Anuken
94f6c1b902 More debugging changes 2018-03-02 15:01:49 -05:00
Anuken
d3ec50825e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
2018-02-27 19:58:34 -05:00
Anuken
828dd78611 Fixed some GWT bugs and errors 2018-02-26 23:31:29 -05:00
Anuken
bbe3115186 Updated to 3.4 2018-02-26 22:13:36 -05:00
Anuken
17b17222b6 Fixed some admin bugs 2018-02-26 22:05:07 -05:00
Anuken
00c204b589 Made break mode get set to 'none' when collapsing 2018-02-26 19:10:15 -05:00
Anuken
13e592a758 Cleanup 2018-02-26 18:42:06 -05:00
Anuken
32791b4baa Added player tracing tools, fixed some bugs 2018-02-26 17:20:05 -05:00
Anuken
7429d029f3 Added admins with in-game icons and permissions; untested 2018-02-25 23:44:35 -05:00
Anuken
9f5f6ae382 Security changes: placement verification, banning, unfinished admins 2018-02-25 22:32:12 -05:00
Anuken
9985a19e6a Better net error messages, bugfixes, new command handler 2018-02-23 21:42:05 -05:00
Anuken
de340255fe Updated to build 28 2018-02-23 15:11:42 -05:00
Anuken
2adacccf7d Fixed a few more crashes 2018-02-23 15:01:32 -05:00
Anuken
a6737c5a54 Added german language 2018-02-23 14:49:33 -05:00
Anuken
07aab732b7 Better tunnel debugging, improved keybind dialog controller info 2018-02-23 13:59:21 -05:00
Anuken
1fdffa8be5 Added splitter, power smelter, new sections 2018-02-21 22:29:15 -05:00
Anuken
1397ed2d06 Possible junction clog fix 2018-02-19 20:13:45 -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
008889966f Fixed incorrect mode selection, updated TODO 2018-02-14 17:50:44 -05:00