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

1017 Commits

Author SHA1 Message Date
Anuken
eda134a18c Merge remote-tracking branch 'origin/master' 2020-12-21 20:48:07 -05:00
Anuken
852013cd63 #4068 2020-12-21 20:48:00 -05:00
Sunny Kim
5b163d7843 Heat for accelerator (#4065) 
* heat

* better animations
 2020-12-21 20:04:04 -05:00
Anuken
952639a72e Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-21 13:10:00 -05:00
Anuken
e4e428f84a Fixed #4064 2020-12-21 13:09:08 -05:00
Patrick 'Quezler' Mounier
9a577adf5f Makes Drill.drawMineItem default to true (#4057) 
* Update Blocks.java

* Update Drill.java
 2020-12-20 15:22:34 -05:00
Anuken
e3c68b485d Placement rendering cleanup 2020-12-20 14:28:14 -05:00
Patrick 'Quezler' Mounier
bbdcef62e4 Draw item in the drill center when in place mode (#4055) 
* Draw item in the drill center when in place mode

* Update core/src/mindustry/world/blocks/production/Drill.java

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-12-20 14:22:14 -05:00
Patrick 'Quezler' Mounier
118ae8e87d #3889 2: electric boogaloo (#4056) 2020-12-20 14:22:01 -05:00
Patrick 'Quezler' Mounier
22221a0f28 Add in region to payload block icons (#4052) 2020-12-20 09:58:18 -05:00
Anuken
9e05f7604d Fixed #4043 2020-12-19 12:28:56 -05:00
Anuken
6783069f95 Merge remote-tracking branch 'origin/master' 2020-12-18 13:36:22 -05:00
Anuken
b0bf80d8b7 Cleanup 2020-12-18 13:21:51 -05:00
Patrick 'Quezler' Mounier
abcd27184d Update Drill.java (#4030) 2020-12-18 13:08:03 -05:00
Anuken
bd25294096 Generic node/bridge placement system 2020-12-18 12:41:13 -05:00
Anuken
a4f9518d1e testing winMM 2020-12-18 09:42:57 -05:00
Anuken
6815f3305f Better bridge linking 2020-12-17 18:35:50 -05:00
Anuken
3db04da20a Payload tweaks 2020-12-16 13:35:55 -05:00
Anuken
d0cba1aff2 Code cleanup 2020-12-16 10:39:28 -05:00
Slava0135
0c581c520f Conveyor upgrade system (#3912) 
* conveyor/conduit upgrading system

* style
 2020-12-15 10:52:20 -05:00
DeltaNedas
19af1a0cc8 make some proc stuff public 2020-12-12 15:57:43 +00:00
Anuken
e6c4a6cf69 Fixed #3932 2020-12-11 23:52:43 -05:00
Anuken
daaea591e4 Implemented #3486 with some minor changes 2020-12-11 11:48:20 -05:00
Anuken
c54f398063 Fixed Parallax not moving players serverside 2020-12-10 18:21:39 -05:00
Patrick 'Quezler' Mounier
2da7afc081 Update Accelerator.java 2020-12-10 12:15:29 +01:00
Patrick 'Quezler' Mounier
e5b341c63e Prevent accelerator from blending with conveyors 2020-12-10 12:14:57 +01:00
Anuken
a544888f16 cleanup 2020-12-09 20:20:22 -05:00
Anuken
57ad1d5366 Fixed #3899 2020-12-09 20:19:54 -05:00
Anuken
999cc9c651 Fixed #3890 2020-12-09 14:02:38 -05:00
Anuken
c93bc0e457 Fixed #3884 / Fixed #3881 / Fixed #3880 2020-12-09 10:49:26 -05:00
Anuken
e07a203d56 Don't use mods for floor decoration 2020-12-08 16:43:23 -05:00
Anuken
25125f5a9b Removed Tile#bc(), use Tile.build instead 2020-12-07 11:44:57 -05:00
Anuken
557cb1c532 Fixed #3834 / Fixed #3835 / Fixed #3837 2020-12-07 11:10:19 -05:00
Anuken
f9cfc8a2b8 Fixed #3812 / Fixed #3813 2020-12-05 20:48:56 -05:00
Anuken
97fa8057ba Fixed #3805 2020-12-05 14:16:02 -05:00
Anuken
744b1b2037 Looking into test failure 2020-12-04 10:56:47 -05:00
Anuken
a313ca8a26 Checking if tests fail 2020-12-04 10:44:39 -05:00
Anuken
51b4078288 Clean tests before running 2020-12-03 11:05:02 -05:00
Anuken
9fa2691b02 Fixed campaign idle boss spoofing 2020-12-03 10:05:52 -05:00
Patrick 'Quezler' Mounier
2e586c4403 Update ConstructBlock.java 2020-12-02 18:54:46 +01:00
Patrick 'Quezler' Mounier
129f21e3a9 Update Boulder.java 2020-12-02 18:01:40 +01:00
Patrick 'Quezler' Mounier
435f15a450 Update ConstructBlock.java 2020-12-02 18:00:50 +01:00
Patrick 'Quezler' Mounier
3eac8cb6ad Update Boulder.java 2020-12-02 17:59:20 +01:00
Patrick 'Quezler' Mounier
e4c3664cc6 Update ConstructBlock.java 2020-12-02 16:36:07 +01:00
Patrick 'Quezler' Mounier
664cd6a3a0 Update ConstructBlock.java 2020-12-02 16:26:22 +01:00
Anuken
c26a9bd123 Merge pull request #3715 from Quezler/patch-75 
Keep items inside reconstructor when construction booped
 2020-12-02 10:05:51 -05:00
Patrick 'Quezler' Mounier
b64df565a4 Update MassDriver.java 2020-12-02 14:09:19 +01:00
Patrick 'Quezler' Mounier
0dd95e736d Add items back to reconstructor if it overwrote itself 2020-12-02 12:01:21 +01:00
Anuken
327442f6fe Merge pull request #3676 from Quezler/patch-74 
Fix BlockForge progress bar & recenter payload
 2020-12-01 16:53:13 -05:00
Anuken
c03400ccbc Merge pull request #3622 from genNAowl/distributors-come-on 
Allow Distributors to Replace Conveyors
 2020-12-01 16:46:09 -05:00