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
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
Anuken
c4dc6511fd jitpack suck 2021-12-06 13:28:20 -05:00
Anuken
c3dbe9b09d Animated item support 2021-12-06 00:52:30 -05:00
Anuken
7d6428fcf2 Titan recolor + complaining 2021-12-05 18:19:43 -05:00
buthed010203
5c3ecaabb5
Fix incorrect return value (#6401) 
* Fix incorrect return value

the javadoc is a lie

* Update Administration.java
 2021-12-04 20:41:29 -05:00
Anuken
30bfab34ee Titan cleanup 2021-12-04 15:51:17 -05:00
Anuken
5103c95f2e Unfinished titan turret 2021-12-04 14:08:50 -05:00
Anuken
0f23fac963 Added more unit configuration options 2021-12-04 09:24:40 -05:00
Anuken
f89f460b47 Fixed ConsumeGenerator 'kickstarting' 2021-12-04 09:16:15 -05:00
Anuken
c8fb0c2e76 Liquids are fluids now 2021-12-03 22:28:05 -05:00
Anuken
8e4fdc92ec WIP terrible-looking regen projector 2021-12-03 20:45:19 -05:00
Anuken
61bb4d2dac Breach turret done / DrawTurret & reload fixes 2021-12-03 12:28:13 -05:00
Anuken
9c9d147b95 TeamEntry class implementation 2021-12-03 10:28:34 -05:00
Anuken
8168d8a3be Testing waves 2021-12-02 18:33:33 -05:00
Anuken
2b416588f1 Pyro generator tree entry 2021-12-02 17:37:18 -05:00
Anuken
4e181d715f Pyrolysis generator + generation tweaks 2021-12-02 17:00:49 -05:00
Matthew (or Maya) Peng
5ea4688e88
get by name (#6396) 2021-12-02 15:43:31 -05:00
Anuken
fff492d89d Erekir generation improvements 2021-12-02 13:25:43 -05:00
Anuken
f754dd1373 Un-cursed standard core shading 2021-12-02 09:57:49 -05:00
Anuken
b6988e631e arkycite floor + fixes 2021-12-01 22:38:21 -05:00
Anuken
585affeeee chemical combustion chamber 2021-12-01 19:31:59 -05:00
Anuken
99488e7c8d Duct blend fix / Duct autobridge 2021-12-01 16:01:49 -05:00
Anuken
a31ddb7fa1 Turbine condenser output display 2021-12-01 14:32:51 -05:00
Anuken
773dba8aca Hide illuminator 2021-12-01 14:25:43 -05:00
Anuken
0b6eda2ac8 Plasma bore beryllium support 2021-12-01 13:58:09 -05:00
Anuken
3f503a7f4d Bugfixes 2021-12-01 13:50:08 -05:00
Anuken
e30d090a2e arkycite recolor 2021-11-30 22:52:33 -05:00
Anuken
b3dd7f4b8b WIP arkycite 2021-11-30 18:13:34 -05:00
Matthew (or Maya) Peng
8cb830ba41
Make MoveLightningAbility alternating a boolean (#6390) 
* Revert "BlueWolf does not want MoveLightningAbility to mirror (#6376)"

This reverts commit e1685ef46c.

* boolean `alternate`

* Better Javadoc description
 2021-11-29 23:05:35 -05:00
Matthew (or Maya) Peng
3819e327e9
Grammar (#6383) 
* Grammar

* English is a terrible language
 2021-11-29 21:15:15 -05:00
Anuken
51fe07daef Backported EnumSet changes 2021-11-29 20:15:13 -05:00
Anuken
dc0904a6c7 Merge remote-tracking branch 'origin/master' 2021-11-29 20:14:05 -05:00
Anuken
feba9d677e Fixed #6389 2021-11-29 20:13:59 -05:00
Anuken
a0b7d96f67 Cargo tech tree entry 2021-11-29 20:12:43 -05:00
Anuken
6483d924af Unit cargo transport system 2021-11-29 20:06:49 -05:00
smol
582f05fa33
Fix a single pixel in Fuse's sprite (#6387) 
* Create m

* Delete m

* Add files via upload
 2021-11-29 12:23:16 -05:00
Anuken
635027bb81 Save unit variables in processors 2021-11-29 10:57:42 -05:00
Anuken
ea6d794c36 Fixd unit tests 2021-11-29 10:04:28 -05:00
Anuken
e2576f1538 Persistent unit IDs 2021-11-29 10:02:03 -05:00
Anuken
117fd3769e Fixed ConsumeLiquids dependencies 2021-11-28 20:57:47 -05:00
Anuken
68e0b0e27e Initial Erekir tech tree 2021-11-28 20:51:26 -05:00
Anuken
30e2d52341 Massive TechTree system cleanup 2021-11-28 13:48:06 -05:00
Anuken
c1477e1f2f WIP erekir tech tree 2021-11-27 18:23:41 -05:00
Anuken
5446b7c6f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-11-27 14:06:57 -05:00
Anuken
bc296728f9 Erekir thorium + Minor visual tweaks 2021-11-27 13:10:10 -05:00
Anuken
a24c15117d Cyanogen synthesis retexture 2021-11-27 12:17:45 -05:00
Anuken
0aa85163d2 weird liquid animations 2021-11-26 22:48:51 -05:00
Anuken
77b3a83826 WIP animated gas 2021-11-26 21:35:58 -05:00
buthed010203
c055407249
Fix editor camera panning (#6380) 
VSync being disabled will make the camera move unbearably fast currently as it isnt tied to frame time.
 2021-11-26 13:45:27 -05:00
Matthew (or Maya) Peng
e1685ef46c
BlueWolf does not want MoveLightningAbility to mirror (#6376) 2021-11-26 11:05:50 -05:00
Anuken
616fa8748f DrawRegion spinSprite 2021-11-25 18:54:35 -05:00
router
4eca2b4b0b
Make updateInUnits description actually readable (#6371) 2021-11-25 15:33:21 -05:00
Anuken
f214f38f08 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-25 13:29:51 -05:00
Anuken
04b1ba31a9 Fixed #6370 2021-11-25 13:29:35 -05:00
Anuken
d6fa71ba92 Scuttler disabled for now 2021-11-25 13:29:14 -05:00
Anuken
6c7dbdc91e Generative outlines for mod parts 2021-11-25 13:08:10 -05:00
Anuken
9b291a366a Fixed cyanogen color / Fixed liquid display negative values 2021-11-25 12:31:53 -05:00
Catchears
c24c5c6196
update german translation (#6354) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-11-25 12:09:16 -05:00
KuhnChris
cd0fbb4d81
(german translation) add missing liquid-container (#6353) 
* (german translation) add missing liquid-container

For some reason the liquid container has been missing in the translation file (at all)

* Update bundle_de.properties

Reorder and remove duplicate entry for description

* Update bundle_de.properties

bblock=>block

* Update bundle_de.properties

* Update bundle_de.properties

Plural->Singular, making sure tanks only store 1 kind of liquid.
 2021-11-25 12:07:50 -05:00
Anuken
d4ccbaa6df Merge remote-tracking branch 'origin/master' 2021-11-25 11:33:50 -05:00
Anuken
07696c7f92 Closes #6327 2021-11-25 11:33:44 -05:00
MrDuck557
ccfd062c85
ParticleEffect Rotation (#6323) 
* Additive

* ternary

* copypasta

I missed a total of 4 instances

* anuke has spoken

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-25 11:24:34 -05:00
Anuken
4c36abde28 Fixed payEnter creating ghost units 2021-11-25 11:09:13 -05:00
Anuken
1bcd48aadc ContinuousTurret ammo display 2021-11-24 19:23:08 -05:00
Anuken
78590abfc0 reinforced vault/container 2021-11-24 18:28:50 -05:00
Anuken
b7ac1e1d74 Stuff. 2021-11-24 13:33:01 -05:00
Anuken
3512190373 sublimate progress 2021-11-24 12:50:43 -05:00
Anuken
211c0b2e71 Sublimate visuals, damage/length still broken 2021-11-24 12:30:01 -05:00
Anuken
ba14151a01 A significant waste of time and effort 2021-11-23 22:41:25 -05:00
Anuken
4d49b0b2ee Visual tweaks 2021-11-22 23:02:35 -05:00
Anuken
3a9fdc8b3d Phase synthesizer implementation 2021-11-22 22:34:22 -05:00
Anuken
947864269b Slag-based incinerator 2021-11-22 14:48:26 -05:00
Anuken
d218480f6f Turret requirement cleanup / WIP ContinuousTurret type 2021-11-22 13:59:09 -05:00
Anuken
f7cf35369b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 13:17:36 -05:00
Build Uploader
42d931bff4 Automatic bundle update 2021-11-22 18:10:50 +00:00
Darkness#3729
4eb4c84b64
[RU] Update bundle (#6355) 
**Ban**dle
 2021-11-22 13:09:35 -05:00
Anuken
a0ba464de1 Fixed ja/zh unicode nonsense 2021-11-22 12:13:14 -05:00
Anuken
a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 12:11:31 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
ef1084302f Merge remote-tracking branch 'origin/master' 2021-11-22 10:31:10 -05:00
Anuken
c8397c9d10 Reverting bundle update (see description) 
The bundle updater removed quite a lot of comments and extra details. I will be rewriting the bundle launcher to fix this.
 2021-11-22 10:31:01 -05:00
Anuken
65f36faf71 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
 2021-11-22 10:12:48 -05:00
MrDuck557
25f98fdeb0
engineColor (#6360) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:11:03 -05:00
MrDuck557
f1e9d05163
blinkSize (#6359) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:08:57 -05:00
Anuken
6edf0a27a4 Fixed building relative rotations 2021-11-21 22:03:15 -05:00
Anuken
64efa599d0 Slag heater block 2021-11-21 14:06:18 -05:00
Anuken
0014c7a525 Slag centrifuge implementation 2021-11-21 11:59:35 -05:00
Anuken
4fcd873f65 Gallium 2021-11-20 17:59:24 -05:00
Anuken
77fb5a9a24 conflict 2021-11-20 15:07:07 -05:00
Anuken
d87ee0e942 conflict 2021-11-20 15:06:51 -05:00
Anuken
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Lin
aeaba6e111
Update bundle_zh_CN.properties (#6300) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2021-11-20 15:05:55 -05:00
Prosta4okua
0e8a677ecc
Update bundle_uk_UA.properties (#6290) 
* Update bundle_uk_UA.properties

Атака -> Наступ

* Update bundle_uk_UA.properties

конструкції->споруди

* Update bundle_uk_UA.properties

* Приголомшлює -> електризує

* Small fixes

→ -> "->"
елемент -> предмет
Оксино -> Оксиноя, better spelling

* Update bundle_uk_UA.properties
 2021-11-20 15:05:46 -05:00
Anuken
b4cd21752c Merge remote-tracking branch 'origin/master' 2021-11-20 10:58:12 -05:00
Anuken
d1a5198efc Fixed #6351 2021-11-20 10:58:07 -05:00
Anuken
f4c54b20f7 h 2021-11-20 10:56:21 -05:00
Anuken
7690f12682 What the hell is going on with jitpack 2021-11-20 10:32:28 -05:00
Anuken
a39d156d12 Optional beam drill liquid input / Fixed graphite color 2021-11-20 10:15:55 -05:00
Anuken
7d849b7ea0 I have spent far too much time redrawing this stupid sprite 2021-11-19 20:32:09 -05:00
Anuken
f3ace3a526 low effort large plasma bore 2021-11-18 16:22:53 -05:00
Anuken
275f6eb32f Overflow duct 2021-11-18 14:47:33 -05:00