Commit Graph

833 Commits

Author SHA1 Message Date
Anuken
6973ed7d55 PvP defeated team cleanup 2021-07-17 08:52:24 -04:00
Anuken
1c2b1fb757 System property cleanup 2021-07-15 11:27:21 -04:00
Anuken
caf9ea38df aaa 2021-07-15 11:25:35 -04:00
Anuken
103f24d41d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/world/blocks/environment/Floor.java
	core/src/mindustry/world/blocks/payloads/Payload.java
	gradle.properties
2021-07-15 09:13:35 -04:00
Anuken
0c3d7e09e0 Don't crash when font glyphs are missing 2021-07-14 21:40:47 -04:00
Anuken
e5412aeb1b Inventory constant cleanup 2021-07-13 17:38:42 -04:00
Anuken
e0d249898e Fixed mod dialog width... again. 2021-07-12 16:18:29 -04:00
Anuken
a1f5982a85 Fixed loading bar stroke not scaling correctly 2021-07-12 15:36:43 -04:00
Anuken
ce6c39b7aa Reorganized settings 2021-07-12 15:06:41 -04:00
Anuken
f36d47c13f Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-07-12 12:36:48 -04:00
Anuken
4f98bc95a2 Better sliders 2021-07-12 12:36:45 -04:00
Antsiferov Andrew
7fea7e91aa Correct comment (#5568)
This is `UI.packer`, not `Fonts.packer`.
2021-07-12 09:23:36 -04:00
TranquillyUnpleasant
1ea545ccb2 fix (#5567) 2021-07-12 09:23:20 -04:00
Anuken
5ceb8e2b48 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	gradle.properties
2021-07-09 19:48:35 -04:00
Anuken
390ceb8887 FileChooser cleanup 2021-07-08 09:33:44 -04:00
Anuken
a0c5ed3761 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	gradle.properties
2021-07-08 09:29:36 -04:00
Anuken
2ae7863cae arc.util.Http migration 2021-07-07 19:00:32 -04:00
Anuken
017552f573 Fixed crash caused by invalid NinePatch sprites 2021-07-06 15:23:37 -04:00
Anuken
ebf0c71db6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/mod/ClassMap.java
2021-07-04 09:52:57 -04:00
Anuken
ed4156850b Cached ping executor 2021-07-03 23:21:29 -04:00
Anuken
0b3dddcc9e Minor reformatting 2021-07-01 17:06:35 -04:00
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