mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity
11,025 Commits 4 Branches 160 Tags 2.3 GiB
0d0aef3dea
Commit Graph

936 Commits

Author SHA1 Message Date
Anuken
0d0aef3dea Logic layout bugfixes 2021-02-09 12:10:15 -05:00
Anuken
fa8d43bbc9 Misc cleanup 2021-01-19 19:55:21 -05:00
Anuken
f812460164 New unit select fixes 2021-01-19 15:49:30 -05:00
VozDuh
da8ea84397
New Unit Select (#3672) 
* New Unit Select

* Fix

* Facepalm

* Code Fix

* Texture Fix
 2021-01-19 15:42:33 -05:00
Joshua Fan
26ad53ec50
Tweak highlight on plastanium sprite (#4373) 2021-01-18 19:42:47 -05:00
Anuken
81ce3a28a1 More distinct plastanium sprite 2021-01-14 13:46:27 -05:00
Patrick 'Quezler' Mounier
e714d44a0e
Return large launchpad item costs (#4134) 
* Return large launchpad item costs

hidden -> debugonly

* Remove the 4 orange squares from the large launch pad

Leaving the lights and launchpod alignments alone since that is campaign only.
 2020-12-28 09:38:58 -05:00
Patrick 'Quezler' Mounier
2239ca6372
Remove 4 square blocks from the accelerator (#4139) 
* Normalize rule comment line endings

Just so i can get a new patch-## branch where i can drag my accelerator sprite on since github isn't smart enough yet to see that as a possible pull request by itself.

* Add files via upload

* Add files via upload
 2020-12-27 13:32:04 -05:00
VozDuh
0aaa77a5ea
Scrap Walls Textures Cleanup (#4074) 2020-12-22 11:31:24 -05:00
Anuken
852013cd63 #4068 2020-12-21 20:48:00 -05:00
Patrick 'Quezler' Mounier
118ae8e87d
#3889 2: electric boogaloo (#4056) 2020-12-20 14:22:01 -05:00
Patrick 'Quezler' Mounier
22221a0f28
Add in region to payload block icons (#4052) 2020-12-20 09:58:18 -05:00
Anuken
0d81681af5 Merge remote-tracking branch 'origin/master' 2020-12-17 10:46:53 -05:00
Anuken
4b1554db54 arc 2020-12-17 10:46:49 -05:00
Charlotte Vixen
c58289dd47
added conduit color indications (#4015) 2020-12-17 10:20:29 -05:00
Anuken
ecea8eab01 Various tweaks and bugfixes 2020-11-22 21:20:33 -05:00
Anuken
72d5a8a768 Added "Launching From" info 2020-11-18 20:05:45 -05:00
Anuken
1ef264d560 Added final campaign map (WIP, untested) 2020-11-18 18:58:54 -05:00
MEEP of Faith
659be11b7d
Remove extra omura cannon image. 
It has the `-heat` prefix, so the game is using this instead of its actual heat sprite to draw heat.
 2020-11-13 19:00:21 -08:00
Anuken
a9756aefad Cleanup of weapon stats 2020-11-13 14:42:46 -05:00
Anuken
e853ed6419 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/mindustry/logic/LCanvas.java
 2020-11-02 16:47:33 -05:00
Anuken
8f53d44278 Various fixes 2020-11-02 16:46:11 -05:00
Voz-Duh
cda8a9b3e9 Texture Fix 2020-11-02 23:02:56 +03:00
Voz-Duh
6e2f097803 Texture Fix 2020-11-02 22:16:46 +03:00
Voz-Duh
e8cfd63bc4 Texture Fix 2020-11-01 14:12:52 +03:00
Voz-Duh
3e03c3e49b New Texture For Blast Mixer 2020-11-01 13:27:09 +03:00
Anuken
41d388aa7f Item sprite cleanup 2020-10-24 19:06:05 -04:00
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
Anuken
f4b6600a6d
Merge pull request #2738 from Voz-Duh/top-for-liquid-turrets 
Top For Liquid Turrets
 2020-09-26 20:16:38 -04:00
Voz-Duh
18604a397d Top For Liquid Turrets 2020-09-26 19:11:55 +03:00