Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,332 Commits 4 Branches 180 Tags
36aa9d56964c2b6754111b6eb72941a80df34767
Commit Graph
3329 Commits
Author SHA1 Message Date
Sunny KimandGitHub 01f7b1c9a6 New overdrive visuals for colorblind users (#4807) 2021-02-28 17:32:28 -05:00
Anuken 1a30edc55f Merge remote-tracking branch 'origin/master' 2021-02-28 17:17:08 -05:00
Anuken 49bccffd7c Link previews for power blocks near nodes 2021-02-28 17:17:03 -05:00
Patrick 'Quezler' MounierandGitHub 526157a514 Draw to-be affected blocks when placing projectors (#4818) 2021-02-28 13:58:06 -05:00
genNAowlGitHubLeonwang4234
 		662515ce2e Make RepairPoints implement Ranged (#4813) 
Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
 2021-02-28 09:19:35 -05:00
Joshua FanandGitHub c55ff4ad5e Desktop double-click mining: fix click on mined tile to cancel (#4815) 2021-02-28 09:19:27 -05:00
Anuken 666c0f3582 Merge remote-tracking branch 'origin/master' 2021-02-27 15:10:39 -05:00
Anuken 0c00760ae0 Fixed result duplication in logic UI 2021-02-27 15:10:34 -05:00
Patrick 'Quezler' MounierandGitHub 2146b35e5a eacho ther (#4810) 
* eacho ther

* Update Tile.java
 2021-02-27 10:21:11 -05:00
Anuken 44d10a355e Improved power node link preview check 2021-02-27 10:16:54 -05:00
buthed010203andGitHub 5037c4e00e Fix a few issues w/ double tap mining (#4798) 
Currently, double tap mining consumes clicks so it prevents the player from configuring any block if they click twice within 500ms. The double tap mining was also using the `selected` var which could have been null causing a crash. This is a very messy solution but it does the job good enough
 2021-02-27 10:12:00 -05:00
buthed010203andGitHub e4ecfc4ee7 Fixed #4791 since it is 100% a bug (#4801) 
* Fixed #4719 since it is 100% a bug

This fix is somewhat janky as it checks if the rotation matches the exact original rotation but the likelihood of someone needing bridges along a belt rotated 1 or -1 times is super low. https://aethex.is-a.fail/t13ETd.webm

* unjank rotation

* fix potential crash, styling

* Use mathf.mod
 2021-02-26 19:06:27 -05:00
Anuken ae6be1db3b UnitSpawnAbility 'type' field JSON compat / Fixed health bar out of bounds 2021-02-26 18:51:14 -05:00
Anuken 8349c8a5b8 Fixed #4802 2021-02-26 13:13:37 -05:00
Anuken 1bb97cae39 Fixed #4792 2021-02-25 18:34:24 -05:00
Anuken f5ac3ff7b0 null controller for dead units 2021-02-25 10:54:05 -05:00
Anuken f6eba3edae Synchronized settings / Dead units sense as non-controlled 2021-02-25 09:12:17 -05:00
Joshua FanGitHubAnuken
 		781410ea04 Double-tap to mine, tap anywhere to cancel (#4469) 
* Double-tap to mine, tap anywhere to cancel

* Make comment consistent

* Remove desktop left-click mining cancel, prioritize mobile unit control over mining

* Mobile: double-tap doesn't configure blocks if unit was double-tapped; control unit detected in first tap of double-tap

* Add 'double-tap to mine' setting (default off)

* Desktop: cancel mining when mined tile is clicked

* Comment typo

* Prevent redundant condition check

* Cleanup

Co-authored-by: Anuken <arnukren@gmail.com>
 2021-02-25 08:43:40 -05:00
Anuken c0d9712beb Fixed #4784 2021-02-25 08:39:35 -05:00
Anuken 0672878920 Fixed #4781 2021-02-24 15:27:22 -05:00
Anuken b0cdac59f0 Merge remote-tracking branch 'origin/master' 2021-02-24 15:01:48 -05:00
Anuken 4b6a83dd82 Improved auto-bridging with conveyors 2021-02-24 15:01:44 -05:00
MinxyzgoandGitHub 25ae7b97aa schematic uses camera position (#4775) 
* Update InputHandler.java

* Update InputHandler.java

* Update MobileInput.java

* Update InputHandler.java

* Update MobileInput.java
 2021-02-24 12:25:38 -05:00
Anuken afbde49fa2 Fixed #4776 / Fixed #4772 2021-02-24 09:52:53 -05:00
Antsiferov AndrewandGitHub ad2a18f929 Fix player.locale to be default (#4768) 
* fix player.locale == default

* Update NetClient.java
 2021-02-23 14:53:23 -05:00
Anuken 830eb86a0f Better power node linking visualization 2021-02-23 12:53:43 -05:00
Anuken e5413cebdc Fixed #4766 2021-02-23 11:29:51 -05:00
Anuken 1a75951840 Merge remote-tracking branch 'origin/master' 2021-02-23 10:47:58 -05:00
Anuken 08e36aca98 Crafter progress modulo / Segment buff 2021-02-23 10:47:54 -05:00
Patrick 'Quezler' MounierGitHubAnuken
 		aabbfd624a Add disarmed status effect that disarms (#4762) 
* Add disarmed status effect that disarms

* Update core/src/mindustry/entities/comp/StatusComp.java

Co-authored-by: Anuken <arnukren@gmail.com>

* Rename disarms -> disarm

Co-authored-by: Anuken <arnukren@gmail.com>
 2021-02-23 09:51:43 -05:00
Anuken d7f848f8cd contXXXXX constants -> ctrl 2021-02-22 10:18:42 -05:00
Anuken e2515fc4bf Automatic conveyor/conduit bridging 2021-02-22 10:15:40 -05:00
Anuken 9e8a2b8296 Minor bridge linking fix 2021-02-21 20:07:20 -05:00
Anuken e6787c5146 Controlled sensor improvements 2021-02-21 12:28:00 -05:00
Anuken d8552915f7 Cleanup 2021-02-21 10:35:33 -05:00
Anuken 61d9dea487 Logic config replication / logicUnitBuild rule / Copy-able ConstructBlocks 2021-02-21 10:23:46 -05:00
Anuken 02d8f679b5 Merge remote-tracking branch 'origin/master' 2021-02-21 09:22:05 -05:00
Anuken 544828d9fb Logic controller & dead`` sensors 2021-02-21 09:22:02 -05:00
liuxiluandGitHub ca726d579e unit boosting sensor (#4738) 2021-02-21 09:20:36 -05:00
Anuken 8257fb5e11 Merge remote-tracking branch 'origin/master' 2021-02-21 08:54:10 -05:00
Anuken 0d287e6d59 Water Extractor: Use metaglass to be consistent with pumps 2021-02-21 08:53:47 -05:00
Patrick 'Quezler' MounierandGitHub 4d9dc66a96 Remove stray spaces from accelerator (#4465) 2021-02-20 12:52:56 -05:00
Patrick 'Quezler' MounierandGitHub 868d4e05f7 Move update function of resupply point 5x1 spaces back (#4746) 2021-02-20 12:51:12 -05:00
Anuken a3bf39d86b Minor cleanup 2021-02-20 10:08:15 -05:00
Anuken 158e23bd5e Steam icon changes 2021-02-19 19:43:37 -05:00
Anuken 467402ef73 Various fixes 2021-02-19 19:20:04 -05:00
Anuken 0316009a9c Balance tweaks 2021-02-19 18:28:51 -05:00
Anuken f043a5f340 Logic tooltips on mobile devices w/ long-press 2021-02-19 17:18:17 -05:00
Anuken fa7697fc40 Better JSON null validation / Disable mods on startup crash 2021-02-19 13:28:31 -05:00
Anuken b46a5c0bda Allow JSON mod content types from other class loaders 2021-02-19 09:45:51 -05:00