mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-31 01:44:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
866 Commits 4 Branches 160 Tags 2.3 GiB
4a7c722673
Commit Graph

694 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
13619a14dc Added custom cursors 2018-03-16 12:34:35 -04:00
Anuken
b9f565f5fc Minor cleanup of gamemode description PR 2018-03-16 00:39:39 -04:00
Anuken
ad2e2032e6 Added GroundUnitType, compile fixed 2018-03-16 00:30:41 -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
807c4688c2 Added Units class, removed writeString() from SaveFileVersion 2018-03-15 13:30:06 -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
95db857fb5 Updated uCore 2018-03-15 12:29:19 -04:00
Anuken
155f3945a6 Progress on implementing unit teams 2018-03-15 00:19:05 -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
a023c4fbac Fixed positions jumping with shader zoom-out 2018-03-14 14:13:06 -04:00
Anuken
99c12595a9 Animated oil blocks as well 2018-03-14 12:57:30 -04:00
Anuken
3056e9e79c Animated water 2018-03-13 22:34:52 -04:00
Anuken
b822a02d41 Added cryofluid mixer, liquid rebalancing 2018-03-13 18:54:28 -04:00
Anuken
d0b414b61d
Merge pull request #99 from Sonnicon/patch-1 
Leftover line of code.
 2018-03-13 15:31:22 -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
8fffc1cf9c Fixed misaligned desktop placing and breaking 2018-03-13 11:44:22 -04:00
Anuken
539971b5a0 Changed oil extractor sprite 2018-03-13 11:38:56 -04:00
Anuken
2a0d3b05d3 Added oil extractor 2018-03-13 01:16:15 -04:00
Anuken
d1b51844e4 Changed laser transitions and effects 2018-03-13 00:16:40 -04:00
Anuken
94b815b8ab Added groundwater pump, 3x3 solar panels 2018-03-12 22:02:52 -04:00
Sonnicon
1ab9961cfe
Leftover line of code. 2018-03-12 21:32:38 +00:00
Anuken
e67ddf9430 Added liquid silos, general liquid cleanup 2018-03-12 16:09:14 -04:00
Anuken
a0f85a8e4b Updated uCore/crash fix 2018-03-11 10:08:13 -04:00
Anuken
9674ca5e87 Fixed some problems with Generators 2018-03-11 10:07:12 -04:00
Anuken
5834dc9b2e Improved laser visuals 2018-03-11 09:46:57 -04:00
Anuken
9d49c7d836 Implemented new display/icon system for power lasers/batteries 2018-03-10 23:32:13 -05:00
Anuken
3ce7284fc5 Added batteries, 3x3 teleporter 2018-03-10 20:28:25 -05:00
Anuken
bf6e33791d Added sorted unloader and new block group system 2018-03-10 15:22:34 -05:00
Anuken
c9342d60d7 Fixed invalid FR bundle format 2018-03-10 14:03:23 -05:00
Anuken
6a11f0dd8d Fixed improper drill time display 2018-03-10 13:30:33 -05:00
Anuken
3fa9d5ed10 Updated FR bundle 2018-03-10 12:14:10 -05:00
Anuken
83452b1e36 Fixed many crashes, refactored block bars 2018-03-10 12:13:42 -05:00
Anuken
d88a908e29 Changed plasma drill stats 2018-03-09 23:08:27 -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
89ca9ad213 Added generic drill class, cleanup of other subclasses 2018-03-09 20:57:12 -05:00
Anuken
0310614392 Formatting 2018-03-09 19:32:33 -05:00
Anuken
460496339b Un-broke multiblock breaking, tweaked build script 2018-03-09 17:51:01 -05:00
Anuken
1c8b451ec8 Updated buildscript 2018-03-09 17:17:01 -05:00
Anuken
8743a60d02 Added in-game changelogs 2018-03-09 17:11:01 -05:00