Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,343 Commits 4 Branches 180 Tags
4d12ac8ed6878b947cb4150ec6ca06ef12f6dca3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken f54116425d Bugfixes 2022-05-11 12:33:10 -04:00
Anuken 25cc53625c Merge remote-tracking branch 'origin/master' 2022-05-11 12:02:25 -04:00
Anuken 2beca30b0c Spore press craft time fix 2022-05-11 12:02:19 -04:00
Anuken 60cb4a2a73 Merge remote-tracking branch 'origin/master' 2022-05-11 09:42:21 -04:00
Anuken 35f07150f2 aaa 2022-05-11 09:42:17 -04:00
Anuken debf940973 Fixed preview render crash 2022-05-11 09:39:43 -04:00
Anuken 9b33ab3c0a Fixed #6815 2022-05-11 00:44:15 -04:00
Anuken 24a6ef2bc3 Correct team usage 2022-05-10 23:13:59 -04:00
Anuken afe02bf3a0 Misc fixes 2022-05-10 22:55:28 -04:00
Anuken aa3bf50731 Merge remote-tracking branch 'origin/master' 2022-05-10 21:56:41 -04:00
Anuken 8c98f8f9bf Mass driver reloadTime -> reload 2022-05-10 21:56:34 -04:00
Anuken 2e4037451f Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 21:07:48 -04:00
Anuken 0fa280c964 fix random errors 2022-05-10 20:50:36 -04:00
Anuken 211cf250dc deploy script for jitpack 2022-05-10 20:46:53 -04:00
Anuken e15ed4403c Unignore icons.properties 2022-05-10 20:38:05 -04:00
Anuken 9d65aa014c dfgnb 2022-05-10 20:30:07 -04:00
Anuken 8fad5a1757 Horrible 2022-05-10 20:28:09 -04:00
Anuken 60d3a51ebc What a horrible waste of time 2022-05-10 20:08:48 -04:00
Anuken 0218e2ed2d Package publish token fix 2022-05-10 19:47:40 -04:00
Anuken 0169a925ef Testing Github Packages 2022-05-10 19:43:47 -04:00
Anuken 8f31faa98e Merge remote-tracking branch 'origin/master' 2022-05-10 19:19:38 -04:00
Anuken 6a129371d2 Fixed #6811 2022-05-10 19:19:21 -04:00
Anuken 6bda5546a6 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 19:01:40 -04:00
Anuken 0c6c9620a7 lang 2022-05-10 19:01:33 -04:00
Anuken be3e487fae Trigger BE build 2022-05-10 18:44:52 -04:00
Anuken a089afc626 Merge branch 'master' of https://github.com/Anuken/Mindustry into erekir 
 Conflicts:
	core/assets/bundles/bundle_zh_TW.properties
 2022-05-10 18:15:43 -04:00
