Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
869 Commits 4 Branches 180 Tags
713875100b98883b0058d35ecf0fbc34451ca23e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 713875100b Everything has been broken 2018-03-17 12:22:21 -04:00
Anuken ba84bb82b4 Implemented a basic unit 2018-03-17 00:41:56 -04:00
Anuken ed0b796c5a Extra merge changes 2018-03-16 22:19:35 -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 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
AnukenandGitHub 4cb500277b Merge pull request #101 from rangzen/gamemode_help_dialog 2018-03-16 00:31:44 -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
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
AnukenandGitHub 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
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 689794cab5 Merge remote-tracking branch 'origin/master' 2018-03-09 17:11:10 -05:00
Anuken 8743a60d02 Added in-game changelogs 2018-03-09 17:11:01 -05:00
Anuken c46f1ec590 Added LiquidDrill 2018-03-09 10:09:32 -05:00
Anuken 1d83e94ad6 Changed android UUID flow, again 2018-03-08 22:36:22 -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 7d8b0f9941 Version modification 2018-03-08 22:32:34 -05:00
Anuken 2a306d70be Fixed invalid web servers, teleporter clearing, desktop input misplace 2018-03-08 21:56:20 -05:00
Anuken b0086082d0 Fixed server crashes, android client error, ping system rewrite 2018-03-08 18:59:11 -05:00
Anuken d3313d6438 Fixed outstanding block type crashes 2018-03-08 16:59:39 -05:00
Anuken c611066791 Completely borked liquid/power/inventory system 2018-03-07 22:54:12 -05:00
Anuken a7096720d6 Updated uCore 2018-03-07 16:22:04 -05:00
Anuken 4be5752b69 Version update 2018-03-07 15:26:28 -05:00
Anuken 7425b5e367 Fixed bullets being able to hit their own players 2018-03-07 00:08:24 -05:00
Anuken 565c3ed12f Updated to build 32, UI layout fixes 2018-03-07 00:04:37 -05:00
Anuken 594c49ac91 Fixed server freezing on dispose(), socket in use exception 2018-03-06 23:34:33 -05:00
Anuken a8ce961268 Added server version display and compatibility checking 2018-03-06 23:18:34 -05:00
Anuken cd038ba5ad Fixed label font contamination 2018-03-06 22:28:54 -05:00
Anuken 049cfa06c8 Changed system for UUID retrieval (desktop) 2018-03-06 22:25:48 -05:00
Anuken 686e526e8c Added UUID banning 2018-03-06 19:22:50 -05:00
Anuken 1e456d6560 Changed biomatter extractor texture 2018-03-06 17:46:24 -05:00
Anuken 6a564f6693 Fixed some generator bugs, implemented laser drill properly 2018-03-05 23:26:53 -05:00
Anuken 45a3be7642 Refactoring of generators, added solar panel, power drills 2018-03-05 22:12:33 -05:00
Anuken 1038f35883 Moved TODO to Trello board 2018-03-05 17:00:02 -05:00
Anuken a25b6a9952 Added biomatter extractor, sulfuric acid 2018-03-05 16:38:13 -05:00
Anuken b1263262de Fixed erratic turret movement 2018-03-05 14:12:06 -05:00
Anuken 25063ed1f0 Added new turret sprites 2018-03-05 14:10:52 -05:00
Anuken 292dbf101b More reorganization, implemented multiblock drills, API changes 2018-03-04 22:00:32 -05:00
Anuken 099d88ba7b Retexturing, changed mega repair turret size 2018-03-04 16:29:54 -05:00
Anuken 992fcc73b8 Added liquid tunnel recipe, fixed crashes/bugs 2018-03-04 00:17:30 -05:00
Anuken 6d0a0a0109 Random cleanup 2018-03-03 23:54:15 -05:00
Anuken 9b3c9aaea2 Storage blocks, organized sprites, liquid tunnel implementation 2018-03-03 23:46:51 -05:00
Anuken 7e75416519 Removed block sync 2018-03-03 18:09:35 -05:00
Anuken 41e4f87e06 Merge fixes 2018-03-03 18:08:35 -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 70b104c936 Cleanup of Tile 2018-03-03 18:03:15 -05:00
Anuken 3653135bb0 Fixed bugs with web version connections 2018-03-03 17:43:50 -05:00
Anuken 8c53cf4150 Updated to build 30 2018-03-03 11:48:30 -05:00
Anuken 2a41453bc8 Crash fixes 2018-03-03 11:31:17 -05:00
Anuken ba46dacfdc Removed servtesting code 2018-03-03 10:44:32 -05:00
Anuken 2122d04f78 Completely new continuous collision system to prevent piercing 2018-03-03 01:14:14 -05:00
Anuken 94f6c1b902 More debugging changes 2018-03-02 15:01:49 -05:00
Anuken e37cdf6040 Updated uCore 2018-03-02 09:11:02 -05:00
Anuken 827f72f595 Added canDump for vaults, better vault icon 2018-03-02 09:04:44 -05:00
Anuken 5faff6260e Implemented multiblock output, broke router chaining 2018-03-01 23:36:48 -05:00
Anuken 830c3dcec6 Merge remote-tracking branch 'origin/master' 2018-03-01 22:19:09 -05:00
Anuken 278d80a627 A variety of crash and bugfixes 2018-03-01 22:19:04 -05:00
AnukenandGitHub bb1d0e1f0d Merge pull request #96 from cloud9350/patch-1 
Fix typo mistake
 2018-03-01 22:13:30 -05:00
Anuken 41ee817d18 More server debugging changes. 2018-03-01 17:57:42 -05:00
Anuken 23457830ee Added more debugging info to server 2018-03-01 08:54:33 -05:00