Commit Graph
6249 Commits
Author SHA1 Message Date
Anuken 9e05f7604d Fixed #4043 2020-12-19 12:28:56 -05:00
Anuken 7f863abb06 Hide map when opening planet map 2020-12-18 20:39:16 -05:00
Anuken 0dd3c2cb5a Fixed #4033 2020-12-18 17:22:01 -05:00
Anuken 9d9cbdffd5 Pulsar nerf 2020-12-18 16:33:43 -05:00
Anuken 8d43590657 Multiblock damage calculation bugfix 2020-12-18 14:56:14 -05:00
Anuken 6783069f95 Merge remote-tracking branch 'origin/master' 2020-12-18 13:36:22 -05:00
Anuken b33b3a7919 Always-on weather rule support 2020-12-18 13:36:18 -05:00
Anuken b0bf80d8b7 Cleanup 2020-12-18 13:21:51 -05:00
Patrick 'Quezler' MounierandGitHub abcd27184d Update Drill.java (#4030) 2020-12-18 13:08:03 -05:00
Anuken 5de2c0c512 Merge remote-tracking branch 'origin/master' 2020-12-18 12:41:23 -05:00
Anuken bd25294096 Generic node/bridge placement system 2020-12-18 12:41:13 -05:00
Ilya246andGitHub a8bae56b2c fix comment (#4026) 2020-12-18 09:44:15 -05:00
Anuken a4f9518d1e testing winMM 2020-12-18 09:42:57 -05:00
Anuken 91692f362f Mod browser cleanup 2020-12-17 21:17:55 -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' MounierandGitHub 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 0d81681af5 Merge remote-tracking branch 'origin/master' 2020-12-17 10:46:53 -05:00
Anuken 4b1554db54 arc 2020-12-17 10:46:49 -05:00
rMuchanandGitHub 9a777f3ce5 fix health calculation in background sectors (#4011) 2020-12-17 10:09:28 -05:00
Anuken b8efed9eaf Better space skybox scaling 2020-12-16 19:52:10 -05:00
Anuken cd7d2163b9 Merge remote-tracking branch 'origin/master' 2020-12-16 19:47:43 -05:00
Anuken 59c85a486f Fixed phase deflect achievement 2020-12-16 19:47:40 -05:00
DeltaNedasandGitHub 8bc349b68c add @commanded for units (#3870) 2020-12-16 19:42:48 -05:00
9a88426ff7 raw strings for SurfaceShaders (#4004)
* SurfaceShaders thing

* Update core/src/mindustry/graphics/Shaders.java

spacing fix

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* star import

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
2020-12-16 19:39:08 -05:00
Anuken d0bf3d6fa1 Merge remote-tracking branch 'origin/master' 2020-12-16 19:33:36 -05:00
Anuken bc2c7be45d Fixed #4010 2020-12-16 19:33:29 -05:00
DeltaNedasandGitHub 74a7dc5eb9 allow mods to set zoom limits (#4006)
* allow mods to set zoom limits

* rounding

* dont round min

* zoom 1.5 -> 1
2020-12-16 16:41:08 -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
Anuken 4ad234ad75 Merge remote-tracking branch 'origin/master' 2020-12-16 09:28:11 -05:00
Amaoto InochiandGitHub 15116ca384 fix the wrong unit ai path of mod content parser (#3998) 2020-12-15 19:55:31 -05:00
Anuken 446dd6abe5 Consistent water bullet drag 2020-12-15 19:25:23 -05:00
Anuken ff254d4fdf Fixed #3997 2020-12-15 19:09:33 -05:00
Anuken eaa5e6f5a1 Increased foreshadow coolant multiplier 2020-12-15 18:39:44 -05:00
Anuken b90f51224c Fixed #3996 2020-12-15 18:07:15 -05:00
Anuken 6ab96e2787 Fixed #3987 2020-12-15 14:15:06 -05:00
Anuken 659c481c83 cleanup 2020-12-15 11:15:39 -05:00
Anuken a18e1854ab Null checks & cleanup of upgrade pathing 2020-12-15 10:58:03 -05:00
Anuken 6c67dc1266 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-15 10:52:38 -05:00
Slava0135andGitHub 0c581c520f Conveyor upgrade system (#3912)
* conveyor/conduit upgrading system

* style
2020-12-15 10:52:20 -05:00
Anuken c6c18696c0 Cleanup 2020-12-15 10:28:12 -05:00
Anuken 8a5bd7571e 121.3 2020-12-14 22:55:58 -05:00
Anuken ff93c21269 Merge remote-tracking branch 'origin/master' 2020-12-14 16:31:01 -05:00
Anuken cec1eb5608 Fixed jitpack build error 2020-12-14 13:42:48 -05:00
Anuken 16f7a8e9d2 Merge remote-tracking branch 'origin/master' 2020-12-14 13:29:59 -05:00
Anuken f4d0dfd0da Less junction capacity (again) 2020-12-14 10:36:37 -05:00
SkatandGitHub aee5d46dfa Code formatting (#3904) 2020-12-13 23:56:13 -05:00
DeltaNedasandGitHub ffa7256e5a add ContentInitEvent (#3951)
* add ContentInit(ialized)Event

* a

* a
2020-12-13 23:43:27 -05:00