Commit Graph
100 Commits
Author SHA1 Message Date
Anuken 0d197fa00c I have spent far too much time redrawing this stupid sprite 2021-11-19 21:56:02 -05:00
Anuken 7d849b7ea0 I have spent far too much time redrawing this stupid sprite 2021-11-19 20:32:09 -05:00
Anuken f3ace3a526 low effort large plasma bore 2021-11-18 16:22:53 -05:00
Anuken 7a73b3bc7a arc 2021-11-18 15:34:07 -05:00
Anuken 275f6eb32f Overflow duct 2021-11-18 14:47:33 -05:00
Anuken 6026beb397 Emanate impl / Rotation lock 2021-11-17 18:02:19 -05:00
Anuken 4d13b8df7a Surge crucible effects 2021-11-17 13:37:51 -05:00
Anuken 4567ee9a13 Test fixes / Building module presence saving 2021-11-17 10:58:36 -05:00
Anuken 29f8ebddb9 Sprite tweaks 2021-11-17 09:42:33 -05:00
Anuken 7798bb6702 Fixed packing issues 2021-11-16 23:10:49 -05:00
Anuken 82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken 25f44f86f8 Making DrawBlock more generic 2021-11-16 19:55:13 -05:00
Anuken 8d05b878d7 oxidation chamber implementation 2021-11-16 14:54:23 -05:00
Anuken 67f8cffca0 Liquid total bugfixes 2021-11-16 11:02:42 -05:00
Anuken eefcce5cf1 Better multi-liquid support / Reinforced pump progress 2021-11-16 10:25:59 -05:00
Anuken bf1909295e Electrolyzer finalization 2021-11-15 15:17:20 -05:00
Anuken 9663d1153f WIP electrolyzer + liquid fixes 2021-11-15 14:31:52 -05:00
Anuken 7103de8454 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-15 08:24:55 -05:00
Anuken d23813f328 Merge remote-tracking branch 'origin/master' 2021-11-15 08:24:47 -05:00
Anuken f586fd285c Fixed #6341 2021-11-15 08:24:39 -05:00
Anuken b99e18478f tweaks 2021-11-15 08:24:16 -05:00
Anuken 7acf53c509 multi-liquids consumers 2021-11-14 23:30:58 -05:00
Anuken 486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Anuken 70cf55f314 More slag 2021-11-14 10:12:47 -05:00
Anuken 3a6878ef60 T2 reinforced core unit 2021-11-13 10:40:55 -05:00
Anuken 2f0daa6fc4 Core cleanup / Turret draw class 2021-11-12 20:09:27 -05:00
Anuken 757977b7b9 Misc tweaks 2021-11-12 13:47:22 -05:00
Anuken 8da4e72e77 carbide crucible implementation 2021-11-12 11:07:15 -05:00
Anuken 51301a50cc HeatCrafter 2021-11-11 20:39:43 -05:00
Anuken a1107eae13 WIP heat reactor system 2021-11-11 18:52:51 -05:00
Anuken f3b2e4498d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	gradle.properties
2021-11-10 14:36:45 -05:00
Anuken c87bc11ad2 Core: Acropolis 2021-11-10 09:38:18 -05:00
Anuken da87726176 Core: Citadel 2021-11-09 20:20:44 -05:00
Anuken 501a65e9a3 reorganization 2021-11-09 12:57:14 -05:00
Anuken 34e74834fd Arc furnace recipe fix 2021-11-09 12:49:25 -05:00
Anuken 73f3fe31da Aegis core 2021-11-09 10:41:42 -05:00
Anuken 1f98383535 EEEEEEEEEEEEEENERGYYYYYYYYYY 2021-11-08 22:21:04 -05:00
Anuken 5f3b3ea559 H 2021-11-08 16:11:55 -05:00
Anuken 8964caf2aa Conduit bridge fixes 2021-11-08 16:09:43 -05:00
Anuken dffe90acff Directional liquid bridge 2021-11-08 12:06:55 -05:00
Anuken ce0e26f008 New liquid tanks/routers/contaienrs 2021-11-08 09:47:00 -05:00
Anuken af7c11c4b7 Merge remote-tracking branch 'origin/master' 2021-11-08 08:56:32 -05:00
Anuken 656bb34b68 Fixed #6314 2021-11-08 08:56:26 -05:00
Anuken d72de24942 WIP liquid blocks 2021-11-08 08:56:12 -05:00
Anuken 07d9feeb09 WIP reinforced conduits 2021-11-07 12:56:58 -05:00
Anuken 09a934385e "stuff" 2021-11-06 22:21:46 -04:00
Anuken da49328412 Stack router + Consistent item source + Item void flow 2021-11-06 16:31:42 -04:00
Anuken ed302d978c sprites 2021-11-05 19:50:47 -04:00
Anuken 059dc4b3bc Directional duct unloader 2021-11-05 19:45:27 -04:00
Anuken 52a88e7301 removed unused sprites 2021-11-05 16:41:27 -04:00
Anuken 6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Anuken 24ca434bae Take into account string length in client snapshots 2021-11-05 08:51:59 -04:00
Anuken 57ef7c823e WIP carbide 2021-11-05 08:47:05 -04:00
Anuken 189604474c These things exist now 2021-11-04 22:34:42 -04:00
Anuken 5fe8ed88a6 Fixed #6305 2021-11-04 22:30:19 -04:00
Anuken b553f5afc2 Merge remote-tracking branch 'origin/master' 2021-11-04 22:23:36 -04:00
Anuken 5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/type/UnitType.java
	gradle.properties
