Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,586 Commits 4 Branches 180 Tags
8ba6d4b2aa3a089b8722f6eb8d5a9fbd3c24fdb9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken b47a8be8cf Merge remote-tracking branch 'origin/master' 2022-06-24 21:18:10 -04:00
Anuken cc26a0eeb3 WIP objective editor progress 2022-06-24 21:18:04 -04:00
Anuken be61b45d08 WIP point laser turret 2022-06-23 20:57:22 -04:00
Anuken ac47d22ea1 Map resize dialog shift options 2022-06-23 17:10:44 -04:00
Anuken d4a33c6d51 Homing bullet targeting fix 2022-06-23 17:00:24 -04:00
Anuken e682a0f1d3 WIP/unfinished map 2022-06-23 16:55:16 -04:00
Anuken a39fe2cb37 WIP map info dialog changes 2022-06-23 16:32:37 -04:00
Anuken 342a7abf9b Misc tweaks 2022-06-23 14:55:08 -04:00
Anuken 4ba5be8d31 Misc improvements / Latum death unit spawning 2022-06-23 13:16:25 -04:00
Anuken 226d0a9f32 Merge remote-tracking branch 'origin/master' 2022-06-22 18:31:04 -04:00
Anuken 1a98a66f23 Batched building health update packet 2022-06-22 18:30:59 -04:00
Anuken 2de706cc6d Fixed #7058 2022-06-22 10:33:06 -04:00
Anuken fdc7f0468f Fixed #7057 2022-06-22 10:26:32 -04:00
Anuken 76735b01f7 Somewhat more dangerous neoplasm 2022-06-22 03:25:35 -04:00
Anuken 8ed878b1b3 Aligned reconstructor unit labels 2022-06-21 10:49:30 -04:00
Anuken e47af0c33f WIP/unfinished turret sprites 2022-06-21 10:03:38 -04:00
Anuken 1a47384ac6 Merge remote-tracking branch 'origin/master' 2022-06-20 20:22:15 -04:00
Anuken 900aa12a3c Misc minor fixes 2022-06-20 20:22:11 -04:00
Anuken a8a2b9f684 Impact cryo requirement fix 2022-06-19 00:22:06 -04:00
Anuken 077ee978f6 Merge remote-tracking branch 'origin/master' 2022-06-18 16:07:08 -04:00
Anuken 031af7c432 UnitType death handling 2022-06-18 16:07:04 -04:00
Anuken c5fdd34eb7 Fixed cryofluid mixer titanium input 2022-06-17 14:14:12 -04:00
Anuken 3856b154bb Merge remote-tracking branch 'origin/master' 2022-06-17 08:52:03 -04:00
Anuken 6409a96e45 Fixed #7033 2022-06-17 08:51:58 -04:00
Anuken 55e03635c6 Merge remote-tracking branch 'origin/master' 2022-06-16 20:02:24 -04:00
Anuken 02f40d1e29 WIP shielded wall 2022-06-16 20:02:15 -04:00
Anuken 2109a25e3e Turret progress 2022-06-16 15:34:22 -04:00
Anuken 52b5ed57bf Unfinished/WIP turret 2022-06-16 13:46:20 -04:00
Anuken 9807974de3 Merge remote-tracking branch 'origin/master' 2022-06-16 11:22:10 -04:00
Anuken 7cc064d14f Fixed black conduit regions 2022-06-16 11:22:05 -04:00
Anuken fbadda40f6 Merge remote-tracking branch 'origin/master' 2022-06-15 08:10:10 -04:00
Anuken 43cac0bd1e Fixed #7022 2022-06-15 08:10:06 -04:00
Anuken bdb199c5e7 Merge remote-tracking branch 'origin/master' 2022-06-15 07:29:36 -04:00
Anuken 3cacff6550 Fixed #7020 2022-06-15 07:29:32 -04:00
Anuken caed77bac2 Crash fix 2022-06-14 11:26:22 -04:00
Anuken 122c7654e5 Possible fix for double turret outline 2022-06-14 11:22:45 -04:00
Anuken 1af75baa41 Merge remote-tracking branch 'origin/master' 2022-06-14 10:55:01 -04:00
Anuken 697df9d9f1 Double outline check 2022-06-14 10:54:56 -04:00
Anuken ce27388fad Misc bugfixes 2022-06-13 23:23:45 -04:00
Anuken f5b38ccbba Merge remote-tracking branch 'origin/master' 2022-06-13 21:42:16 -04:00
Anuken 2134762ed1 More world processor privileges 2022-06-13 21:42:10 -04:00
Anuken 1be8f11ec8 Merge remote-tracking branch 'origin/master' 2022-06-13 20:48:15 -04:00
Anuken 7b1d36a40a Fixed #7011 2022-06-13 20:48:10 -04:00
Anuken 3c26ad3ec7 Duct router save loading bugfix 2022-06-13 00:18:58 -04:00
Anuken b87a3ebd88 Merge remote-tracking branch 'origin/master' 2022-06-12 23:04:32 -04:00
Anuken 0dface7cc1 Misc preparations for unified packing 2022-06-12 23:04:26 -04:00
Anuken 1a63a2726e well, that didn't work. 2022-06-12 13:22:54 -04:00
Anuken 8267376d32 Experimental test for atlas OOM 2022-06-12 13:11:20 -04:00
Anuken 4519ba8bf6 Merge remote-tracking branch 'origin/master' 2022-06-12 09:22:11 -04:00
Anuken 8f4a5c3572 Some minor IO null checks 2022-06-12 09:22:06 -04:00
Anuken 7ac2645a63 let's see if this changes anything 2022-06-11 14:02:21 -04:00
Anuken 42d7ca9e0d Merge remote-tracking branch 'origin/master' 2022-06-11 11:20:20 -04:00
Anuken 523f94db98 liquid type support? 2022-06-11 11:20:15 -04:00
Anuken 4c8471c4a7 Fixed #7002 2022-06-10 17:31:27 -04:00
Anuken 8d27d70bc2 Merge remote-tracking branch 'origin/master' 2022-06-10 08:34:43 -04:00
Anuken 8418a00483 Misc bugfixes 2022-06-10 08:34:38 -04:00
Anuken 4c5850ae96 Merge remote-tracking branch 'origin/master' 2022-06-09 13:16:39 -04:00
Anuken 1b5e49bd3c Items/liquids consume shorthand 2022-06-09 13:16:34 -04:00
Anuken f8f693cd9d Merge remote-tracking branch 'origin/master' 2022-06-09 09:52:50 -04:00
Anuken dc6617cfad Threads update 2022-06-09 09:52:44 -04:00
Anuken 1920e4399b Possible crash fix 2022-06-08 16:27:47 -04:00
Anuken c56666b104 Removed inaccessible planets from generate dialog 2022-06-08 16:07:44 -04:00
Anuken 5bf3155272 Fixed #6996 2022-06-08 15:47:04 -04:00
Anuken 67f6ca3d5d Merge remote-tracking branch 'origin/master' 2022-06-08 12:41:23 -04:00
Anuken 9ed5491d6a More payload router fixes 2022-06-08 12:41:20 -04:00
Anuken c1549c78f0 Fixed #6883 2022-06-08 11:12:59 -04:00
Anuken b0c4486b7c Fixed #6874 2022-06-08 11:01:28 -04:00
Anuken ab90270917 Fixed #6980 2022-06-08 10:50:14 -04:00
Anuken a3f02ad5a8 Merge remote-tracking branch 'origin/master' 2022-06-08 10:39:12 -04:00
Anuken 389cace4c7 Fixed #6897 2022-06-08 10:39:09 -04:00
Anuken 13ac6e0331 Made console a setting 2022-06-08 10:35:00 -04:00
Anuken 62c2d9d606 Fixed #6941 2022-06-08 10:12:53 -04:00
Anuken 0bcaa002ea Fixed #6952 2022-06-08 10:08:59 -04:00
Anuken a4c0441961 Fixed #6864 2022-06-08 10:07:12 -04:00
Anuken 966a93ddfa Fixed #6930 (probably) 2022-06-08 10:00:32 -04:00
Anuken abb0078be3 Fixed #6993 2022-06-08 09:57:40 -04:00
Anuken 1f4b0e7f5c Fixed #6917 2022-06-08 09:44:38 -04:00
Anuken c969749163 Fixed #6898 2022-06-08 09:43:42 -04:00
Anuken df082c39a3 Fixed #6865 / Fixed headless canvas crash 2022-06-08 09:36:08 -04:00
Anuken 6989a81e03 Fixed #6984 2022-06-08 09:30:30 -04:00
Anuken eb6c0ebfb5 Merge remote-tracking branch 'origin/master' 2022-06-08 09:27:25 -04:00
Anuken 28150d8f51 Fixed #6985 2022-06-08 09:27:20 -04:00
Anuken 4a6600b94d Merge remote-tracking branch 'origin/master' 2022-06-08 09:11:04 -04:00
Anuken cbfb621179 Better implementation of #6959 2022-06-08 09:11:00 -04:00
Anuken 0793ba45b5 Merge remote-tracking branch 'origin/master' 2022-06-08 09:05:31 -04:00
Anuken b2353eba58 Misc 2022-06-08 09:05:25 -04:00
Anuken 8c33eb32dd Merge remote-tracking branch 'origin/master' 2022-06-08 08:33:06 -04:00
Anuken e627008fbc Slightly different implementation of #6910 2022-06-08 08:33:01 -04:00
Anuken 1c0eff0871 Made IndexedRenderer shader static 2022-06-08 07:52:51 -04:00
Anuken 49d859f6bb Android build fixes 2022-06-06 11:31:38 -04:00
Anuken 0177902010 Turrets should consume 1 ammo/shot by default 2022-06-05 10:12:52 -04:00
Anuken 56cc88f582 Fully fixed weapon part bug 2022-06-03 21:42:26 -04:00
Anuken 152a5b5c94 Minor bugfixes 2022-06-03 21:06:14 -04:00
Anuken 29e086f23b Removed some unnecessary uniform setting 2022-05-30 12:05:10 -04:00
Anuken 55a219fc03 Misc minor fixes 2022-05-28 07:48:43 -04:00
Anuken 0e4903910b Block placement method changes (will break some mods) 2022-05-26 11:19:36 -04:00
Anuken e2bd6571b1 Chat message sound + minor JSOn fix 2022-05-25 23:15:09 -04:00
Anuken 6d9029fb23 some JSON fixes 2022-05-22 22:27:53 -04:00
Anuken 2236771b22 Misc cleanup + some JSON stuff 2022-05-22 22:16:03 -04:00
Anuken e62c2f9d8e UnitType type -> class 2022-05-22 09:00:32 -04:00