Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,268 Commits 4 Branches 180 Tags
cdf14bb381011d532d715da7ae695f42805c0a0f
Commit Graph

2476 Commits

Author SHA1 Message Date
Anuken
34b22f292c PR cleanup 2023-04-08 10:52:53 -04:00
JniTrRny
6dc3b7e729 More Dark UI in stats display (#8473) 
* The Dark UI Menace

* Attack of the Dark UI
 2023-04-06 19:07:24 -04:00
Anuken
2b11e1fb1e Fixed #8480 2023-04-06 12:15:12 -04:00
Anuken
72b456fca2 Optimized imports 2023-04-06 10:46:52 -04:00
Anuken
e62a5888ef Fixed some possible crashes 2023-04-03 16:40:12 -04:00
MEEPofFaith
6d71bcd2eb Multi shotgun fix (#8460) 
* Multi-barrel shotgun fix

* multi-recoil support

* @Nullable for everything
 2023-04-03 16:38:10 -04:00
MEEPofFaith
f55363a932 Fix janky sublimate ammo display (#8469) 2023-04-03 10:03:24 -04:00
MEEPofFaith
b322b1165f Parse singular consumes (#8466) 
* Parse singular `Consume`s

* Proper coolant parsing

* Temporary manual update of ClassMap

Does not include all consume types.

I don't know what gradle command to run to update `ClassMap`. I've tried `tools:updateScripts` but that just cleared everything.
 2023-04-02 19:53:19 -04:00
Anuken
251e10b000 Fixed #8465 2023-04-02 13:28:49 -04:00
Anuken
c267743874 Fixed #8463 2023-04-02 10:38:19 -04:00
MEEPofFaith
e51ab514a8 Proper speedup amount (#8461) 2023-04-02 00:19:33 -04:00
Anuken
fff8f567d0 Hide weapon sprites for certain units 2023-04-01 17:30:05 -04:00
Anuken
cc3694ce4a battery fix 2023-04-01 09:55:54 -04:00
Anuken
d2f2189441 Merge remote-tracking branch 'origin/master' 2023-03-31 22:03:02 -04:00
Anuken
e81cd5b68e Better impl of #8451 2023-03-31 22:02:57 -04:00
MEEPofFaith
ac19c3f160 bridgeReplacement for ducts (#8447) 2023-03-30 21:23:53 -04:00
MEEPofFaith
0de2c95f6e (Optionally) Scale efficiency of attribute crafters (#8433) 
* Scale efficiency of attribute crafters

* Make it optional :D

* Call super
 2023-03-26 14:53:14 -04:00
MEEPofFaith
fcb44e4952 Fix frags in frags creating a large empty space (#8430) 
* Fix frags in frags creating a large empty space

* Change suppression message

Consistency with status duration

* Too little space between boxes
 2023-03-26 11:53:46 -04:00
MEEPofFaith
6b936aa7f6 Better Ammo Stats Display (#8429) 
* Cleaner ammo stats based on unit factory recipe stats

* Display suppression in bullet stats

Also reword from "regen" to "repair" to more accurately convey that build towers are affected as well.

* PointLaserBulletTypes don't display damage in dps

* Display preview region instead of region

* autoFixed
 2023-03-25 22:45:07 -04:00
MEEPofFaith
9c3ddc398c Battery Graphical Updates (#8323) 
* Battery Graphical Updates

* Add the vanilla fields back

* Add back topRegion and depricate it
 2023-03-25 14:00:08 -04:00
BalaM314
08f63122ba Set controller after setting spawnedByCore (fix UnitChangeEvent) (#8428) 
* CoreBlock.playerSpawn: Set spawnedByCore first
* The call to unit.controller() calls player.unit(unit)
* That function fires UnitChangeEvent
* The unit in UnitChangeEvent has spawnedByCore incorrectly set to false
* This caused me to waste an hour of my life while making a plugin

* Might as well improve code readability
 2023-03-25 13:55:26 -04:00
MEEPofFaith
90f7bbae65 Make an interface for blocks that spawn tethered units (#8395) 2023-03-25 13:51:43 -04:00
Anuken
663fa2bd3f Fixed #8399 2023-03-25 13:16:12 -04:00
Anuken
ca2b51d4fe Merge remote-tracking branch 'origin/master' 2023-03-09 05:25:41 -05:00
Anuken
bae3884d96 Basic setProp implementation 2023-03-09 05:25:35 -05:00
MEEPofFaith
515a6f9c8d json-able attributes (#8334) 2023-03-08 13:11:53 -05:00
MEEPofFaith
10e0be9d68 Drill multipliers for regular drills and beam drills (#8339) 
* Drill multipliers for other drills

* h
 2023-03-08 09:19:57 -05:00
MEEPofFaith
a3f8ca9ca5 Shield flash on top (#8373) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2023-03-08 09:17:39 -05:00
MEEPofFaith
a046f0f11b Non-hexagonal force projectors (#8358) 2023-03-08 09:16:07 -05:00
MEEPofFaith
0a1957eb13 Display Interval Bullet in Stats + Collapsers (#8366) 
* Display interval bullets in stats

* Collapsers for sub-bullets

* highlight /sec as well

* top
 2023-03-08 09:10:34 -05:00
MEEPofFaith
75e1e6f166 Player unit spawns before core animation finishes (#8375) 
* Player unit spawns before core animation finishes

* the

* Shouldn't the landing particles also be aimed at the tile's world pos?
 2023-03-08 08:26:11 -05:00
MEEPofFaith
0760923943 overRegion (#8337) 2023-02-27 11:26:47 -05:00
MEEPofFaith
219084fe3c Don't generate edges if edges already exist (#8338) 2023-02-27 11:26:26 -05:00
Anuken
b569646310 fixed ignoreLiquidFullness 2023-02-26 23:03:03 -05:00
Anuken
e234ac43a6 Fixed keybind names 2023-02-25 11:38:18 -05:00
MEEPofFaith
348819d1ac connectedPower similar to conductivePower (#8306) 2023-02-15 23:22:05 -05:00
MEEPofFaith
a8a3453632 Move core launch/landing to CoreBlock (#8055) 
* Move core launch/landing to CoreBlock

* Slight cleanup

* just gonna...
 2023-02-15 12:16:51 -05:00
MEEPofFaith
cc3ae2c66c Use setBars instead of overriding displayBars (#8296) 2023-02-15 08:59:57 -05:00
Anuken
40ec7fd6fc Less Core.app.post for build events 2023-02-15 08:57:06 -05:00
Anuken
d17f0ebc51 Fixed #8297 2023-02-15 08:35:53 -05:00
Anuken
0b7c790777 turret status fix 2023-02-14 15:08:24 -05:00
WayZer
53f410fee0 Fix Turret bug when cheat (#8273) 
* （C/S) Fix ItemTurret ammo when `cheat`.

* （C/S) Fix `TurretBuild.updateReload` NPE when `cheat`
 2023-02-09 09:20:06 -05:00
MEEPofFaith
f1fb7d8098 Fix modded payload conveyor icons (#8266) 2023-02-08 22:28:44 -05:00
Даркнесс#3729
c945243795 It doesn't work (#8237) 2023-02-01 14:45:00 -05:00
Anuken
f833b9e0ce Fixed #8236 2023-02-01 14:09:16 -05:00
Anuken
b4359c0489 Merge remote-tracking branch 'origin/master' 2023-01-16 15:28:45 -05:00
Anuken
977192bc54 Fixed #8187 2023-01-16 15:28:40 -05:00
南门阳德
d54b557a9f Revert #8176 (#8186) 
Liquid turrets are used to give buff like wet but not do the damage. The ammo change is not appropriate.
 2023-01-16 11:07:00 -05:00
Anuken
6d7c207b95 Fixed drawing of assembler payloads 2023-01-15 08:51:51 -05:00
Anuken
3159ce6707 Merge remote-tracking branch 'origin/master' 2023-01-13 19:34:52 -05:00