Commit Graph

588 Commits

Author SHA1 Message Date
Anuken
c99873c823 Added bool to enable editor cliff button 2020-10-17 11:02:48 -04:00
Anuken
837a8cecb3 Wave balancing & other tweaks 2020-10-10 12:26:57 -04:00
Anuken
fb831e8fef Better cliff sprites 2020-10-10 11:37:58 -04:00
Anuken
d06449f311 space 2020-10-08 14:06:07 -04:00
Anuken
68c41774e4 More contrast for specific colors 2020-10-01 14:22:48 -04:00
Leonwang4234
9601c81045 change sprite name 2020-09-30 18:05:43 -07:00
slava0135
07cdbfa423 New turret sprite by EyeOfDarkness 2020-09-30 18:47:56 +03:00
slava0135
d4402ee3bb Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
	core/src/mindustry/content/Blocks.java
2020-09-30 09:48:18 +03:00
Anuken
2b2a12267a Long-range 4x4 turret (wip) / Java 14 language upgrade 2020-09-29 23:55:55 -04:00
slava0135
fb53abe593 Final? design 2020-09-29 21:27:41 +03:00
slava0135
83a20810f7 recolor 2020-09-29 21:02:29 +03:00
slava0135
e5dc481d00 new texture 2020-09-29 20:40:09 +03:00
slava0135
cbc2205347 Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami
 Conflicts:
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites.png
	core/assets/sprites/fallback/sprites2.png
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
2020-09-29 18:31:42 +03:00
Voz-Duh
45e1700237 Fix 2020-09-28 21:58:37 +03:00
Voz-Duh
81ceec8d03 Fix 2020-09-28 21:47:42 +03:00
Voz-Duh
aef09a18b7 Fix 2020-09-28 17:38:11 +03:00
Voz-Duh
332365adc6 Fix 2020-09-28 17:36:35 +03:00
Voz-Duh
2c3813c94b Cleaner Sprites 2020-09-28 17:34:05 +03:00
Anuken
ff84d72e20 Cleaner wall sprites 2020-09-27 00:43:00 -04:00
Anuken
ae46535365 Sprite cleanup 2020-09-26 22:31:49 -04:00
Anuken
0c7ce94b13 Sprite cleanup 2020-09-26 22:29:15 -04:00
Voz-Duh
18604a397d Top For Liquid Turrets 2020-09-26 19:11:55 +03:00
slava0135
3e81d194cb New liquid turret - Tsunami 2020-09-25 11:49:04 +03:00
Voz-Duh
11eb5f464f Team Indicator For Command Center 2020-09-24 17:47:50 +03:00
Anuken
ada664a2ca Fixed #2690 2020-09-23 21:46:40 -04:00
Anuken
764b93154e Turret sprite tweaks 2020-09-23 19:16:33 -04:00
Anuken
1cc8d7e3f4 Balance 2020-09-23 15:21:06 -04:00
Anuken
dcbfc2b7aa Storage team colors 2020-09-19 12:38:24 -04:00
Anuken
e19e74cdc5 Bugfixes 2020-09-19 11:40:11 -04:00
Anuken
f53af781ba T4/5 naval / Controversial weapon outlines 2020-09-18 18:54:09 -04:00
Anuken
c71be9ae32 Mud 2020-09-18 00:13:08 -04:00
Anuken
50816deb9e Smarter payload routers / 2x display / Campaign tweaks 2020-09-14 14:09:15 -04:00
Anuken
27e9b5aeb9 Removed cliffs / Nerfed explosion bombing 2020-09-13 12:13:42 -04:00
Anuken
74cefb3ec9 Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
Anuken
88e3022db0 files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
Anuken
0e61d61dd2 Saner naming scheme of wall blocks 2020-09-10 12:09:25 -04:00
Anuken
3b5d6860d6 Bugfixes 2020-09-09 23:39:00 -04:00
Anuken
c1cc11c7cb Initial toxopid sprites, WIP 2020-09-02 00:13:25 -04:00
Anuken
a575ad2d99 Cleanup 2020-08-27 20:09:40 -04:00
Anuken
b128155615 Added T3 logic processor 2020-08-22 11:16:15 -04:00
Anuken
b9ff4ba9c5 Bugfixes 2020-08-20 16:21:40 -04:00
Anuken
0cc5945331 Better mod dialog layout / Less obnoxious button sound 2020-08-15 10:12:34 -04:00
Anuken
98844d752c Better spore trees 2020-08-14 22:21:47 -04:00
Anuken
bb3c80c055 Dedicated memory cells 2020-08-11 10:50:12 -04:00
Anuken
75ada3cca1 Turret-based radar 2020-08-10 23:04:52 -04:00
Anuken
4f7d6fc018 Bugfixes / Logic category (no icon) / Switch block 2020-08-10 17:09:54 -04:00
Anuken
c560de9c53 purple 2020-08-10 16:10:18 -04:00
Anuken
f00510a508 Bugfixes / Power capacity sensor 2020-08-09 20:18:47 -04:00
Anuken
73d9348c83 Clipboard export / Conditional jumps / Saving of state 2020-08-09 18:26:54 -04:00
Anuken
1d5a25ce75 Graphics 2020-08-09 12:46:44 -04:00