Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-21 21:38:29 +03:00
Code Issues Projects Releases Wiki Activity
11,353 Commits 4 Branches 160 Tags 2.1 GiB
d04eaa81e0
Commit Graph

9614 Commits

Author SHA1 Message Date
Anuken
4f0f2499be mod.multiplayercompatable in gray 2021-03-05 11:19:55 -05:00
MEEP of Faith
d34dd0c603
Add message for mods that have hidden = true (#4717) 
* Multiplayer compatability message

* Make more sense?
 2021-03-05 11:17:55 -05:00
Anuken
b6c645b701 Better DefenderAI / Vela building / Anuken/Mindustry-Suggestions/issues/2074 2021-03-05 11:10:12 -05:00
MEEP of Faith
0c28bb7dcf
DefenderAI that makes octs follow units (#4757) 2021-03-05 10:21:26 -05:00
Anuken
2bb303e709 Fixed #4856 2021-03-04 18:41:30 -05:00
Anuken
cc65feb392 Added ConnectionEvent 2021-03-04 18:39:47 -05:00
Anuken
c12b9ee3e3 Minor network packet handling tweaks 2021-03-04 17:58:28 -05:00
Anuken
d863c971c2 Gradle update / Mech animation fixes / Formation movement tweaks 2021-03-04 13:40:50 -05:00
MEEP of Faith
3ccdf45ed1
Is this what you wanted sk? (#4848) 2021-03-04 10:38:47 -05:00
Javier Domingo Cansino
efa5c5db7b
Enable client to use a different data dir through env MINDUSTRY_DATA_DIR (#4851) 2021-03-04 10:34:23 -05:00
Anuken
d73cf9fcff Prevent early return in PowerNode config render 2021-03-03 14:42:41 -05:00
Anuken
93dafc82eb Fixed #4847 2021-03-03 12:44:56 -05:00
buthed010203
019898dfc3
Turrets can properly replace eachother, cores can replace conveyors and minor cleanup. (#4841) 2021-03-03 09:15:50 -05:00
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
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
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 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
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
Anuken
d7f848f8cd contXXXXX constants -> ctrl 2021-02-22 10:18:42 -05:00
Anuken
6f7f980563 Merge remote-tracking branch 'origin/master' 2021-02-22 10:15:43 -05:00
Anuken
e2515fc4bf Automatic conveyor/conduit bridging 2021-02-22 10:15:40 -05:00
Sharlotte
dbdfdac94b
translated yesterday update (#4755) 
* translated newest bundle updates
* ps. why did i forgot 1ef7ae7079 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c) this commit previous translation update?
 2021-02-22 09:19:46 -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
liuxilu
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' Mounier
4d9dc66a96
Remove stray spaces from accelerator (#4465) 2021-02-20 12:52:56 -05:00
Patrick 'Quezler' Mounier
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
Sharlotte
d76795e0ae
translated recent update (#4742) 2021-02-20 10:07:29 -05:00
Ngọc Lam
a2e075ee54
Update Vietnamese Translation. (#4660) 
* Update translation, fix some typo

* About 150 lines to do left.

* Typos fix #_1

* Typos fix + add trans

* Update to lastest commit.

* Base logic translation.

* a lot of typo ...

* some update from main bundle.

* Add more logic hint.
 2021-02-20 10:07:19 -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
f78719afc0 Fixed mod crash disable setting name 2021-02-19 19:10:27 -05:00
Antsiferov Andrew
e6513702d6
[Bundle][RU] actual L10n (#4726) 
* 3 new, 1 deleted

New:
rules.unitcapvariable
rules.unitcap
laccess.color

Deleted:
lenum.color

* 1 line changed

rules.unitcap

Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
 2021-02-19 18:33:43 -05:00
Arnyyx
aeddf7014c
Update bundle_vi.properties (#4724) 2021-02-19 18:32:52 -05:00
Catchears
1613f49c16
german translation for build 125, full android translation (#4703) 
* update german translation to 631e4d9eef

* update android translation to e816f6110d

with regard to 5ec5f1aa93

* improve translation with ideas from others

* update german steam discription to e86a3e9d09

* update german translation to 1ef7ae7079 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c)

* changes from stuffyAI

* cross-platform as suggested by stuffyAI

* stuffyAI

genau, hast recht

Co-authored-by: stuffyAI <59014072+stuffyAI@users.noreply.github.com>

Co-authored-by: stuffyAI <59014072+stuffyAI@users.noreply.github.com>
 2021-02-19 18:32:44 -05:00
彭瑞暄
57a833c2fb
Update Logic Draw Hints (#4734) 
Wrapped up some previous logic hints, too.
 2021-02-19 18:32:32 -05:00
BlueThecno
6de53343a4
Fixing typos and descriptions [bundle_es.properties] (#4727) 
* Fixing and descriptions [bundle_es.properties]

* Forgot something
 2021-02-19 18:32:17 -05:00
YellOw139
7bb4b09308
[Bundle][RO] Update (#4725) 
* [Bundle][RO] Update

This PR was tested in-game and is ready to merge at any time.

Changelog:

- New strings/changes up to commit 1ef7ae7079
- Typo fixes & various other improvements

* Reducing confusion

* Update bundle_ro.properties
 2021-02-19 18:32:07 -05:00
Anuken
68020fa7d4 Fixed "fix" in #4397 2021-02-19 18:31:34 -05:00
Phinner
b94aba0301
Fixing remaining typos\errors in bundle_fr (#4397) 
* Fixing remaining typos errors in bundle_fr

There are some errors that had managed to get through the verification. Imma chase them down!

* added logic hints and some typo fixes

* Fixing 2 typos in bundle.properties

L1548: Color statement affects every following draw operations.

* smolfixes
 2021-02-19 18:30:49 -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
Anuken
1072c310ad Fixed #4732 2021-02-19 09:04:13 -05:00
Anuken
d5448b59a2 Fixed UnitReq parsing 2021-02-18 21:07:48 -05:00
Anuken
78317e6126 Uncap content names in resolution 2021-02-18 20:15:46 -05:00
Anuken
5a58f9c71a Fixed #4729 2021-02-18 17:00:23 -05:00
Anuken
06b8dd61c7 Better splash damage handling for small radii 2021-02-18 15:02:09 -05:00
Anuken
a7188c4884 Content parser class discovery improvements 2021-02-18 13:11:20 -05:00
Anuken
d0dc1ea132 Fixed #4715 2021-02-17 17:12:32 -05:00
Anuken
76dbdb59ce Draw cells for unit payloads 2021-02-17 11:02:49 -05:00
Anuken
0013402962 Merge remote-tracking branch 'origin/master' 2021-02-17 09:49:08 -05:00
Anuken
1ef7ae7079 Logic hints for draw operations 2021-02-17 09:49:01 -05:00
buthed010203
07a39d0da8
V6 servers arent BE last i checked (#4713) 
This has been bothering me the last few days and i assumed someone else would fix it and i wouldnt have to make a pr for something so tiny but here i am
 2021-02-17 09:36:31 -05:00
Anuken
b8bfb30c56 Merge remote-tracking branch 'origin/master' 2021-02-17 09:15:21 -05:00
Anuken
00342ddaae Misc cleanup 2021-02-17 09:15:17 -05:00
Sharlotte
fb40c0b9de
cursed typo (#4705) 
cursed typocursed typocursed typocursed typocursed typocursed typocursed typocursed typo
 2021-02-17 09:12:49 -05:00
Anuken
080fe8c3c4 Decreased impact reactor explosion radius 2021-02-16 15:54:20 -05:00
Anuken
48745d7380 Steam crash fix 2021-02-16 13:40:34 -05:00
YellOw139
41b50d67af
[Bundle][RO] Update (#4696) 
This PR was tested in-game and is ready to merge at any time.

Changelog:

- New strings/changes up to commit 631e4d9eef
- Typo fixes & various other improvements
 2021-02-16 13:12:29 -05:00
Vanguard
b65dffca9d
4 new, 1 changed (#4688) 
New:
enablebuilding
stat.armor
setting.logichints.name
(newline between radar.output and unitradar.target)

Changed:
lenum.turret
 2021-02-16 13:12:17 -05:00
Sharlotte
66bdfcf877
[KO] Update bundles again (#4695) 
*translated updated new logic hint
*translated new rule
*typo
 2021-02-16 13:12:06 -05:00
Anuken
b0082c92c5 Fixed green line bug - Removed stencil+depth buffers 2021-02-16 13:02:15 -05:00
Anuken
1ffdd9fd99 Fixed #4701 2021-02-16 12:20:30 -05:00
Anuken
214f3bb9b5 Improved data file zipping 2021-02-16 10:57:20 -05:00
Anuken
2c368953f9 Merge remote-tracking branch 'origin/master' 2021-02-16 09:13:49 -05:00
Anuken
9d5454e5ce Fixed #4694 2021-02-16 09:13:44 -05:00
TranquillyUnpleasant
631e4d9eef
Unit cap (#4689) 
* Add unit caps as a map setting.

* Use int and add maximum and minimum handling.

* Put a lower limit of 0 for unit cap
 2021-02-15 20:15:56 -05:00
Anuken
957583071d Splash damage tweaks 2021-02-15 18:42:24 -05:00
Anuken
c942331117 New splash damage algorithm 2021-02-15 18:00:47 -05:00
Anuken
4bbb4b9a19 Reorder NaN check 2021-02-15 11:00:49 -05:00
彭瑞暄
a2e5dae27f
Updated zh-TW translations of Logic Hints (#4666) 
* Logic Hint pt.1

Some Logic Hints and minor tweaks in previous translations

* Logic Hints pt.2

* Logic Hints pt. 3/3
 2021-02-15 10:46:19 -05:00
YellOw139
d5645b8a7b
[Bundle][RO] Update (#4631) 
* [Bundle][RO][124.1] Update

This PR was tested in-game and is ready to merge at any time.

Changelog:
- New strings/changes up to commit 64acd6c1e4
- Fixed ancient mod-related bundles not fitting the new install button
- Typo fixes & various other improvements

* Logic tooltips - initial English commit

* Block flags

* Romanian logic hints

* polishing

* Since when is this missing

* Polishing
 2021-02-15 10:43:34 -05:00
Antsiferov Andrew
561deacce4
[Bundle][RU] Logic Popups L10n (#4677) 
* Logic popups

* Block flag documentation

* Распознование -> Распознавание (@Prosta4okua)

* Сбрсывание -> Сбрасывание (@XEN0PHIL)

* нахдиться -> находиться (@XEN0PHIL)

* распознования -> распознавания (@XEN0PHIL)

* распознования -> распознавания (@XEN0PHIL)

* распозновать -> распознавать (@XEN0PHIL)

* распознования -> распознавания (@XEN0PHIL)

* Включен -> Включён (@XEN0PHIL)

* - -> - (@XEN0PHIL)

* lst.unitradar (@XEN0PHIL)

* единиц -> единицы (@XEN0PHIL)
 2021-02-15 10:42:01 -05:00
Joshua Fan
e528e35e06
Add sector icon picker back button (#4682) 2021-02-15 10:41:56 -05:00
Anuken
af39d6a6ee Fixed #4685 2021-02-15 10:37:24 -05:00
Patrick 'Quezler' Mounier
7a21c02476
Makes the top sprite visible on liquid turret icons (#4683) 
* Add top region to liquid turret icons

* Attempt to change outline icon generation

* Draw regions above the outlined icon over it

* Draw regions **above** the outlined icon over it

* Add clarrifying comment

* Implement backwards compatibility for mods

* an -> any
 2021-02-15 09:32:46 -05:00
Patrick 'Quezler' Mounier
557e5710cd
Fixes BuilderAI & RepairAI retreat nullpointers (#4681) 
* Update BuilderAI.java

* Update RepairAI.java
 2021-02-15 09:31:27 -05:00
Anuken
fa52255d04 Fixed #4680 2021-02-15 09:30:57 -05:00
Anuken
e16622afcc Automatic retreat AI for builders/repair units 2021-02-14 20:44:40 -05:00
Anuken
f2468f0b3d Cleanup of #4678 2021-02-14 19:14:02 -05:00
Anuken
30c9231df6 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-02-14 19:02:55 -05:00
Joshua Fan
7532aadaf8
Add enable building hint, combine building and respawn hints (#4678) 2021-02-14 19:02:28 -05:00
Anuken
3d226246b9 Labyrinth core fix 2021-02-14 09:15:12 -05:00
Anuken
07a27e913c Added UnitBuild transition class 2021-02-14 08:47:53 -05:00
Anuken
8b756d221b Un-broke scripts 2021-02-13 16:28:49 -05:00
Anuken
56e41309b1 Updated global script 2021-02-13 11:56:40 -05:00
Anuken
9050937900 Name cleanup 2021-02-12 19:40:29 -05:00
Anuken
2e6b90d4d5 Serializable -> JsonSerializable 2021-02-12 15:41:28 -05:00
Anuken
146b2589e2 Fixed rare network error 2021-02-12 14:54:10 -05:00
Anuken
abd07e1525 Fixed chat not working while paused 2021-02-12 12:55:31 -05:00
Anuken
541da5c0c9 Block flag documentation & cleanup 2021-02-12 09:09:10 -05:00
Anuken
21f642ad0c Merge remote-tracking branch 'origin/master' 2021-02-12 08:56:44 -05:00
Anuken
0d084d380d Fixed map resize not preserving links 2021-02-12 08:56:40 -05:00
Sharlotte
0fe158d080
[KO] i got typo! (#4662) 
* [KO] i got typo!

* typo
 2021-02-12 08:42:35 -05:00
Anuken
0cc64c6a8d Fixed #4658 2021-02-12 08:41:36 -05:00
Anuken
cd684996e1 Cleanup & Steam crash fix 2021-02-11 16:31:44 -05:00
Anuken
0350e6bbf4 Validate teams with power links 2021-02-11 12:03:11 -05:00
Anuken
4fe5972d89 Merge remote-tracking branch 'origin/master' 2021-02-11 10:12:17 -05:00
Anuken
27c8efc672 Better targeting range calculation 2021-02-11 10:12:07 -05:00
Catchears
aef0faf79c
update german translation to include logic hints (#4654) 
* update german bundle to "force projector heat issues"

ea2b57ec4b
ea2b57ec4b

* Gebäude -> Block to prevent confusion
 2021-02-11 10:01:03 -05:00
Sharlotte
ea7d1dd91e
[KO] UPDATED KO Translation (#4656) 
* translated all without logic hint

* typo typo typo typo everywhere typo oh hi typo

* Update logic hint

* typo

* translated changed android description

* android changelog
 2021-02-11 09:55:02 -05:00