Commit Graph
100 Commits
Author SHA1 Message Date
AnukenandGitHub e47836cc64 Merge branch 'master' into patch-2 2019-06-07 14:16:00 -04:00
AnukenandGitHub f8f48f1c88 Merge pull request #491 from MrPickles14/patch-1
Update bundle_fr.properties
2019-06-07 14:14:29 -04:00
AnukenandGitHub 95e8a603a5 Merge pull request #489 from Kieaer/patch-5
bundle_ko
2019-06-07 14:14:03 -04:00
AnukenandGitHub c400fd88f3 Merge pull request #487 from beito123/master
Update Japanese translations
2019-06-07 14:13:06 -04:00
AnukenandGitHub 095d90fd22 Merge pull request #484 from Deyvid67/patch-2
Update bundle_pt_BR.properties
2019-06-07 14:11:47 -04:00
AnukenandGitHub 797be92ddd Merge pull request #482 from laohuaji233/patch-7
Update bundle_zh_CN.properties
2019-06-07 14:11:32 -04:00
AnukenandGitHub 7f23bd694c Merge pull request #480 from Prosta4okua/patch-1
Update bundle_uk_UA.properties
2019-06-07 14:11:15 -04:00
Anuken 1cbf8b960a Added clarifying mode descriptions 2019-06-07 14:10:23 -04:00
Anuken c8ce195522 Reverted buffers / Added Dexapnow's fixed zone maps [untested] 2019-06-07 14:07:32 -04:00
Anuken 4458ae042e hhh 2019-06-07 11:18:06 -04:00
Anuken 1c3d7c1c73 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-06-07 10:25:14 -04:00
Anuken cb3bbd169f Map temporarily removed 2019-06-07 08:57:51 -04:00
Anuken ab107bfc0d Additional default wave tweaks 2019-06-07 08:49:41 -04:00
Anuken d0b5b49bf8 Fixed many various bugs 2019-06-06 23:29:21 -04:00
Anuken 1b4b1d5c9f Maps updated / 100 starting copper in custom maps 2019-06-06 22:45:25 -04:00
Anuken aee800ab7a Changed turret outlines / Wall block tweaks 2019-06-06 21:18:54 -04:00
Anuken 895b46307a Sprite tweaks 2019-06-06 18:47:53 -04:00
Anuken d300d45f22 Fixed unit factory sprites 2019-06-06 15:38:19 -04:00
Anuken dd05f5278c Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-06-06 12:05:46 -04:00
Anuken 1897008c72 Pump sprites 2019-06-06 10:27:11 -04:00
Anuken 3942c6cd55 Even more sprites cleaned up 2019-06-06 00:28:09 -04:00
Anuken f0f7b5aaf7 Updated sprites 2019-06-05 21:29:34 -04:00
Anuken 80bdaa1edc Cleanup 2019-06-04 23:30:07 -04:00
Anuken 39acb224d1 Merged replacement sprites. Scaling is now disabled by default. 2019-06-04 22:54:01 -04:00
Anuken f51d565db8 Darker decals / map tweaks 2019-06-04 22:06:17 -04:00
Anuken d608cf6536 Fixed player respawning at editor location 2019-06-04 20:52:58 -04:00
Anuken 0b49bd1985 Pathfinding tweak / Doors now update pathfinding 2019-06-04 17:10:45 -04:00
Anuken fce69005a9 Islands map 2019-06-03 22:09:43 -04:00
Anuken b73420b156 Added map assets 2019-06-02 23:15:36 -04:00
Anuken fb863cb39b Editor bugfixes / Median filter 2019-06-02 17:45:44 -04:00
Anuken 8247ff15ed Fixed invalid phase weaver shader 2019-06-02 10:42:44 -04:00
Anuken af8db9062c Balance 2019-06-01 23:16:59 -04:00
Anuken 88d5e1cca8 Fixed low-FPS pad orbiting 2019-06-01 15:16:10 -04:00
Anuken 57544e615f Removed event inheritance 2019-06-01 14:24:52 -04:00
Anuken 61a92d55ae Balance / UUID logging in d/c messages 2019-05-31 19:55:09 -04:00
Anuken 940965f03d .mmap file importing / Better exception parsing 2019-05-31 10:24:51 -04:00
AnukenandGitHub 30a254e9be decoupling editor/MapEditor from editor/OperationStack (#504) 2019-05-31 09:11:16 -04:00
Anuken 581782af28 Mass driver power fix / Bugfixes 2019-05-31 09:10:37 -04:00
Anuken 72cad1409f Bugfixes / Balance of fuse 2019-05-30 23:05:15 -04:00
Anuken e7e4985761 Fixed maps converting improperly / Minor balancing 2019-05-30 20:47:47 -04:00
Anuken a3454e50d7 Merge 2019-05-30 00:27:05 -04:00
Anuken 75b8f5e543 Properly rounded sprites for 'source/sorter' blocks 2019-05-29 23:42:03 -04:00
Anuken 1a0b22ef15 Overflow gate delay 2019-05-29 22:57:32 -04:00
Anuken bc78d1a561 Balancing 2019-05-29 22:29:49 -04:00
Anuken 00b953a04e Spawnpoint repultion 2019-05-29 21:41:56 -04:00
Anuken bd134bf9c9 Cleanup 2019-05-28 09:24:13 -04:00
Anuken 752267c521 Fixed many various map bugs 2019-05-26 16:46:44 -04:00
Anuken 34635e3460 Fixed fire not syncing 2019-05-26 11:03:49 -04:00
Anuken ba0b4513f1 New tile transitions 2019-05-25 23:56:21 -04:00
Anuken 4764808450 Merge remote-tracking branch 'origin/master' 2019-05-25 21:10:47 -04:00
Anuken c66fd67510 Fixed #500 / Fixed units not appearing in edited maps 2019-05-25 21:10:42 -04:00
Anuken 4242100c53 More descriptive entity load errors 2019-05-25 12:01:55 -04:00
Anuken 32adcc3676 Merge remote-tracking branch 'origin/master' 2019-05-22 21:07:13 -04:00
Anuken 80c26606f0 Fixed unit duplication 2019-05-22 21:07:08 -04:00
Anuken 72638fc215 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-05-21 13:19:27 -04:00
Anuken bdb7f522fb Balancing / Item tweaks 2019-05-19 17:50:11 -04:00
Anuken 2461331e32 Fixed wave turret being sporadic / Fixed unnecessary fluid usage 2019-05-19 09:09:22 -04:00
Anuken 3464f40da3 Fixed unit pads, rule selection, gameover state 2019-05-18 10:02:36 -04:00
Anuken 3b2b79d539 Buffed impact reactor 2019-05-17 18:10:03 -04:00
Anuken 8616fc6b05 Made invalid legacy maps be properly discarded 2019-05-16 17:15:22 -04:00
Anuken 9e9c001422 Cleanup 2019-05-16 15:16:17 -04:00
Anuken 93bbd34055 ...except overflow gates 2019-05-16 11:44:02 -04:00
Anuken cac953e812 Buffers for everything 2019-05-16 11:43:02 -04:00
Anuken aeb3662414 Bugfixes 2019-05-15 17:40:31 -04:00
Anuken 2888e87bb8 Map conversion fix 2019-05-14 16:38:49 -04:00
Anuken 094ebb8020 Removed some TODOs 2019-05-14 13:18:05 -04:00
Anuken 54ad52edc2 Merging of map saves 2019-05-14 11:54:22 -04:00
Anuken 0e869f3cb5 Fixed rules not saving / Memory usage reduction 2019-05-14 11:48:14 -04:00
Anuken 4d40af6ac0 More helpful in-game edit button 2019-05-13 11:47:38 -04:00
Anuken 79a2f31056 Fixed unit tests 2019-05-13 11:32:57 -04:00
Anuken b2341bf75c Added map default rule editing 2019-05-13 11:31:25 -04:00
Anuken c4c4b473e5 Server cleanup 2019-05-13 00:43:06 -04:00
Anuken 6e26ccf25d Removed unnecessary inheritance 2019-05-12 23:50:33 -04:00
Anuken 83bfad3546 Fixed server compilation 2019-05-12 20:01:59 -04:00
Anuken 90f6fff1ae Layout fixes 2019-05-12 19:55:26 -04:00
Anuken 52f2b52990 Somewhat functional rule selection 2019-05-12 19:43:23 -04:00
Anuken 48ed4b0e49 Fixed startup crash / Fixed editor rule issue 2019-05-12 12:51:25 -04:00
Anuken c3c609e7b9 Fixed invisible enemies 2019-05-12 12:38:40 -04:00
Anuken 6cd8fa6b0c Removed unused support library dependency 2019-05-12 12:16:46 -04:00
Anuken ffb6d398d7 Layout fixes 2019-05-12 12:00:19 -04:00
Anuken 52674b4668 Mobile diagonal toggle / Cancel button moved 2019-05-12 11:19:31 -04:00
Anuken 4ae2370137 New WIP custom map selection 2019-05-12 10:32:08 -04:00
Anuken e5d19a9819 Entity placement/removal 2019-05-11 21:42:06 -04:00
Anuken dd75d88d2f Unit creation, team switch 2019-05-11 12:32:13 -04:00
Anuken 65ea01218a Fixed core-less editor gameover, respawning 2019-05-11 00:58:13 -04:00
Anuken 7a2234cd25 Tweaks to improve in-game editing 2019-05-11 00:37:29 -04:00
Anuken 11ede2756e Functional in-game map edits and loading 2019-05-10 20:25:09 -04:00
Anuken 3e51fab387 In-game editing (broken) 2019-05-10 19:13:55 -04:00
Anuken 962f413421 Cleanup 2019-05-10 16:16:21 -04:00
Anuken ae6c938abb Merge remote-tracking branch 'origin/master' 2019-05-10 16:02:15 -04:00
Anuken 68faae69c5 Fixed compilation errors / Re-added basic trace dialog 2019-05-10 16:02:05 -04:00
Anuken d6be07f1b8 Fixed crash 2019-05-10 13:42:04 -04:00
Anuken 064a012b25 Map previews functional 2019-05-10 12:57:45 -04:00
Anuken d26f533111 Basic non-in-game editor functionality 2019-05-10 00:01:48 -04:00
Anuken 69575dbab3 Fixed multiblocks not drawing 2019-05-09 18:10:12 -04:00
Anuken 9f4a430412 Fixed tests 2019-05-09 14:39:52 -04:00
Anuken 23843be981 More bugfix stuff 2019-05-09 12:57:00 -04:00
Anuken 486e3ffc0a Actual map conversion, loading of saves 2019-05-09 10:53:52 -04:00
Anuken 8127e5a66f Made save format actually functional, many things still broken 2019-05-08 23:16:08 -04:00
Anuken 53167a3b52 Map conversion code 2019-05-07 17:30:37 -04:00