Commit Graph

13479 Commits

Author SHA1 Message Date
Anuken
bf22b601f7 Slightly better core upgrade effect 2022-02-06 23:06:34 -05:00
Anuken
1fb88c13b0 Initial core unit dock implementation 2022-02-06 22:05:43 -05:00
Anuken
ce82b3943e No Erekir default AI / Core unit tweaks 2022-02-06 20:54:57 -05:00
Anuken
cb110e5e6f Fixed JSON planet support 2022-02-06 16:11:55 -05:00
Anuken
fce3cf818e Untested support for JSON planets 2022-02-06 12:47:23 -05:00
Anuken
5fd139261f Supression system improvements 2022-02-05 21:59:38 -05:00
Anuken
28b2d5d6f7 New WIP attack sectgor 2022-02-05 21:51:29 -05:00
Anuken
f2ddb335c5 Slightly clearer fire color 2022-02-05 19:23:32 -05:00
Anuken
f02c1f6964 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2022-02-05 19:22:02 -05:00
Anuken
87726fc89b Misc 2022-02-05 19:21:54 -05:00
Anuken
16cb8df449 Map tweaks, generation improvements 2022-02-05 19:11:07 -05:00
Anuken
6c44f506fc More vent variants 2022-02-05 18:59:56 -05:00
Matthew (or Maya) Peng
6a053f2f45
Allow for same-size core upgrades (#6558) 2022-02-05 17:58:36 -05:00
Matthew (or Maya) Peng
c877c3416e
Reset after drawing bullet. (#6557) 2022-02-05 16:03:32 -05:00
Sunny Kim
126baa93d7
Save fires from color (#6556) 2022-02-05 11:14:43 -05:00
Anuken
6675730571 less slag bruh moments 2022-02-04 23:26:10 -05:00
Anuken
0ce6e6512b Block requirement tweaks 2022-02-04 21:05:01 -05:00
epowerj
6b00c44919 Updated alternative third map to allow for better turret uptime 2022-02-04 20:13:41 -05:00
Anuken
46a58c7965 Fixed missile distraction / Easier three 2022-02-04 19:48:17 -05:00
Anuken
48538d28b8 T1 walker nerf for waves 2022-02-04 19:26:18 -05:00
Anuken
70aac1151c Fixed turbine condenser stats 2022-02-04 19:10:49 -05:00
buthed010203
7dce2ee9ec
Do not the overlap. (#6555)
I got sick of waiting for this to get patched in vanilla so I did it myself.
2022-02-04 18:53:14 -05:00
Anuken
52965aa9ae Removed some unused sprites 2022-02-04 18:36:03 -05:00
Anuken
0441f89529 All T3s done / New third map 2022-02-04 18:09:26 -05:00
Anuken
c8da241825 Disrupt weapons complete 2022-02-04 17:34:13 -05:00
Anuken
60621520ee WIP Disrupt missiles 2022-02-04 15:37:51 -05:00
Anuken
4c9761eae5 PartProgress ContentParser support 2022-02-03 21:35:44 -05:00
Anuken
f573e78f4b Misc cleanup 2022-02-03 20:38:49 -05:00
Anuken
fa6ddd5f50 Conquer tank progress 2022-02-03 15:13:08 -05:00
Anuken
de96c8201d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2022-02-03 12:48:31 -05:00
Anuken
18c192d307 More animation improvements 2022-02-03 12:47:52 -05:00
Matthew (or Maya) Peng
16b9d68773
Option to not hardcode a bullet's status and despawnHit (#6553)
* Make not being hardcoded an option

* No one is gonna set a negative light radius, but just in case...
2022-02-03 09:48:44 -05:00
OSP
4ee2ce3ba5
[XCore] Domain (#6554) 2022-02-03 09:48:34 -05:00
Anuken
2f989d57bb Weapon animation suffering 2022-02-03 00:59:21 -05:00
Anuken
d7e55e83da arc 2022-02-02 23:38:07 -05:00
Anuken
335cd0c8a1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-02-02 23:38:04 -05:00
Anuken
c01ad67614 arc 2022-02-02 23:38:00 -05:00
Anuken
1388d0a4ca WIP unit stuff 2022-02-02 23:36:21 -05:00
Anuken
23f074b9b6 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-02-02 20:39:25 -05:00
Anuken
eb4d2fc3a3 Weapons parts for units / No logic on Erekir 2022-02-02 20:39:22 -05:00
Sam Bloom
34d8ce59cb
new yeet hosting servers (#6552) 2022-02-02 18:38:40 -05:00
Anuken
93473e3dfd
Update gradle.properties 2022-02-02 17:07:01 -05:00
Take
5c4f3171f7
Japanese translation (#5858)
* translate sector name

* fix sector description translation

* fix translate: status

* fix translate: remove WIP from setting.coreitems.name

* correct a notation error between "ターレット" and "タレット"

* translate: link.bug, 研究タブ, network error, sectors.stored

* transalte: block name, use "放電" instead of "電撃アーク", scepter description

* fix translate: unmoving

Co-authored-by: Anuken <arnukren@gmail.com>
2022-02-02 16:57:02 -05:00
Anuken
ae924e6e2b Merge remote-tracking branch 'origin/master' 2022-02-02 11:54:44 -05:00
Anuken
ca6723e696 Light RGB clamp + Arc update 2022-02-02 11:54:39 -05:00
Anuken
a138b7b9a8 Better leg unit death explosion 2022-02-01 23:21:57 -05:00
Anuken
69f59ff803 Removed copper drills in loadouts 2022-02-01 20:29:45 -05:00
Anuken
e865f4bc06 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-02-01 18:05:59 -05:00
Anuken
c0c7e0f468 Mostly finished T2 spider unit 2022-02-01 18:05:56 -05:00
epowerj
34e9e9f717 Updated the third map to clean it up a bit 2022-02-01 17:51:05 -05:00