Commit Graph

1473 Commits

Author SHA1 Message Date
Anuken
ae15d838f0 Drill visual fix 2021-07-15 09:13:51 -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
dd5389c738 New sound for rock/plant breaking 2021-07-14 17:22:21 -04:00
Anuken
ac25e17286 Unused property cleanup 2021-07-14 16:06:03 -04:00
Anuken
2f6846d8c3 Conveyor tweaks 2021-07-14 15:12:00 -04:00
Anuken
44aff82a6c "Fixed" #5580 2021-07-14 09:27:59 -04:00
Anuken
8644844b7d beam drill visual improvements 2021-07-13 21:41:53 -04:00
Anuken
e5412aeb1b Inventory constant cleanup 2021-07-13 17:38:42 -04:00
Anuken
c43fd88f55 lasers. 2021-07-13 17:34:57 -04:00
Anuken
0eec955a3d #5563 2021-07-13 10:42:00 -04:00
Anuken
8041c305ad Misc bugfixes 2021-07-13 10:28:35 -04:00
Arik
ec3dc867c1 Always increment launchpad counter (#5569) 2021-07-12 12:33:17 -04:00
buthed010203
e5e2d0ab03 Fix payload driver crash (#5565)
Similar to the mass driver one, https://i-dont.go-outsi.de/53ZwBY_YS.png
2021-07-11 14:39:33 -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
baabf49fba Linear warmup for certain blocks 2021-07-08 19:33:15 -04:00
Anuken
1baa82a7c6 Mostly-complete cliff crusher implementation 2021-07-08 16:16:44 -04:00
Anuken
1c389dc7f8 Fixed #5553 2021-07-08 13:42:30 -04:00
Anuken
fb35adb494 Added AttributeCrafter env calculation 2021-07-08 11:06:46 -04:00
Patrick 'Quezler' Mounier
2167a3d7fe Remove double space (#5551) 2021-07-08 09:32:53 -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
64ab8328b8 WallCrafter progress 2021-07-07 16:28:33 -04:00
Anuken
02b42c51da Fixed #5549 2021-07-07 13:38:39 -04:00
Anuken
0543616f15 WIP "wall crafter" 2021-07-07 10:31:18 -04:00
Anuken
0ba26b22c0 Fixed #5548 2021-07-06 16:32:42 -04:00
Anuken
01a3c772e7 Sync unit velocity / Sync separator seed / 127.x Compat break 2021-07-06 11:41:05 -04:00
Anuken
481881aa8b Prop cleanup / Optimization of large skybox PNG 2021-07-05 21:18:40 -04:00
Anuken
1462443f7c Unit drowning outline color fix 2021-07-05 10:55:36 -04:00
Anuken
a7d465439b Decorations no longer depend on color 2021-07-05 09:47:19 -04:00
Anuken
04b711946e Payload deconstructor rotation bugfix 2021-07-05 09:15:54 -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
0d280ea77f Improved payload deconstructor visuals 2021-07-03 16:08:37 -04:00
Anuken
c8ec575a9d Fixed payload deconstructor not working 2021-07-01 20:11:09 -04:00
Anuken
6afb976a44 Payload deconstructor sprite 2021-07-01 17:53:26 -04:00
Anuken
0b3dddcc9e Minor reformatting 2021-07-01 17:06:35 -04:00
Anuken
0de5009a66 aaa 2021-07-01 11:42:20 -04:00
Anuken
f78ee66049 Deployment script fixes 2021-07-01 11:36:51 -04:00
Anuken
fecaf768ab Allow 3x3 blocks on payload conveyors 2021-07-01 11:24:23 -04:00
Anuken
ec59cb602c Crash fix / tilesSecond speed unit 2021-07-01 11:17:42 -04:00
Anuken
5e2ad38e88 PayloadDeconstructor progress 2021-06-30 22:16:46 -04:00
Anuken
f9dfd5b0b5 Commented out separator revision until 128 release 2021-06-30 13:08:19 -04:00
Patrick 'Quezler' Mounier
10dcd9cb2d outlaw separator desycning (#5516)
* Seed separators

* Sync separators

* Seed from tile position
2021-06-30 12:59:09 -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
f6f1ddb826 Fixed non-existent fire being targeted 2021-06-28 13:30:54 -04:00
Anuken
fcdbd4b117 Fixed liquid turrets not targeting closest fire 2021-06-28 11:35:46 -04:00
Anuken
8afea88023 Fixed #5500 2021-06-28 10:15:54 -04:00
Anuken
0bd1b4eedc Skip loading team regions for teams without palettes 2021-06-27 12:28:40 -04:00
Anuken
36b49b6d8b Fixed #5488 / Fixed #5489 2021-06-27 09:12:35 -04:00
Anuken
0ffe2ed51a Skip launch pad destination text for clients 2021-06-25 10:27:10 -04:00
Anuken
bdeba22561 Switched to v7 server list 2021-06-24 17:58:26 -04:00
Anuken
5af6e8c5de Preparations for 127 pre-alpha release 2021-06-24 17:25:08 -04:00