2021-11-04 19:39:16 -04:00
Anuken 9e68b0a72b Fixed #6304 2021-11-04 19:34:28 -04:00
Anuken c43ca32b7d cleanup 2021-11-04 19:33:38 -04:00
Anuken 3a70a26b93 Fixed 'spark' name conflict 2021-11-04 16:20:39 -04:00
Anuken 0effae1cd7 sprites 2021-11-04 15:42:25 -04:00
Anuken 240ffe1ca3 impact drill progress 2021-11-04 15:42:16 -04:00
Anuken 1a8a2c326e impact drill wip 2021-11-04 11:41:12 -04:00
Anuken 38f7d2dcd0 tungsten 2021-11-02 14:49:05 -04:00
Anuken 00f03d793f Bugfixes 2021-11-02 12:52:59 -04:00
Anuken 18f28ef224 Full BuildTower impl 2021-11-02 11:47:35 -04:00
Anuken bd30fee404 I guess people need to be yelled at for bad schematics 2021-11-02 10:39:22 -04:00
Anuken 00293d022c progress 2021-11-02 10:39:05 -04:00
Anuken b418afed63 Added WorldLabel entity for better server-side labels 2021-11-02 10:03:44 -04:00
Anuken 99d30b6351 Fixed #6287 2021-11-02 09:04:37 -04:00
Anuken cffd355045 BuildTurret save queue 2021-11-02 00:37:14 -04:00
Anuken c4dc7e91f3 Merge remote-tracking branch 'origin/master' 2021-11-02 00:24:33 -04:00
Anuken 48b9bbc317 Less thruster rotation 2021-11-02 00:24:28 -04:00
Anuken f108791379 BuildTurret AI, efficiency 2021-11-02 00:23:32 -04:00
Anuken 6fb2b3e920 WIP build tower 2021-11-02 00:13:25 -04:00
Anuken 00bea730e0 Cleanup 2021-11-01 21:18:00 -04:00
Anuken f5c09845ae Fixed #6282 2021-11-01 15:29:07 -04:00
Anuken a2d7f21518 block visibility tweaks 2021-11-01 15:26:30 -04:00
Anuken 72e3461745 indent 2021-11-01 15:15:13 -04:00
Anuken 8cabae1d46 Display infinity symbol for "unlimited" unit cap 2021-11-01 12:27:00 -04:00
Anuken fbc140e99d sprites 2021-11-01 12:23:44 -04:00
Anuken 5e249e50dd Beam tower 2021-11-01 11:46:32 -04:00
Anuken 779bab0344 Merge remote-tracking branch 'origin/master' 2021-11-01 09:41:39 -04:00
Anuken 0639e3eedb Power pickup bugfixes 2021-11-01 09:41:33 -04:00
Anuken ebf3e0fbd1 Cloud fix 2021-10-31 15:05:03 -04:00
Anuken 9c62d49eb4 Clear team blocks on derelict 2021-10-31 14:10:18 -04:00
Anuken a511e50a7b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-31 13:33:46 -04:00
Anuken e1bf1a1b92 Merge remote-tracking branch 'origin/master' 2021-10-31 13:28:05 -04:00
Anuken 5d93362741 Added support for env flags as arrays of json strings 2021-10-31 13:27:59 -04:00
Anuken e36c66c87b Duct router/sorter combo 2021-10-31 10:58:14 -04:00
Anuken 1a0bcfc745 Added unit build requirements to stats 2021-10-30 22:49:53 -04:00
Anuken 4a94d9f2b3 Remove mod count from crash 2021-10-30 22:30:00 -04:00
Anuken 312f4d8462 Only log enabled mods in crash 2021-10-30 22:24:48 -04:00
Anuken 859c2987f0 Merge remote-tracking branch 'origin/master' 2021-10-30 21:02:54 -04:00
Anuken a3f4dc7d1d Fixed #6272 2021-10-30 21:02:45 -04:00
Anuken 64a6f10338 Misc polish 2021-10-30 19:01:47 -04:00
Anuken 87a8453871 Beam node balance 2021-10-30 15:15:06 -04:00
Anuken abf13874fa Default loadout for erekir 2021-10-30 14:39:07 -04:00
Anuken c0d8ce2803 Fixed #6268 2021-10-30 09:18:06 -04:00
Anuken 37379b23ae a 2021-10-30 00:30:16 -04:00