mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-09 10:18:40 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,392 Commits 4 Branches 160 Tags 2.3 GiB
07ff2de2a2
Commit Graph

5445 Commits

Author SHA1 Message Date
dead inside
7683214eff
BuildTurret infinite resources fix (#6808) 
* BuildTurret infinite resources fix

* I'm not a good script kiddie

Too much Testing Utilities has plagued me

* Team infinite resources as well
 2022-05-10 16:04:30 -04:00
Anuken
36513d6ed6 Tech tree restructuring 2022-05-10 16:01:49 -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
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
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
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
dead inside
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 inside
2e71c3cf8a
"speed" -> "alpha" (#6801) 2022-05-09 16:52:36 -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
Anuken
0b141b6eb0 more misc bugfixes 2022-05-09 12:51:05 -04:00
Anuken
41413d65b7 Do not allow cross-planet launch pads 2022-05-09 12:21:21 -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
Goobrr
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
buthed010203
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
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
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
Goobrr
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
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
buthed010203
09dc1fa92a
No. (#6776) 
This keeps driving me mad when merging
 2022-05-08 00:27:30 -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
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
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
Anuken
17d8d5875e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-07 10:09:05 -04:00
Anuken
7c8cbd41a4 Added DrawPart to ClassMap 2022-05-07 10:08:59 -04:00
Epowerj
d4acf3c9a5 Fixed level four requirements 2022-05-07 01:35:56 -04:00
Anuken
dfb01ebdf1 Fixed mod crash 2022-05-07 01:12:20 -04:00
Anuken
9c86433047 Unit command tweaks 2022-05-07 00:41:27 -04:00
Anuken
aa0e254f0e Mobile unit command support 2022-05-07 00:30:25 -04:00
Anuken
6740b60af2 Misc bugfixes, AI hit retaliation 2022-05-06 23:33:22 -04:00
Anuken
f6e68e91d0 Temporary sprite packing fix 2022-05-06 22:13:52 -04:00
Anuken
2c07b9cdb1 Removed unused class 2022-05-06 21:12:57 -04:00
Anuken
7fbd196919 Five is inaccessible 2022-05-06 21:05:38 -04:00
Anuken
59674dfcf2 Maps updated, ready to go 2022-05-06 20:26:33 -04:00
Anuken
fb389c9984 Bugfixes 2022-05-06 20:20:09 -04:00
Anuken
9c0fd7c4c1 Bugfixes 2022-05-06 20:07:41 -04:00
Anuken
bb6b8b020d more 2022-05-06 19:13:39 -04:00
Anuken
688e02c04a Fixed reserach cost of certain units 2022-05-06 19:12:48 -04:00
Anuken
ed774a6aa2 actually 2022-05-06 18:46:00 -04:00
Anuken
a2af906f1a Fab cost fix 2022-05-06 18:43:59 -04:00
Anuken
46f43a3456 Bugfixes 2022-05-06 18:28:51 -04:00
Anuken
a86f62cbe8 Balancing 2022-05-06 16:00:47 -04:00
Anuken
f8789244d6 Balancing 2022-05-06 15:43:50 -04:00
Anuken
d4411fd234 Tech tree things 2022-05-06 14:53:44 -04:00
Anuken
0c1926ade6 Block renaming done 2022-05-06 14:35:06 -04:00
Anuken
7540b1c10a Fixed load map limit 2022-05-06 14:14:10 -04:00
Anuken
5ef423c185 ClassMap updae 2022-05-06 14:03:30 -04:00
Anuken
55f729565b Modding API-related tweaks 2022-05-06 13:45:43 -04:00
Anuken
a7f84e8690 Better json mod warning logging 2022-05-05 22:31:27 -04:00
Anuken
f7175540f8 Disable world processor rule 2022-05-05 20:36:11 -04:00
Anuken
4d680ec91d Docs 2022-05-05 20:30:37 -04:00
Anuken
429e07adec More units renamed 2022-05-05 13:39:14 -04:00
Anuken
7782331dbc Unit renamings 2022-05-05 12:26:23 -04:00
Anuken
05d5a160fe Block tweaks 2022-05-05 10:46:58 -04:00
Anuken
7508e1e0e3 Quell buff 2022-05-05 00:31:30 -04:00
Anuken
d8cf443cd9 Docs 2022-05-04 23:10:42 -04:00