Anuken
3ea3df5c73
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
...
Conflicts:
gradle.properties
2021-06-28 18:57:27 -04:00
Anuken
02e6257a66
Fixed #5462
2021-06-25 09:18:11 -04:00
Anuken
e3351e0c23
Typo fix
2021-06-23 11:59:02 -04:00
Anuken
1b3e99fbb0
Remove linear filtering on iOS
2021-06-23 11:57:51 -04:00
Anuken
c404e7e1c6
Fixed #5447
2021-06-22 16:54:32 -04:00
Anuken
d468a4f328
Removed unnecessary TODOs
2021-06-22 16:07:19 -04:00
Anuken
448d1e2c77
Cleanup
2021-06-20 09:50:25 -04:00
Anuken
afe963ca5d
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
...
Conflicts:
core/src/mindustry/editor/MapInfoDialog.java
core/src/mindustry/maps/filters/ClearFilter.java
core/src/mindustry/mod/ClassMap.java
gradle.properties
2021-06-17 10:44:51 -04:00
Anuken
865ee952c9
WIP polygonal core protection
2021-06-16 13:26:18 -04:00
Anuken
eed91eaaa0
# Conflicts:
...
# core/src/mindustry/mod/ClassMap.java
2021-06-15 19:29:12 -04:00
Anuken
2d9204d638
I guess everything is unsafe now
2021-06-13 19:27:28 -04:00
Anuken
db054add64
Merge
2021-06-12 17:22:46 -04:00
Anuken
d6016f1b04
Support for hidden weather
2021-06-12 16:59:18 -04:00
Anuken
ae52eaab19
Asteroid progress
2021-06-11 21:51:49 -04:00
Anuken
537c8f3cc5
Planet progress
2021-06-11 11:31:21 -04:00
Anuken
31ebb1d156
Planet progress
2021-06-10 20:46:10 -04:00
Anuken
f99b8e35bd
Testing single-sector planets
2021-06-10 19:55:06 -04:00
Anuken
9e8e0709b5
Merge
2021-06-10 18:51:49 -04:00
Anuken
dfd2b22917
Planet method renaming
2021-06-10 18:51:29 -04:00
Anuken
a180aae838
Blending cleanup / Misc bugfixes
2021-06-10 15:10:52 -04:00
Anuken
bcdbca7337
Fixed #5410
2021-06-10 09:32:01 -04:00
Anuken
b04c04f69f
New metal floor / Selective floor attribute stats
2021-06-09 13:26:01 -04:00
Anuken
8962992ef9
Fixed invalid healing effects
2021-06-08 09:14:54 -04:00
Anuken
0582cfac2b
Prefer Team#data() for team data
2021-06-07 15:04:45 -04:00
Anuken
f73c49b246
Moved effect calls back to correct class
2021-06-07 14:55:14 -04:00
Anuken
82742339a3
Implementation of #5280
2021-06-07 10:47:53 -04:00
Anuken
782c7a9ff3
Fixed #5379
2021-06-06 11:05:36 -04:00
Anuken
c318d4fa70
Cleanup
2021-06-06 09:55:33 -04:00
Anuken
151c4f13df
Fixed #5362
2021-06-05 08:57:25 -04:00
Anuken
89fdda0ef6
Various minor bugfixes
2021-06-04 10:57:15 -04:00
Anuken
527856e1b0
Mod dialog layout fixes
2021-06-04 09:48:31 -04:00
Anuken
1c4184db4b
Less respawn rubberbanding
2021-06-03 15:59:22 -04:00
Anuken
28b235ef07
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
Leonid Skorospelov
760962c2b4
Make CoreItemsDisplay not show up if nothing to show ( #5263 )
2021-05-17 14:10:05 -04:00
Arik
5fc4e1f5a5
Black Bar Fix ( #5079 )
2021-04-07 21:07:08 -04:00
Joshua Fan
7145ffaf28
Add block info keybind ( #4284 )
...
* Add block info keybind
* Change block info keybind to backtick
* Change block info keybind to F1
2021-03-21 14:08:53 -04:00
Anuken
7ffd46aee9
#4964
2021-03-19 14:36:25 -04:00
Anuken
9384d661c1
Removed unnecessary dispose()
2021-03-18 16:14:53 -04:00
Anuken
bd36ca821d
Improvements of status effects in database
2021-03-10 16:22:07 -05:00
Anuken
b1e8001ae8
Minor cleanup
2021-03-09 19:04:29 -05:00
Anuken
25c61590d1
Minor cleanup / Another slight vela buff
2021-03-08 17:12:53 -05:00
buthed010203
6151ebf716
Fix button background ( #4892 )
...
This button had a black background which stuck out from everything else on the page, this fixes that.
2021-03-07 16:35:04 -05:00
Patrick 'Quezler' Mounier
b75a8d5260
Fix typo to preserve sanity ( #4857 )
...
* compatable > compatible
* compatable > compatible
2021-03-05 11:27:51 -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
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
8f91576f85
Fixed script loading for Turkish locale
2021-03-01 11:58:53 -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
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
e2515fc4bf
Automatic conveyor/conduit bridging
2021-02-22 10:15:40 -05:00
