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

2456 Commits

Author SHA1 Message Date
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
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
598049265a Complete revert of #8019 2023-01-13 09:59:01 -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
Garen7
832b5e62bf Fixes typo on Payload Mass Drivers (#8090) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 16:14:04 -05:00
Anuken
f1e1eb1015 Fixed #8015 2023-01-07 14:54:15 -05:00
Anuken
542bf2b413 Fixed #8084 2023-01-07 14:26:25 -05:00
GlennFolker
93f630bb69 Make custom Env flag reliably possible (#8019) 
* Make custom Env flag reliably possible

* screw you

* "compatibility" for mods that don't use add()
 2023-01-07 13:48:28 -05:00
Anuken
b4137dca6e Fixed #7978 2023-01-07 12:37:37 -05:00
Anuken
0c9f2b2687 Fixed #8092 2023-01-07 12:06:57 -05:00
Anuken
96477f7ff5 Merge remote-tracking branch 'origin/master' 2023-01-07 12:03:58 -05:00
Anuken
1236e8d342 Fixed #7922 2023-01-07 12:03:54 -05:00
MEEPofFaith
47353cc808 Power icon (#7901) 
* Power icon

* Less yellow yelloow
 2023-01-07 11:49:59 -05:00
MEEPofFaith
6eadac38b7 placeEffect (#7968) 2023-01-07 11:46:14 -05:00
whert-dev
0d26b9e4f8 Added angleOffset to DrawPistons (#7950) 2023-01-07 11:45:33 -05:00
Garen7
a3a071e520 Additional block build over options (#7993) 
* Adds missing block groups

* Allows electrolyzers to be rotated by bulding over them too

Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 11:43:23 -05:00
MEEPofFaith
5af8236643 Move beam drill facing update (Fix minor graphical glitch) (#8004) 
* move beam drill facing update

* Add updateFacing back to updateTile

* Stop consuming if not drilling anything.
 2023-01-07 11:43:07 -05:00
end-me-please
b18fd82a21 Update LogicBlock.java (#8032) 2023-01-07 11:39:05 -05:00