Anuken 01ba06ddef Faster erekir mining speed 2022-05-10 17:35:43 -04:00
Anuken eb8395fa19 Requirement swapbac 2022-05-10 16:25:06 -04:00
Anuken 4ddcd57191 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-10 16:21:24 -04:00
Anuken cffba7b685 Made useless items/liquids/blocks hidden 2022-05-10 16:21:22 -04:00
Anuken 36513d6ed6 Tech tree restructuring 2022-05-10 16:01:49 -04:00
Anuken 595f3fd117 arc 2022-05-10 13:16:09 -04:00
Anuken 3dd17474c5 Fixed OpenGL vertex arrays / Fixed bullet shrink crop 2022-05-10 13:12:12 -04:00
Anuken 9ac75df34e Merui swap / Bomber command support 2022-05-10 11:13:13 -04:00
Anuken 85d7f2cd62 Bugfixes 2022-05-10 10:17:43 -04:00
Anuken ca67b0f43c launchCapacityMultiplier per-planet 2022-05-10 00:24:44 -04:00
Anuken f7e74bdbfc Fixed annotations 2022-05-10 00:14:33 -04:00
Anuken 6efca04ea8 and gone 2022-05-09 23:50:01 -04:00
Anuken 95254eef44 Duct router distribution fixes 2022-05-09 23:11:52 -04:00
Anuken 051a41e86d String overload for mod options 2022-05-09 22:35:58 -04:00
Anuken 83d15ce65e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 20:51:31 -04:00
Anuken 2162770e57 Custom settings categories 2022-05-09 20:51:27 -04:00
Anuken aa1abeb4be Typo fixes 2022-05-09 19:55:51 -04:00
Anuken 2b46bbfd2c Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 18:24:31 -04:00
Anuken 76f1cfbc07 Actually fixed Serpulo base gen 2022-05-09 18:24:27 -04:00
Anuken 31c5ef2dc5 Some world processor documentation 2022-05-09 17:41:42 -04:00
Anuken cf1fb98d5c Misc bugfixes 2022-05-09 17:33:43 -04:00
Anuken 94db45f148 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-09 16:55:10 -04:00
Anuken 6cc30e6ebd Fixed tank tread rects 2022-05-09 16:55:08 -04:00
Anuken a82a6f4324 Manual trimming of sprites 2022-05-09 15:14:09 -04:00
Anuken 03a3e43b01 Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 15:01:53 -04:00
Anuken f9be361846 Cropped sprite packing 2022-05-09 15:01:49 -04:00
Anuken 0b141b6eb0 more misc bugfixes 2022-05-09 12:51:05 -04:00
Anuken 4635aad335 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-09 12:21:23 -04:00
Anuken 41413d65b7 Do not allow cross-planet launch pads 2022-05-09 12:21:21 -04:00
Anuken f2e5efaea7 Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 11:45:05 -04:00
Anuken 3bbb00db9a bugfixes 2022-05-09 11:45:01 -04:00
Anuken 900e3ec334 bugfixes 2022-05-09 09:49:15 -04:00
Anuken a8a8cc950e ok ilya 2022-05-09 04:51:44 -04:00
Anuken 846aa3a5ab world processors accessible in playtest 2022-05-09 04:42:42 -04:00
Anuken a1ac74950c notify spam fix 2022-05-09 04:33:13 -04:00
Anuken eb52c6d61f Status apply instruction / Bugfixes 2022-05-09 04:10:18 -04:00
Anuken aace191116 Crash fix 2022-05-09 03:06:25 -04:00
Anuken d8ceb03b3c Fixed tests 2022-05-08 23:58:36 -04:00
Anuken 1728b58290 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-08 23:53:28 -04:00
Anuken 4333f12fd8 More turret consistency / Power curve for recoil 2022-05-08 23:53:25 -04:00
Anuken 9697036599 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-08 23:17:40 -04:00
Anuken 5a3c8573c3 WIP Turret field rename / More JSON consume support 2022-05-08 23:17:37 -04:00
Anuken 668b09e955 Misc bugfixes 2022-05-08 17:07:06 -04:00
Anuken a7ecdf8aab crash fix? 2022-05-08 13:57:52 -04:00
Anuken 78b74d01cb a 2022-05-08 13:54:48 -04:00
Anuken 1733381cf2 Bugfixes 2022-05-08 13:52:43 -04:00
Anuken 5492c52249 Crash fix 2022-05-08 13:20:52 -04:00
Anuken 12c33cc032 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-08 12:54:38 -04:00
Anuken 02bbc10f40 Bugfixes 2022-05-08 12:54:36 -04:00
Anuken d28a839f55 RTS unit control improvements/fixes 2022-05-08 12:45:48 -04:00
Anuken 61b01892e7 Removed sector 5 2022-05-08 12:19:37 -04:00
Anuken ace6e09979 Possible unit control fix 2022-05-08 12:09:06 -04:00
Anuken 33cfeeb500 JSON tank/hover support 2022-05-08 12:06:12 -04:00
Anuken 08ecb7f335 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-08 10:18:12 -04:00
Anuken 51a9876d95 WIP game-over core pan 2022-05-08 10:18:09 -04:00
Anuken 396363c11d Replaced stats entries to assist translation changes 2022-05-08 09:29:10 -04:00
Anuken e94e31aedf Fixed #6782 / Fixed #6781 / Fixed #6779 2022-05-08 09:23:43 -04:00
Anuken aaccb36d93 BuildTurret fixes 2022-05-08 01:00:16 -04:00
Anuken 9da9fa82e5 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-08 00:43:40 -04:00
Anuken a5b6c2a03a Fixed sector base shift + impossible requirements 2022-05-08 00:43:38 -04:00
Anuken f055e35729 Crash fix 2022-05-08 00:03:06 -04:00
Anuken c8f81bd9b0 shadowElevationScl 2022-05-07 22:57:12 -04:00
Anuken 7b47a5cc30 Fixed auto-unlock for campaign sectors 2022-05-07 22:08:49 -04:00
Anuken a9d4e56e66 Crash fix 2022-05-07 21:20:12 -04:00
Anuken 471504090a Misc bugfixes 2022-05-07 20:44:28 -04:00
Anuken b3d064b1f7 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-07 14:09:49 -04:00
Anuken 0d61d98c70 Bugfixes 2022-05-07 14:09:47 -04:00
Anuken dfac73d81c Do not make cores derelict 2022-05-07 11:56:42 -04:00
Anuken 5c9ad34322 Map AI rebalancing 2022-05-07 11:47:41 -04:00
Anuken 792a7b5755 Laser crash fix 2022-05-07 11:44:36 -04:00
Anuken f99a523002 Fixed beam node replacement update 2022-05-07 11:21:35 -04:00
Anuken 7885a46cd5 Renamed TeamData blocks -> plans 2022-05-07 10:57:21 -04:00
Anuken 8f2e1163dd Fixed wave simulation estimation 2022-05-07 10:45:43 -04:00
Anuken 8fae99e780 Fixed JSON part support 2022-05-07 10:22:33 -04:00