Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,976 Commits 4 Branches 180 Tags
d72de24942cc0c2d99fc3fffd230d59307b20b03
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 57ef7c823e WIP carbide 2021-11-05 08:47:05 -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 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
Anuken f1d1f935fb Fixed #6264 2021-10-29 22:36:24 -04:00
Anuken 338f7b840c Merge remote-tracking branch 'origin/master' 2021-10-29 20:16:41 -04:00
Anuken 828464a449 Why was this false 2021-10-29 20:16:37 -04:00
Anuken 8ec1976bd5 a 2021-10-29 20:14:43 -04:00
Anuken 0781a325c7 new core unit 2021-10-29 19:42:51 -04:00
Anuken c4a5a9aec0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-29 11:44:43 -04:00
Anuken 26045904f4 Fixed #6259 2021-10-29 11:29:38 -04:00
Anuken e16384adb3 Fixed #6259 2021-10-29 11:29:05 -04:00
Anuken ee8bcdfa50 gsd 2021-10-28 22:27:36 -04:00
Anuken fc900bec58 Merge remote-tracking branch 'origin/master' 2021-10-28 22:27:26 -04:00
Anuken 850a3cfb4e Fixed #6256 2021-10-28 22:27:22 -04:00
Anuken 58544e6a21 Beam nodes 2021-10-28 22:18:07 -04:00
Anuken cd909913ca turbine condenser 2021-10-27 19:41:12 -04:00
Anuken 3ee7ee7e79 WIP pressure turbine 2021-10-27 18:25:58 -04:00
Anuken 324c19e425 Merge remote-tracking branch 'origin/master' 2021-10-27 15:51:50 -04:00
Anuken be5c46beb8 Weapon layerOffset 2021-10-27 15:51:46 -04:00
Anuken a441c0bdcb Added deprecated chat method for mod compat 2021-10-27 12:17:24 -04:00
Anuken a4339b8b2b I should really rebind my aseprite zoom hotkeys 2021-10-27 10:24:13 -04:00
Anuken 7897ca9b97 Merge remote-tracking branch 'origin/master' 2021-10-27 10:13:59 -04:00
Anuken 4f957017ab Offset ping order 2021-10-27 10:13:49 -04:00
Anuken 7843785182 Comment 2021-10-27 09:34:38 -04:00
Anuken 705c85281c the vent 2021-10-26 20:34:45 -04:00
Anuken 0242fd25e1 klmnbsdfhx 2021-10-26 14:35:08 -04:00
Anuken 898bddee7c Merge remote-tracking branch 'origin/master' 2021-10-26 09:52:07 -04:00
Anuken 860e4a2999 Clamp pixelator FBO size 2021-10-26 09:52:02 -04:00
Anuken 471fdd61b1 klmnbsdfhx 2021-10-25 22:09:18 -04:00
Anuken bc0b9e9eb3 plasma bore 2021-10-25 20:51:45 -04:00
Anuken d01404d7ca intellij stop 2021-10-24 18:09:00 -04:00
Anuken f347ab4714 WIP core bastion 2021-10-24 18:08:07 -04:00
Anuken b6acf1af0a Comparator cleanup 2021-10-24 15:18:21 -04:00
Anuken b19691078f a 2021-10-24 15:14:43 -04:00
Anuken b18b4cdc90 Fixed #6222 2021-10-23 19:59:20 -04:00
Anuken aa6eb73de8 asd 2021-10-23 19:59:11 -04:00
Anuken 255f97dc56 breach 2021-10-23 17:32:58 -04:00
Anuken 79d90ca75d Merge remote-tracking branch 'origin/master' 2021-10-23 14:35:59 -04:00
Anuken b2b47353bf Fixed kotlin daemon randomly crashing 2021-10-23 14:35:54 -04:00
Anuken 693e420074 WIP breach turret 2021-10-23 14:35:37 -04:00
Anuken 553333b656 Beam drill bugfixes 2021-10-23 11:27:25 -04:00
Anuken 00e1d69348 Merge remote-tracking branch 'origin/master' 2021-10-23 09:26:35 -04:00
Anuken 88d1165909 Fixed #6220 / Fixed #6217 2021-10-23 09:26:30 -04:00
Anuken a7c78c4193 Bundle case fixes 2021-10-22 18:17:25 -04:00
Anuken 414f27a3b6 Merge remote-tracking branch 'origin/master' 2021-10-22 17:47:22 -04:00
Anuken 009eea1988 Cloud rendering overlap fix 2021-10-22 17:47:17 -04:00
Anuken 5d20f3a89b Merge remote-tracking branch 'origin/master' 2021-10-22 09:04:06 -04:00
Anuken 677e0e6f58 Fixed #6207 2021-10-22 09:04:00 -04:00
Anuken 4dc2164468 Merge remote-tracking branch 'origin/master' 2021-10-21 12:11:59 -04:00
Anuken e9612ce9f0 Fixed #6203 / Minor block requirement changes 2021-10-21 12:11:54 -04:00
Anuken 699364580e Added hiddenBuildItems rule 2021-10-20 16:25:24 -04:00