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

1190 Commits

Author SHA1 Message Date
Anuken
6e1eedc1ab Cleanup 2020-12-29 19:48:30 -05:00
Anuken
6357c17f8a Fixed #4164 / Fixed #4159 2020-12-29 10:13:27 -05:00
Patrick 'Quezler' Mounier
0e1e399788 Draw reconstructor in region during placement & unconnected (#4143) 
* Draw reconstructor in region during placement & unconnected

* Same as the previous commit, but for block loaders & unloaders
 2020-12-28 12:23:06 -05:00
Patrick 'Quezler' Mounier
d84a36b8ee Block loader/unloader progress bar changes (#4138) 
* Change block loader/unloader progess bar color & bundle

ammo -> items

* Make block unloader bar go down
 2020-12-28 10:44:59 -05:00
Anuken
990562dd71 Use sector preset name for maps if possible 2020-12-27 16:20:06 -05:00
Anuken
f174d1b2b4 Faster power graph reload / Fixed iOS editor margin 2020-12-27 12:59:49 -05:00
Anuken
a04e7d5612 Merge remote-tracking branch 'origin/master' 2020-12-27 10:16:39 -05:00
Anuken
16778ea16c Fixed #4141 / Fixed #4136 2020-12-27 10:16:34 -05:00
Sunny Kim
a606d9d85c bugfixes, call me the mother of the block forge (#4135) 
(anuke is the father)
 2020-12-27 10:04:19 -05:00
Sunny Kim
8d18649323 Block (un)loader major improvements (#4127) 
* make it consider consVaild

* make this too

* pattern style and max block size

* Is there a better way to do this?

* Update BlockUnloader.java

* do not the /0

* prevent /0

* test 1

* yup it works for enabled
 2020-12-26 22:10:37 -05:00
Anuken
fda9357b4b Fixed #4128 2020-12-26 09:49:03 -05:00
Anuken
9f8fce72d3 Better build beam visuals 2020-12-25 21:49:10 -05:00
Anuken
bba52e99e0 Fixed #4121 2020-12-25 12:34:02 -05:00
Sunny Kim
beed2e0b8f Block Forge improvements (#4112) 
* minBlockSize, maxBlockSize, icon

* removed fixed size

* same line

* revert to 3

* I almost forgot
 2020-12-25 00:02:15 -05:00
Patrick 'Quezler' Mounier
9397bd57c4 Prevents plastanium conveyor unload exploit (#4098) 
* Prevent unloaders from unloading plast loading dock

* Use overridable boolean method unloadable instead

* unloadable -> canUnload
 2020-12-24 10:33:40 -05:00
Patrick 'Quezler' Mounier
85a668c202 Prevent visual plastanium conveyor glitch when disabled (#4101) 2020-12-24 09:47:43 -05:00
Anuken
90372171b2 Fixed #4104 2020-12-24 09:44:24 -05:00
Patrick 'Quezler' Mounier
d144e9c91c Allow plastanium conveyor to be unloaded (#4087) 2020-12-23 09:39:29 -05:00
Patrick 'Quezler' Mounier
9d740e1e37 Rebrand power infinite as power source (#4088) 2020-12-23 09:39:04 -05:00
Anuken
a44f3c379f Ammo/shot display 2020-12-22 15:10:48 -05:00
Anuken
7ea12e97ec Fixed #4073 2020-12-22 11:28:33 -05:00
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
806cea4b33 Added building damage to bullet stats 2020-12-21 16:55: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
8da18984d2 Removed redundant Block#isVisible code 2020-12-17 12:38:22 -05:00
Patrick 'Quezler' Mounier
056afa572e Allow hidden blocks to be revealed by plugins (#4017) 
* Add revealedBlocks rule

(1/2)

* Use revealedBlocks rule

(2/2)
 2020-12-17 12:37:47 -05:00
Anuken
9f5183b36f Building cleanup 2020-12-17 11:38:03 -05:00
Anuken
4b1554db54 arc 2020-12-17 10:46:49 -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
Anuken
ddd9f2259c Fixed #3960 2020-12-13 10:27:44 -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