Commit Graph

842 Commits

Author SHA1 Message Date
155f3945a6 Progress on implementing unit teams 2018-03-15 00:19:05 -04:00
0b2a933faa Fixed startup crash, implemented basic player animations 2018-03-14 23:03:27 -04:00
01ba051c43 Fixed compilation errors 2018-03-14 20:15:25 -04:00
1cd30e9057 Mass-deletion of enemy code 2018-03-14 18:02:35 -04:00
a023c4fbac Fixed positions jumping with shader zoom-out 2018-03-14 14:13:06 -04:00
99c12595a9 Animated oil blocks as well 2018-03-14 12:57:30 -04:00
3056e9e79c Animated water 2018-03-13 22:34:52 -04:00
b822a02d41 Added cryofluid mixer, liquid rebalancing 2018-03-13 18:54:28 -04:00
539971b5a0 Changed oil extractor sprite 2018-03-13 11:38:56 -04:00
2a0d3b05d3 Added oil extractor 2018-03-13 01:16:15 -04:00
d1b51844e4 Changed laser transitions and effects 2018-03-13 00:16:40 -04:00
94b815b8ab Added groundwater pump, 3x3 solar panels 2018-03-12 22:02:52 -04:00
e67ddf9430 Added liquid silos, general liquid cleanup 2018-03-12 16:09:14 -04:00
9674ca5e87 Fixed some problems with Generators 2018-03-11 10:07:12 -04:00
5834dc9b2e Improved laser visuals 2018-03-11 09:46:57 -04:00
9d49c7d836 Implemented new display/icon system for power lasers/batteries 2018-03-10 23:32:13 -05:00
3ce7284fc5 Added batteries, 3x3 teleporter 2018-03-10 20:28:25 -05:00
bf6e33791d Added sorted unloader and new block group system 2018-03-10 15:22:34 -05:00
6a11f0dd8d Fixed improper drill time display 2018-03-10 13:30:33 -05:00
83452b1e36 Fixed many crashes, refactored block bars 2018-03-10 12:13:42 -05:00
d88a908e29 Changed plasma drill stats 2018-03-09 23:08:27 -05:00
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
89ca9ad213 Added generic drill class, cleanup of other subclasses 2018-03-09 20:57:12 -05:00
0310614392 Formatting 2018-03-09 19:32:33 -05:00
460496339b Un-broke multiblock breaking, tweaked build script 2018-03-09 17:51:01 -05:00
1c8b451ec8 Updated buildscript 2018-03-09 17:17:01 -05:00
689794cab5 Merge remote-tracking branch 'origin/master' 2018-03-09 17:11:10 -05:00
8743a60d02 Added in-game changelogs 2018-03-09 17:11:01 -05:00
2dc0a79263 Changed Wiki page text 2018-03-09 15:58:28 -05:00
387e912f6a Fixed typo 2018-03-09 15:01:16 -05:00
c46f1ec590 Added LiquidDrill 2018-03-09 10:09:32 -05:00
1d83e94ad6 Changed android UUID flow, again v33 2018-03-08 22:36:22 -05:00
3131e8c7e9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-08 22:34:26 -05:00
7d8b0f9941 Version modification 2018-03-08 22:32:34 -05:00
2a306d70be Fixed invalid web servers, teleporter clearing, desktop input misplace 2018-03-08 21:56:20 -05:00
b0086082d0 Fixed server crashes, android client error, ping system rewrite 2018-03-08 18:59:11 -05:00
d3313d6438 Fixed outstanding block type crashes 2018-03-08 16:59:39 -05:00
c611066791 Completely borked liquid/power/inventory system 2018-03-07 22:54:12 -05:00
a7096720d6 Updated uCore 2018-03-07 16:22:04 -05:00
4be5752b69 Version update 2018-03-07 15:26:28 -05:00
7425b5e367 Fixed bullets being able to hit their own players 2018-03-07 00:08:24 -05:00
565c3ed12f Updated to build 32, UI layout fixes 2018-03-07 00:04:37 -05:00
594c49ac91 Fixed server freezing on dispose(), socket in use exception 2018-03-06 23:34:33 -05:00
a8ce961268 Added server version display and compatibility checking 2018-03-06 23:18:34 -05:00
cd038ba5ad Fixed label font contamination 2018-03-06 22:28:54 -05:00
049cfa06c8 Changed system for UUID retrieval (desktop) 2018-03-06 22:25:48 -05:00
686e526e8c Added UUID banning 2018-03-06 19:22:50 -05:00
1e456d6560 Changed biomatter extractor texture 2018-03-06 17:46:24 -05:00
6a564f6693 Fixed some generator bugs, implemented laser drill properly 2018-03-05 23:26:53 -05:00
45a3be7642 Refactoring of generators, added solar panel, power drills 2018-03-05 22:12:33 -05:00