Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
913 Commits 4 Branches 180 Tags
17bc8fd9ed2bba1d79cfc0647b8fc89d9ba4c4fd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 17bc8fd9ed Added sprites for all new crafting blocks, fixed seprator 2018-03-26 22:49:33 -04:00
Anuken 707e57e72d Added many new block types, changed land unit AI, bugfixes 2018-03-26 20:26:36 -04:00
Anuken f049706539 Updated uCore 2018-03-25 23:53:38 -04:00
Anuken 203e4bc0a4 Added ground unit factory support 2018-03-25 23:49:40 -04:00
Anuken d6cd197435 Implemented new build shader 2018-03-25 16:47:01 -04:00
Anuken 684b57d139 Flying unit factory implementation, bugfixes 2018-03-25 15:04:29 -04:00
Anuken 3418979f4d Content class reorganization, beginning work on unit factory 2018-03-25 13:12:32 -04:00
Anuken 59530909d6 Added terrain exporting and importing 2018-03-25 00:44:25 -04:00
Anuken 674d259df1 Editor crude multiblock support, indexed renderer Z support 2018-03-24 18:19:39 -04:00
Anuken 3af18094f7 Fixed power passback, adjusted laser colors to depend on transfer amount 2018-03-24 11:12:21 -04:00
Anuken 9e309c9592 Changed uranium to thorium, fixed faulty vault transfer issues 2018-03-24 00:53:26 -04:00
Anuken c73286358c Changed router passback function to take items into account 2018-03-23 23:00:08 -04:00
Anuken 967dab21bc Extra conflict fixes 2018-03-23 22:49:07 -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 2dd67c229c Made hand cursor display on configurable blocks 2018-03-23 22:42:40 -04:00
Anuken 7b3d60215b New power system implemented 2018-03-23 22:39:42 -04:00
Anuken d0783f352d Fixed input mouse jump glitch 2018-03-23 20:18:39 -04:00
Anuken 7d2fd514be Experimental power system changes 2018-03-23 20:17:35 -04:00
Anuken 2981dd857f Fixed some compile errors 2018-03-22 20:37:13 -04:00
Anuken 664b2c3ced Merge remote-tracking branch 'origin/master' 2018-03-22 19:40:09 -04:00
Anuken 357fc37a79 Fixed teleporter crash and color switch bug 2018-03-22 19:21:35 -04:00
Anuken 5b075ead9e Removed quartz and dirium, added plastic + dense alloy 2018-03-22 19:10:28 -04:00
Anuken e5656896e7 Added text 2018-03-21 20:50:00 -04:00
Anuken 238c589ad6 Unified turret outlines, fixed saves not working 2018-03-21 20:04:59 -04:00
Anuken 85988a2ff9 More map editor improvements, turret outline rendering 2018-03-21 16:45:05 -04:00
AnukenandGitHub 788f46cc55 Create LICENSE 2018-03-21 10:56:28 -04:00
AnukenandGitHub 4bafa32549 Delete LICENSE 2018-03-21 10:55:24 -04:00
Anuken 23e6f89eef Added very basic exporting, preview and a test map 2018-03-21 00:31:43 -04:00
Anuken e330b28e49 Optimized map renderer to no longer lag out on crappy phones 2018-03-20 22:15:44 -04:00
Anuken 1984921883 WIP inefficient mesh renderer 2018-03-20 21:55:11 -04:00
Anuken 68f8ef54ac Removing CacheBatch due to performance issues 2018-03-20 20:14:39 -04:00
Anuken d5493e6149 Fixed overlapping background on Android 2018-03-20 18:42:12 -04:00
Anuken 216b3969ed Minor admin bugfixes, made players wait 30 seconds after being kicked 2018-03-20 18:27:19 -04:00
Anuken 940b8b72f9 Basic implementation of editor 2018-03-19 23:09:38 -04:00
Anuken ba7be0293c Added changelog to 'about' dialog, for Android users 2018-03-19 20:54:34 -04:00
Anuken 5323ef68ca Added ukranian lang, updated uCore, minor fixes 2018-03-19 20:46:40 -04:00
Anuken 34f4eda1cf Fixed compile errors 2018-03-19 15:01:22 -04:00
Anuken 1b36325450 Fixed errors in everything except MapView 2018-03-18 23:24:12 -04:00
Anuken 0f8168324f Removed old maps, re-added map editor, broke compilation again 2018-03-18 22:30:33 -04:00
AnukenandGitHub 58ed9754a4 Merge pull request #103 from valoran-labs/chat-history 
Add chat history
 2018-03-18 21:03:25 -04:00
Anuken 172ac78466 New map format, completely broke loading or playing 2018-03-17 21:21:24 -04:00
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 3903750ba2 Fixed overly large hitboxes 2018-03-16 22:40:01 -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