mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
11,203 Commits 4 Branches 160 Tags 2.1 GiB
ae838b9392
Commit Graph

11203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick 'Quezler' Mounier
ae838b9392
Trace times joined & kicked (#4844) 
* Trace times joined & kicked

* Make mindustry.* import obsolete
 2021-03-03 09:09:05 -05:00
Anuken
4d9a30b7c7 Merge remote-tracking branch 'origin/master' 2021-03-02 18:45:22 -05:00
Anuken
ea82773157 Non-overdriveable core / Spurious mod warning fix 2021-03-02 18:45:18 -05:00
buthed010203
8289da1415
Nuclear reactor schem priority of -5 (#4840) 
* Nuclear reactor schem priority of -5
 2021-03-02 10:49:22 -05:00
Anuken
19eb6334b7 Merge remote-tracking branch 'origin/master' 2021-03-02 09:28:42 -05:00
Anuken
e992be1bfb Higher LogicBlock schem priority 2021-03-02 09:28:38 -05:00
MEEP of Faith
7e216d198e
Remove duplicates and mild formatting. (#4837) 
* Remove duplicate definitions in UnitTypes

* If Tsunami is indented, so should the others

It looks nicer as well.
 2021-03-02 09:28:04 -05:00
MEEP of Faith
a89d50e74d
Cursor should not change for other teams when hovering over doors and construction. (#4838) 
* Cursor should not change for other teams.

* Use Built-in interaction check

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

* Building should use built-in check, same treatment for ConstructBlock

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2021-03-02 09:25:15 -05:00
Anuken
05dc13c922 Fixed #4830 2021-03-01 13:06:47 -05:00
Patrick 'Quezler' Mounier
1de4dd1bfe
Call super.drawPlace for menders & overdrives (#4831) 2021-03-01 13:02:27 -05:00
Anuken
72aa87128e Merge remote-tracking branch 'origin/master' 2021-03-01 11:58:59 -05:00
Anuken
8f91576f85 Fixed script loading for Turkish locale 2021-03-01 11:58:53 -05:00
Patrick 'Quezler' Mounier
4019c49fff
Log who skipped the wave to the console (#4825) 2021-03-01 09:47:23 -05:00
Anuken
5f83c92829 Fixed #4824 / Fixed #4827 / Fixed #4829 2021-03-01 09:45:40 -05:00
Anuken
4c9cda7e40 Cleanup 2021-02-28 17:33:08 -05:00
Sunny Kim
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' Mounier
526157a514
Draw to-be affected blocks when placing projectors (#4818) 2021-02-28 13:58:06 -05:00
FiliusPatris
d025ba63e1
Display map names with underscores (#4819) 
This makes it obvious how to specify map names with spaces. It also
allows for copy-pasting form the output of `maps`.
 2021-02-28 13:27:47 -05:00
genNAowl
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 Fan
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' Mounier
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
buthed010203
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
buthed010203
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
d06eee99ba Merge remote-tracking branch 'origin/master' 2021-02-26 13:13:41 -05:00
Anuken
8349c8a5b8 Fixed #4802 2021-02-26 13:13:37 -05:00
Darkness6030
2df7484649
Add servers to global list (#4761) 
* Add servers to global list
 2021-02-26 11:13:51 -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 Fan
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
Minxyzgo
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
Anuken
befda9baaa Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-02-23 17:07:45 -05:00
Anuken
502c7eb388 arc 2021-02-23 17:07:40 -05:00
Antsiferov Andrew
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' Mounier
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