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

2120 Commits

Author SHA1 Message Date
Anuken
7de6bd23ea Fixed #8529 2023-04-28 10:29:47 -04:00
Anuken
13297023fe Fixed #8525 2023-04-21 21:24:18 -04:00
Anuken
b83f5c66ca Fixed #8507 2023-04-15 22:17:46 -04:00
Anuken
e8fbfe536e Merge remote-tracking branch 'origin/master' 2023-04-09 18:16:30 -04:00
Anuken
b86ca1d12f Fixed #8496 2023-04-09 18:16:25 -04:00
MEEPofFaith
1629afe491 Ammo obliteration (#8498) 
* alwaysShooting for turrets

similar to alwaysShooting for weapons

* Weapon alwaysShooting takes shootCone into account

Speaking of untested PRs...
 2023-04-09 16:12:24 -04:00
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
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
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
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
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
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
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
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
Даркнесс#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
Anuken
9b033532c8 Fixed #8177 2023-01-13 19:34:48 -05:00
Даркнесс#3729
0678592d59 Fix cheaty item and liquid turrets (#8176) 
* Update Turret.java

* Update TractorBeamTurret.java

* Update TractorBeamTurret.java

* Update ItemTurret.java

* Update LiquidTurret.java
 2023-01-13 16:51:36 -05:00
Anuken
54962a158d Fixed #8168 2023-01-12 17:01:47 -05:00
Anuken
be8fec55e1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-01-07 16:22:06 -05:00
Anuken
76430c1e68 a 2023-01-07 16:21:03 -05:00