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,459 Commits 4 Branches 160 Tags 2.3 GiB
48538d28b8
Commit Graph

11277 Commits

Author SHA1 Message Date
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
Anuken
feb1135bcc Some visual tweaks 2022-01-09 19:08:35 -05:00
Anuken
b31098ed87 Asteroid/space improvements 2022-01-09 17:07:21 -05:00
Anuken
61025972eb Plant launch lerp animation 2022-01-08 23:42:20 -05:00
Anuken
c788f4a7f8 Planet launch candidate system 2022-01-08 22:21:59 -05:00
Matthew (or Maya) Peng
9825d2f746
Incorrect reset (#6477) 2022-01-08 21:34:12 -05:00
Anuken
39cb353b13 Crash fix 2022-01-08 11:13:24 -05:00
Anuken
5611a212c5 Payload unit update rule 2022-01-08 11:06:05 -05:00
Anuken
dcfdf37b4f Write synced entities in world data 2022-01-07 10:53:56 -05:00
Anuken
4fb2b70c4b Block selection square fix 2022-01-07 10:32:46 -05:00
Anuken
2e0f9ed020 Building custom shadow support 2022-01-07 10:04:59 -05:00
Anuken
38cb7aa41d Payload loader/unloader 3x3 support 2022-01-02 14:24:06 -05:00
Anuken
eef1d68d4c ok glenn 2022-01-02 11:25:38 -05:00
Anuken
8f17fb43a6 Cleanup 2022-01-02 00:26:08 -05:00
Anuken
b591afa2ec Crash fix 2021-12-31 09:24:09 -05:00
Anuken
823acd6714 Minor cleanup 2021-12-29 09:29:57 -05:00
Anuken
3efbf58ab5 Build weapon 2021-12-28 23:54:43 -05:00
buthed010203
692718d4ea
Fix strange behavior of MinerAI (#6454) 
* Fix strange behavior of MinerAI 

See: https://discord.com/channels/391020510269669376/396416151032299521/925110542216073216

> Anuke, is the current behavior of miner ai where it wont mine anything if the item that the core has the fewest of has all of its ores covered?
The only place the hasOre code is used is miner ai so i assume thats a bug?

* Update BlockIndexer.java
 2021-12-28 23:22:01 -05:00
Anuken
37ba8ac66b ContentParser liquids support 2021-12-28 23:05:46 -05:00
Anuken
6354e18ae9 Even less evoke damage 2021-12-28 22:19:35 -05:00
Anuken
acaec08781 Evoke repair weapon 2021-12-28 21:48:32 -05:00
Anuken
9c2618f2e8 Regen projection recolor 2021-12-28 21:07:27 -05:00
Anuken
0ede0dbf0c 5x5 burst drill 2021-12-28 19:18:16 -05:00
Anuken
37bc06d14a Research cost multipliers for Serpulo resources 2021-12-28 16:36:04 -05:00
Anuken
4fa88296a7 Bugfixes & balancing 2021-12-28 16:00:25 -05:00
Anuken
ad42861daf Better block health scaling system 2021-12-28 11:29:31 -05:00
Anuken
0b9ad22e88 Titan 4x4 2021-12-27 19:44:16 -05:00
Anuken
5bb2df5b89 Misc turret sprite cleanup 2021-12-27 18:34:29 -05:00
Anuken
aaaa9f408e Better breach FX 2021-12-27 16:59:06 -05:00
Anuken
4e1dec2399 More turret cleanup 2021-12-27 16:41:03 -05:00
Anuken
8021f0082a Turret removal: Switching to bigger designs 2021-12-27 16:24:52 -05:00
Anuken
a526c2e8db Breach base damage increase 2021-12-27 15:55:23 -05:00
Anuken
677abf4924 3x3 breach 2021-12-27 15:54:09 -05:00
Anuken
f337a12f90 Regen projector visual fixes 2021-12-27 14:52:35 -05:00
Anuken
0f5b091655 Cleanup 2021-12-27 14:48:05 -05:00
Anuken
dd5ce7e365 Regen suppression unit + system 2021-12-27 14:46:51 -05:00
Anuken
19dea507b4 Decreased bore hydrogen cost 2021-12-26 18:22:20 -05:00
Anuken
72b91534ab Fracture turret requirement decrease 2021-12-26 17:30:25 -05:00
Anuken
583edacb11 Balancing 2021-12-26 17:11:13 -05:00
Anuken
f788fa31ed Fixed waves spawning on blocks 2021-12-26 16:09:49 -05:00
Anuken
4fbeae1afc Erekir tech sector requirements 2021-12-25 22:17:18 -05:00
Anuken
9e0d562d96 Block requirement changes 2021-12-24 16:14:21 -05:00
Anuken
88db3b886f More graphite, less beryllium gen 2021-12-24 14:55:22 -05:00
Anuken
c628ed9495 Added walls to tech tree 2021-12-24 14:18:25 -05:00
Anuken
180e527a18 Beryllium wall 2021-12-24 13:23:47 -05:00
Anuken
67986ee72c Requirement balancing 2021-12-24 12:52:32 -05:00
Anuken
f755fd76b4 Drawer cleanup 2021-12-22 22:35:51 -05:00
Anuken
438661e239 Regen projector 'done' 2021-12-22 16:43:22 -05:00
Anuken
45b81fae37 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-12-21 10:39:49 -05:00
Anuken
2dfa238ff3 More debug stats 2021-12-21 10:33:09 -05:00
Anuken
a093ba5511 Merge remote-tracking branch 'origin/master' 2021-12-21 10:25:54 -05:00
Anuken
24420c4371 Added temporary client debug status methods 2021-12-21 10:25:47 -05:00
Anuken
fb09d6bca0 titan recolor 2021-12-21 10:06:02 -05:00
Anuken
f8b360bca6 Fixed assembly modules yeeting into obstruction 2021-12-20 15:31:50 -05:00
Anuken
6f67ea1742 "Better" build tower sprite / Assembly cleanup 2021-12-20 10:54:09 -05:00
Anuken
0ccb8846d3 Unit assembler gallium requirement 2021-12-19 21:33:39 -05:00
Anuken
430fe2fd0a Unit assembly finalizations 2021-12-19 20:31:00 -05:00
Anuken
59550f58ee Assembler sprites mostly done 2021-12-19 13:06:23 -05:00
Anuken
3844121913 drone construction time 2021-12-19 12:39:29 -05:00
Anuken
8023ea1d34 aaaaaaaAAAAAAAAAAAAAAAAAA 2021-12-18 23:23:35 -05:00
Anuken
41b669d6e1 Unit assembly system progress 2021-12-18 11:50:21 -05:00
Anuken
3866a9a8e7 the obligatory daily commit 2021-12-17 17:55:03 -05:00
Anuken
e481de9d28 Payload router sorter mode 2021-12-16 10:31:16 -05:00
Anuken
00ed0d017c Unit assembly drones + more visuals 2021-12-15 14:51:42 -05:00
KuhnChris
4b6541ae4e
Update missing "core launch animation skip" in german translation file (bundle_de) (#6430) 
* Update settings file (bundle_de)

* Update bundle_de.properties
 2021-12-14 12:52:26 -05:00
Anuken
b5ce9e1a38 More unit assembler progress 2021-12-14 09:40:57 -05:00
Anuken
bdc3b85346 Unit assembler progress 2021-12-13 23:14:26 -05:00
Matthew (or Maya) Peng
339d87ad78
Check the status, not the bullet (#6434) 2021-12-13 21:44:54 -05:00
Matthew (or Maya) Peng
052b47fbe4
remove space from perSecond and perMinute (#6435) 2021-12-13 21:44:10 -05:00
Anuken
121b992d56 Decreased crucible slag usage 2021-12-13 15:09:22 -05:00
Anuken
5ac3e08b1d Tungsten walls 2021-12-13 14:42:16 -05:00
Fancy2209
b5c1972040
Update bundle_pt_PT.properties so that the portuguese word for settings is right (#6433) 
* Update bundle_pt_PT.properties

* Fix the other 2 words with -/ I didn't notice
 2021-12-13 13:20:30 -05:00
Anuken
0e99e121e8 Improved vanquish weapon style 2021-12-13 10:33:46 -05:00
Anuken
32cb25af62 Vanquish weapons & sprite tweaks 2021-12-13 00:08:01 -05:00
Anuken
53b55a9f0e Tank animations & FX 2021-12-12 20:05:37 -05:00
Anuken
0d33768f58 WIP tank unit type 2021-12-12 18:29:44 -05:00
Prosta4okua
192588d373
Update LanguageDialog.java (#6431) 2021-12-12 18:15:26 -05:00
Anuken
86a6ec6bd2 Editor crash fix 2021-12-11 16:23:42 -05:00
Anuken
7e9dd2d6f0 Fixed beam damage hit position 2021-12-10 12:39:37 -05:00
Anuken
4a59bc952f Tech tree selection fixes 2021-12-10 12:25:35 -05:00
Anuken
9614997482 Temporary measure to reduce atlas size 2021-12-10 11:55:17 -05:00
Anuken
3e9747c59c Heat conductor + phase heater 2021-12-10 11:31:32 -05:00
Anuken
761ee12e6f LAccess.speed / Merged #6293 2021-12-10 00:36:47 -05:00
Anuken
84c5bc9bdf This quad detail has been bothering me for ages 2021-12-09 19:39:05 -05:00
Anuken
3bd4cc8e81 Vent condenser resprite 2021-12-09 18:02:45 -05:00
Anuken
f582462177 wip 2021-12-09 17:41:55 -05:00
Anuken
57e5acdbd7 Vent condenser block 2021-12-09 17:16:32 -05:00
Anuken
8a2908374a Selectable tech tree 2021-12-08 21:57:10 -05:00
Anuken
36dc0e9e3e Fracture impl 2021-12-08 20:19:46 -05:00
Anuken
acb4593390 Fill#rect bugfix 2021-12-08 19:39:44 -05:00
Anuken
5fbfe52d0a Misc bugfixes 2021-12-08 14:28:27 -05:00
Darkness#3729
3a91460e24
Fix (#6414) 2021-12-08 10:01:02 -05:00
Matthew (or Maya) Peng
b70c08c2ec
Removes -> Destroys (#6409) 
* Removes -> Destroys

* inputed

* bad language design TM

english sucks
 2021-12-08 00:03:11 -05:00
Matthew (or Maya) Peng
8e89b24e5b
unprivate countOre (#6410) 2021-12-08 00:02:52 -05:00
Anuken
6c10a400ed Directional force projector prototype 2021-12-07 20:37:46 -05:00
Anuken
b3d2e7b0ca Disabled missile unit collisions 2021-12-07 18:08:49 -05:00
Anuken
0b7d8f371e Support for unit missiles 2021-12-07 16:58:11 -05:00
Anuken
f5e9df1265 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ai/BlockIndexer.java
	gradle.properties
 2021-12-07 14:09:03 -05:00
Anuken
600954bf4b wip 2021-12-07 14:08:15 -05:00
Anuken
c51e755f71 Heat turret support 2021-12-07 13:48:21 -05:00
Anuken
3644825dc5 Slightly less terrible regen projector 2021-12-06 22:13:06 -05:00
Anuken
a1fbd3397b Exclude Steam shared libraries from non-steam ver 2021-12-06 18:45:05 -05:00
Anuken
1c49bcc3b1 Added tech font attribution 2021-12-06 18:06:38 -05:00
Anuken
b8d7c64a5f PlasmaBore efficiency increase 2021-12-06 14:39:40 -05:00
Anuken
26692a3199 Small deconstructor 2021-12-06 14:30:54 -05:00