mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-21 01:37:13 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,564 Commits 4 Branches 160 Tags 2.3 GiB
03d99cb05a
Commit Graph

11381 Commits

Author SHA1 Message Date
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
Anuken
2f989d57bb Weapon animation suffering 2022-02-03 00:59:21 -05:00
Anuken
1388d0a4ca WIP unit stuff 2022-02-02 23:36:21 -05:00
Anuken
eb4d2fc3a3 Weapons parts for units / No logic on Erekir 2022-02-02 20:39:22 -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
Anuken
092ce9d5ff WIP actually insect-like unit 2022-02-01 00:07:00 -05:00
Anuken
77e29af522 wrong capture wave 2022-01-31 15:50:53 -05:00
Anuken
06875d4389 Third sector 2022-01-31 15:50:29 -05:00
Anuken
c6cfaa5ce5 More unit progress 2022-01-31 14:05:50 -05:00
Anuken
7c22478618 Multi-tread support for tanks 2022-01-30 17:10:04 -05:00
Anuken
3f8a7f591a Disabled Erekir invasions & planet simulation 2022-01-30 11:34:52 -05:00
Anuken
1ad3f83e17 Removed GP-specific code and build flavor 2022-01-29 22:52:13 -05:00
Anuken
3f7a6e43b8 Framerate-independent building speed 2022-01-29 19:43:36 -05:00
Anuken
44677d3697 Minimap liquid shadow 2022-01-29 15:40:19 -05:00
Anuken
fdfc43ce72 Correct quell AI 2022-01-29 13:44:38 -05:00
smol
29311806a9
PlayerConnectionConfirmed (#6539) 
* PlayerConnectionConfirmed

* AdminRequestEvent
 2022-01-29 11:34:34 -05:00
Anuken
77dc453e75 Crystal biome gen tweaks 2022-01-29 10:52:46 -05:00
Anuken
0579c9e6c9 No erekir launch schems / Tech tree fix 2022-01-28 15:52:06 -05:00
Anuken
98f17e15ae Fixed cross-planet hidden items 2022-01-28 14:58:22 -05:00
Anuken
ac68edda40 Core launch capacity tweaks 2022-01-28 14:00:03 -05:00
Anuken
27bb848832 Generation tweaks 2022-01-28 11:00:00 -05:00
Anuken
1eb39a531f Vent tweaks 2022-01-27 18:15:19 -05:00
Anuken
c65ba7f3fa Rhyolite walls darkened 2022-01-27 15:52:37 -05:00
Anuken
adbda61faf Tweaks 2022-01-27 15:09:38 -05:00
Anuken
feba0cf207 Erekir tech fixes 2022-01-27 15:01:01 -05:00
Anuken
e4595b6831 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/core/ContentLoader.java
	core/src/mindustry/world/Block.java
 2022-01-27 14:58:44 -05:00
Leonid Skorospelov
0b9483cffc
Preserve conveyors end rotation on placement (#6496) 
* Preserve conveyors end rotation on placement

* Formatting
 2022-01-27 14:57:43 -05:00
Anuken
7cdd9edb5f Fixed beam drills not contributing to production 2022-01-27 14:39:21 -05:00
Anuken
ec32981f4e More vanquish tread damage 2022-01-27 14:19:49 -05:00
Anuken
b78f0124cb Wave tweaks 2022-01-27 14:19:12 -05:00
Anuken
632bc79924 Balancing 2022-01-27 14:15:30 -05:00
Anuken
d410bc345c Guaranteed vent spawning 2022-01-27 12:56:23 -05:00
Anuken
89e0e3b658 Changed erekir pump requirements 2022-01-27 00:30:20 -05:00
Anuken
20f30d820b Aware waves 2022-01-26 18:57:54 -05:00
Anuken
c9f3334f4f Various request rendering optimizations 2022-01-26 17:58:22 -05:00
epowerj
0d8142603b Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-01-26 15:21:47 -05:00
epowerj
958433f253 Update aware map to add more steam vents 2022-01-26 15:21:34 -05:00
Anuken
f45e6e016d Wave tank crawl damage / Breach ammo use decrease 2022-01-26 15:15:56 -05:00
Anuken
c1858b09d0 Fixed armored conduits not connecting to bridges 2022-01-26 14:51:06 -05:00
Anuken
f97d7edffb Loadout env fixes 2022-01-26 14:01:38 -05:00
Anuken
06a4f65728 Aware: Waves 2022-01-26 13:40:32 -05:00
Anuken
121ae08240 New WIP sector preset 2022-01-26 00:13:43 -05:00
Anuken
cd68b4b410 Generation tweaks 2022-01-25 16:16:25 -05:00
buthed010203
fa06d2c20b
Fix broken powernode Point2[] config (#6531) 
This was broken. I fixed it.
 2022-01-25 10:38:38 -05:00
Sh1p*nfire
d81efe4f71
fix Cyerce's frag keeping owner velocity (#6527) 2022-01-25 10:05:52 -05:00
Anuken
9391c14ad4 Unit unbind control 2022-01-24 23:26:34 -05:00
Anuken
08b8f9421d Arkycite biome experiments 2022-01-24 22:26:13 -05:00
Anuken
a111eed8a1 Fixed onset waves 2022-01-24 14:11:29 -05:00
Anuken
b79ed071b8 Correct erkir cloud color 2022-01-24 13:50:47 -05:00
Anuken
4a07c95e1c initialWaveSpacing rule 2022-01-24 13:34:55 -05:00
Anuken
b99a750655 No category switch on rebuild 2022-01-24 12:44:34 -05:00
Anuken
39f59b8040 Fixed empty category 2022-01-24 12:42:27 -05:00
Anuken
a70b28ea12 Fixed BeamDrill draw rotation 2022-01-24 12:32:14 -05:00
Anuken
551d01bf6e Starting balance 2022-01-24 12:21:45 -05:00
Anuken
757e11060f Sector selection fix 2022-01-24 11:23:16 -05:00
Anuken
f244d89a3d Fixed wall drop not appearing in resource list 2022-01-24 11:10:43 -05:00
Anuken
fc58f5b003 Shadows under blocks in minimap 2022-01-23 23:19:44 -05:00
Anuken
12766dda56 Bugfixes 2022-01-23 22:33:36 -05:00
Anuken
a3c5243380 Erekir tech tree tweaks 2022-01-23 22:30:03 -05:00
Anuken
5a9499b1db Unlock core on launch 2022-01-23 19:45:24 -05:00
Matthew (or Maya) Peng
716702623d
onConfigureClosed (#6523) 
* onConfigureClosed

* Run the closing of the previous block's config on the opening of another
 2022-01-23 19:34:28 -05:00
Anuken
0c9bcbf69a Removed Onset starting items 2022-01-23 17:22:02 -05:00
Anuken
bfe893adfb Bugfixes & Onset items 2022-01-23 17:15:23 -05:00
epowerj
d66c386881 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 
# Conflicts:
#	core/assets/maps/onset.msav
 2022-01-23 17:02:39 -05:00
epowerj
4bdfa894af Updated onset map to remove some areas and add derelict storage 2022-01-23 17:00:27 -05:00
Anuken
8853afc221 Removed unused coral chunk block 2022-01-23 16:58:52 -05:00
Anuken
abf429acb1 Unit wall mining 2022-01-23 16:57:09 -05:00
Anuken
608e25c2ee Research tweaks 2022-01-23 15:45:40 -05:00
Anuken
56334d9199 Misc bugfixes 2022-01-23 15:34:51 -05:00
Anuken
5a2d69278b Unlock necessary blocks before landing 2022-01-23 15:28:12 -05:00
Anuken
b281f29f01 Onset 4 waves 2022-01-23 14:41:58 -05:00
Anuken
4497f7ab3a Proper interplanetary launch 2022-01-23 14:37:08 -05:00
Anuken
3574e40a08 Onset tech tree entry 2022-01-22 16:49:18 -05:00
Anuken
d9bcdf3f37 Cleanup 2022-01-22 16:47:59 -05:00
Anuken
48585274cf Onset sector 2022-01-22 16:43:36 -05:00
Anuken
c7d68be8fb [Script] automatic update 2022-01-22 15:49:05 -05:00
Anuken
fdcc373813 Editor experimental sector generator 2022-01-22 15:06:46 -05:00
Anuken
97da66cd44 New environment blocks 2022-01-22 13:33:16 -05:00
Anuken
f4701f6b8a Regen projector phase boost / Menu tweaks 2022-01-21 21:26:04 -05:00
CPXMC
30070ce759
Change my main name in Contributors (#6513) 
CPXMC to PCX-LK
 2022-01-21 20:05:48 -05:00
Anuken
8f4f51c122 Menu cleanup 2022-01-21 17:04:35 -05:00
Anuken
cfb01063c0 Misc map creation utilities 2022-01-21 16:32:35 -05:00
Anuken
025dac226c Fixed unit assembler overlap 2022-01-21 11:53:59 -05:00
Iloveidea
287dc35640
Update LiquidConverter.java (#6507) 2022-01-21 09:46:03 -05:00
Anuken
a121c4d042 Fixed square numbers in stats 2022-01-21 00:08:56 -05:00
Anuken
b3d4dc06d4 Misc 2022-01-20 23:06:04 -05:00
Anuken
8fc7aff7ef More decoration blocks 2022-01-20 15:49:47 -05:00
Anuken
0e790e61f2 Generation tweaks 2022-01-20 15:19:03 -05:00
Anuken
1f2fa331ce New server dialog style 2022-01-20 10:08:52 -05:00
Anuken
9593765742 Removed WallOre class 2022-01-19 23:23:05 -05:00
Anuken
698e89e796 Editor fixes 2022-01-19 22:23:50 -05:00
Anuken
45178046d0 Crystal blocks 2022-01-19 21:24:02 -05:00
Anuken
4bee7e598b Red ice boulders 2022-01-19 18:54:15 -05:00
Anuken
9e1777f5cf Beryllic stone contrast 2022-01-19 14:48:38 -05:00
Anuken
cef3d383b7 Display liquid tooltips 2022-01-19 10:50:28 -05:00
Anuken
7240da5016 More crystals 2022-01-18 22:47:31 -05:00
Weathercold
4a05c9547a
TextSetting (#6503) 
* tile

tile

* > Called right after load()

* TextSetting

* nvm I change the doc instead

* Fixes
 2022-01-18 22:26:24 -05:00
Anuken
19ddc1dd65 WIP crystal biome 2022-01-18 20:35:43 -05:00
Anuken
f3811d6710 Ore renaming 2022-01-18 10:48:27 -05:00
VizardAlpha
3311e40906
Update bundle_fr.properties (#6373) 
* Update bundle_fr.properties

* Removes -> Destroys..
 2022-01-17 23:18:41 -05:00
彭瑞暄
b8842a34ae
Update bundle_zh_TW.properties (#6470) 2022-01-17 21:58:26 -05:00
Anuken
51aa374225 Support for more ContentParser unit types 2022-01-17 15:55:53 -05:00
Anuken
d1206d2e2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/world/blocks/defense/turrets/Turret.java
 2022-01-17 15:44:09 -05:00
Anuken
cc221d669a Sector bugfix backport 2022-01-17 15:41:45 -05:00
Anuken
ae8c219130 Balance 2022-01-17 15:40:52 -05:00
Paweł Stolarski
6a75d84f48
Evolveye (polish translator of 3.x version) (#6502) 2022-01-17 14:53:35 -05:00
Anuken
8c144bfca0 Shield arc rename 2022-01-17 13:47:23 -05:00
Anuken
2d19c7ae97 Bulwark shield mechanics mostly done 2022-01-17 13:39:15 -05:00
Anuken
396c087072 Experimenting with abilities 2022-01-16 22:53:58 -05:00
Anuken
b23ea8b965 WIP 'bulwark' unit 2022-01-16 16:26:21 -05:00
Anuken
93cfa243bc Fixed certain turrets working without ammo 2022-01-15 23:08:54 -05:00
Anuken
f91619e5da Toxopid cannon rotation limit 2022-01-15 20:45:07 -05:00
Anuken
e14dd00019 Quell missile weapons 2022-01-15 15:57:53 -05:00
Anuken
e563ce9dcd Erekir clouds 2022-01-14 13:11:52 -05:00
Anuken
580e830300 Erekir gen fix 2022-01-13 23:33:12 -05:00
Anuken
cfbfa0844d Research bugfixes 2022-01-13 19:39:21 -05:00
Matthew (or Maya) Peng
795edb2494
Tractor Beam Suction multiplies by timescale twice (#6489) 2022-01-13 15:28:29 -05:00
Anuken
4385cb8a88 Drill message fix 2022-01-12 23:08:35 -05:00
Anuken
0f6f85887e Block regionRotated 2022-01-12 09:58:54 -05:00
Anuken
a053d93636 Titan crash fix 2022-01-11 10:24:00 -05:00
Matthew (or Maya) Peng
43e857e810
Fix ammo of one item transforming into another. (#6483) 
* Fix ammo transmutation

* Small fixes

* small fix 2

* a

* commit spam aeugh
 2022-01-11 09:29:25 -05:00
Anuken
b597978a33 Cleanup 2022-01-10 23:49:58 -05:00
Anuken
d09039f6e6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2022-01-10 23:43:18 -05:00
Phinner
cd88400154
Better Mod/Plugin dependencies handling (#6328) 
* Dependencies goes brrrr

* mmh, maybe voiding exception in findMeta ?

* Let Anuke code handle everything

I trust the Cat :^)

* My god, I sleep too much...

* Forgot that one...
 2022-01-10 23:43:11 -05:00
Matthew (or Maya) Peng
1d14fa78bf
Make ItemEntry's item public (#6474) 2022-01-10 23:38:28 -05:00
Anuken
125994482e Minor polish 2022-01-10 22:52:22 -05:00
Anuken
10d8e63368 Multi-liquid sublimate 2022-01-10 14:01:30 -05:00
Anuken
5509104a44 Moved thorium into the 'next tier' on Erekir 2022-01-10 11:22:53 -05:00