Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,378 Commits 4 Branches 180 Tags
v144.1
Commit Graph
16378 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
dead insideandGitHub 8269d79e56 Liquid Output Display (#6788) 
* Liquid Output Display

* hshfhqwehpvoipwjovpwiqffjvpwqenoij0n89f4v123f2v40q9j8hbnwqvceinopjj90cmqwvinv21904uinfhu0bnv9j90h84g bvb8024q3bh80b3498vcfj932ndjqdjponjewopnviqvnifjwp9ghpnewuubgqjiojpdfoekwdckmpqwpkmidpkewpjndqvjwnfnj8132nt345879ytgh342890yu4598yhubn4t9hrj[tevpkofkwemfvewrphojfekpcfoerkfwmvfh23bng0398g9834ifvrfnwurbgiwnwgherhnwenhgpvrnnivjpjnipfqwjniwqfejnipofvniwejpfqjwociomjefjjmvcmj21m4f98v00ngbhegwefgpjroiewjfqfwpiojnmem

* Pull to separate function

The javadoc description could be different

* In case mods have liquid icons larger than 32x32
 2022-05-09 17:06:55 -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
dead insideandGitHub 2e71c3cf8a "speed" -> "alpha" (#6801) 2022-05-09 16:52:36 -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
Epowerj 6e23fffe41 More level 2 tweaks to make it easier 2022-05-09 13:28:27 -04:00
Epowerj 5c6b8df764 Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 12:54:28 -04:00
Anuken 0b141b6eb0 more misc bugfixes 2022-05-09 12:51:05 -04:00
Epowerj 1668035759 Tweaked clipping issues in onset 2022-05-09 12:45:48 -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
Epowerj 79240a45d0 More tweaks to level two - show players they can water cool breach turret 2022-05-09 11:46:11 -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
Epowerj c5cafd5573 Adjustments to level two to make it easier 2022-05-09 11:39:16 -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
GoobrrandGitHub 39941799d9 correct label position (#6793) 2022-05-08 23:50:14 -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
xem8k5andGitHub f16119cd0f Update bundle_zh_CN.properties (#6759) 
* Translation zh_cn partly

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

发觉强化不符合题意，普通容器血量220 容量300，“强化”容器血量480 容量250，反向强化是不是？故固化符合题意
 2022-05-08 21:28:20 -04:00
buthed010203andGitHub efee6b9713 Minor blockrenderer cleanup (#6791) 2022-05-08 20:18:02 -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
Github Actions e69aa6bf49 Automatic bundle update 2022-05-08 16:46:41 +00: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
Github Actions f5ef01f01e Automatic bundle update 2022-05-08 13:30:05 +00:00
Anuken 396363c11d Replaced stats entries to assist translation changes 2022-05-08 09:29:10 -04:00
GoobrrandGitHub 0f3780dbb2 GameOverDialog rework (#6783) 
* GameOverDialog rework

* cleanup
 2022-05-08 09:26:49 -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