Commit Graph
100 Commits
Author SHA1 Message Date
Anuken b2dca0a34f Merge branch 'optimizations' of https://github.com/Anuken/Mindustry 2018-10-21 21:50:14 -04:00
Anuken 3bd73961d7 Merged inventory saving/loading, item-based capacity 2018-10-21 21:46:12 -04:00
Anuken 67f574b5d8 Storage graph inventory sharing 2018-10-21 19:49:32 -04:00
Anuken f9b70a37aa Correct storage graphs 2018-10-21 17:20:08 -04:00
Anuken d4047e1413 Fixed crash 2018-10-21 17:03:51 -04:00
Anuken 80f5b4c3b7 Crashy storage graph implementation 2018-10-21 17:02:37 -04:00
Anuken 4668a6d8c0 Implemented sector state network sync 2018-10-20 18:41:05 -04:00
Anuken e6f076306f Merge branch 'rework-sectors' of https://github.com/Anuken/Mindustry 2018-10-20 17:36:56 -04:00
Anuken b73dc127a3 Fixed enemy base generation 2018-10-20 17:36:07 -04:00
Anuken 8c8a2311d6 Fixed sector clear not resetting 0,0 2018-10-20 16:04:13 -04:00
Anuken 0555fb22ca Fixed pump crash 2018-10-20 14:09:00 -04:00
Anuken 85cde62039 Fixed phase weaver blink / Fixed item image offset (again) 2018-10-20 13:53:25 -04:00
Anuken 46a2648d15 Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 13:50:30 -04:00
Anuken e55f6ecd6b Fixes to power system 2018-10-20 13:49:58 -04:00
Anuken c71fee3fed Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 13:21:05 -04:00
Anuken 4d6c25c9d3 Fixed flying units blocking construction 2018-10-20 13:20:35 -04:00
Anuken 6ed4e2d946 Improved random recipe selection 2018-10-20 13:19:47 -04:00
Anuken 6b4242478f Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 11:52:02 -04:00
Anuken ef5478279b Fixed 2 crashes 2018-10-20 11:48:59 -04:00
Anuken 62bb8bce1c Added missing imports 2018-10-20 11:44:19 -04:00
Anuken 83a5c3af8a Updated uCore with new threading changes 2018-10-20 11:41:10 -04:00
Anuken f78abd61d4 Merge remote-tracking branch 'origin/master' 2018-10-20 11:39:05 -04:00
Anuken 209c6fa1c1 Merged in better multithreading 2018-10-20 11:39:00 -04:00
Anuken 6e3c600a49 Crash fix 2018-10-20 11:36:05 -04:00
Anuken b1cda57174 Massively improved thread safety 2018-10-20 11:25:58 -04:00
Anuken 64bd306c6d Fixed crash 2018-10-20 09:02:29 -04:00
Anuken 6be49f898c Removed onFirstBegin() 2018-10-19 23:20:04 -04:00
Anuken 59bc73656f Save file refactor / Changed sector size 2018-10-19 22:46:53 -04:00
Anuken bed22f51b4 Updated sector unlocking 2018-10-19 16:23:01 -04:00
Anuken c1362a02f3 Removed all references to size 2018-10-19 13:48:08 -04:00
Anuken 859a3cbe6e Fixed Java 10-related crash 2018-10-19 12:58:53 -04:00
Anuken a6d82f44b3 Initial (broken) commit 2018-10-19 12:57:24 -04:00
Anuken cfa6d7080c Fixed font 2018-10-19 09:56:50 -04:00
Anuken 01ceedccd5 Updated bundles / Decreased water extractor power usage 2018-10-19 09:32:23 -04:00
Anuken ed28af7c73 Changed 'max power' to 'base power', re-scaled display stats of fuel 2018-10-19 09:31:33 -04:00
Anuken 74cf91f99e Fixed increased router storage / Fixed instant building after reload 2018-10-19 08:47:19 -04:00
Anuken 44479930df Fixed mobile mechs configuration / Block selection / Crash 2018-10-19 08:30:37 -04:00
Anuken cb1f54aac4 Removed wiki link 2018-10-18 23:00:18 -04:00
Anuken d68d2e9f30 Moved paused text details into bundle 2018-10-18 22:33:11 -04:00
Anuken 948c48ea23 Merge remote-tracking branch 'origin/master' 2018-10-18 21:57:19 -04:00
Anuken a9ccf6ca42 Updated travis config / Fixed flying mech land effect 2018-10-18 21:57:13 -04:00
Anuken dd2c71fe61 Removed sandbox from shuffle list / duplicate maps / mobile mech pickup 2018-10-18 18:20:07 -04:00
Anuken 3b58d57e5c Fixed unlocks not clearing / Fixed map editor not updating 2018-10-18 16:58:57 -04:00
Anuken cecf32e52e Fixed RTG generator not using items 2018-10-18 16:33:39 -04:00
Anuken 91a2dfab36 Fixed build block repair / Sectors in random maps / Editor unlocks 2018-10-18 16:31:15 -04:00
Anuken 5e5838a8c1 let me make this PAINFULLY CLEAR 2018-10-18 16:04:40 -04:00
Anuken 4d360bfb73 Bugfixes 2018-10-18 09:19:29 -04:00
Anuken e3001b614e Fixed pathfinding through liquids / Switched overlay render layer 2018-10-18 00:02:12 -04:00
Anuken 6ecdef02ab Block break visual cleanup 2018-10-17 22:10:56 -04:00
Anuken 36903eb749 Fixed mission onBegin() being called many times 2018-10-17 17:35:33 -04:00
Anuken f530c9514f Changed placement controls / Fixed complete sectors not resetting 2018-10-17 17:28:24 -04:00
Anuken fdffa77bc5 Fixed mobile targeting / Removed 'transfer speed' / Buffed large nodes 2018-10-17 17:09:26 -04:00
Anuken 245dd39a60 Potentially fixed targeting issues 2018-10-17 14:01:18 -04:00
Anuken 4614aacc02 Fixed chat not clearing 2018-10-17 13:54:34 -04:00
Anuken 64ccdab90c Removed extra trace info (for now) 2018-10-17 13:41:25 -04:00
Anuken 02286b0c4e Fixed player build indicators, power void 2018-10-17 10:31:59 -04:00
Anuken 8e952a550b Fixed: map mirror / crashes / mech pads / player list / mobile placement 2018-10-17 10:20:58 -04:00
Anuken a29f95194d Various fixes / Placement visual improvements 2018-10-17 00:36:43 -04:00
Anuken 0e5db49b93 Fixed missing blocks causing invalid map data error 2018-10-16 20:03:35 -04:00
Anuken a2c29c0937 Removed tutorial ore post-generation / Updated uCore 2018-10-16 19:31:06 -04:00
Anuken c318f05cfd Minor lightning visual change / Hid PvP mode on web 2018-10-16 17:46:44 -04:00
Anuken 789d200c24 Fixed typo in tutorial missions 2018-10-16 16:58:18 -04:00
Anuken 2dc4a9e044 Fixed abandoning sector not updating texture 2018-10-16 16:35:43 -04:00
Anuken 82577b91d5 2-column sector button layout 2018-10-16 13:10:06 -04:00
Anuken 8fd08a1574 Fixed infinite graph traversal for power blocks 2018-10-16 11:52:17 -04:00
Anuken 798ca929d6 Improved sector mission display 2018-10-15 23:20:47 -03:00
Anuken 7e4e58fb78 Updated android build tools version 2018-10-15 16:31:01 -04:00
Anuken 28b9975c75 Merge remote-tracking branch 'origin/master' 2018-10-15 16:20:44 -04:00
Anuken 5536ade389 Updated gradle to 4.10.2 2018-10-15 16:20:26 -04:00
Anuken b6beacf053 Input cleanup 2018-10-15 02:05:25 -03:00
Anuken 94b6c133f4 Various resprites 2018-10-14 18:39:24 -04:00
Anuken 949d7bed89 Fixed item images having incorrect underlines 2018-10-14 16:05:39 -04:00
Anuken 81ce12a38c Added random PvP/Waves map generation 2018-10-14 13:24:32 -04:00
Anuken eba65b2934 Fixed units pathfinding to nonexistent cores 2018-10-14 11:57:37 -04:00
Anuken c7f5b7fca1 Minified gamemode table 2018-10-14 10:41:17 -04:00
Anuken f670d522bf PvP merge 2018-10-14 10:01:50 -04:00
Anuken a02f7f46c3 Merge remote-tracking branch 'origin/master' 2018-10-14 09:57:31 -04:00
Anuken 4b7f254e17 Added 2x2 container storage block 2018-10-14 09:57:28 -04:00
Anuken 9b42be560d Fixed bugs with team assignment 2018-10-14 09:41:19 -04:00
Anuken 4eb2c1f646 PvP autohost 2018-10-13 23:30:05 -04:00
Anuken 5f89d8588d Added 'abandon sector' button 2018-10-13 23:07:57 -04:00
Anuken 404cbf9b4a Removed menu setting 2018-10-13 22:52:58 -04:00
Anuken 0aabc09b82 Made game-overs remote events 2018-10-13 21:58:17 -04:00
Anuken a5ebeadd95 Merge remote-tracking branch 'origin/master' 2018-10-13 17:48:04 -04:00
Anuken 9e188aaf03 Fixed place area being deselected near map edges 2018-10-13 17:47:58 -04:00
Anuken 870f5caca9 PvP game over condition 2018-10-13 17:33:23 -04:00
Anuken 28b4ddfc72 PvP game over condition and message 2018-10-13 17:31:38 -04:00
Anuken 81c7e63994 Added 'waiting for players' message 2018-10-13 16:03:21 -04:00
Anuken f8d0682810 Added warnings for missing enemy cores 2018-10-13 15:49:18 -04:00
Anuken 175d6b1fc5 Improved difficulty balance 2018-10-13 12:39:07 -04:00
Anuken 1cd8e8a097 Improved server discovery 2018-10-13 12:21:11 -04:00
Anuken ed95e38257 Fixed breakable cores / Fixed sector sandbox / Fixed ship warp speed 2018-10-13 11:33:49 -04:00
Anuken cab585225d Removed unused 'pad' recipe modifier 2018-10-13 10:54:05 -04:00
Anuken 3688dde5e5 Merged mobile mechs 2018-10-13 10:52:48 -04:00
Anuken ae6a5b2512 Made PvP a selectable mode 2018-10-13 10:50:22 -04:00
Anuken 6a5e31c908 Crash fix 2018-10-13 09:43:31 -04:00
Anuken 8bda5e16cd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/assets/bundles/bundle_fr.properties
2018-10-13 08:59:15 -04:00
Anuken d70d3d95f0 Bundles updated 2018-10-13 08:58:41 -04:00
Anuken c526997aba Fixed coal in core / Fixed build events not triggering 2018-10-13 08:49:54 -04:00
Anuken c0e3a1f3ef Fixed minor TPS display / block breakage bugs 2018-10-12 22:41:48 -04:00