Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,738 Commits 4 Branches 180 Tags
d4b6073c015ef29992d217d91f34cf00ccbde546
Commit Graph

626 Commits

Author SHA1 Message Date
Anuken
d4b6073c01 Name cleanup 2021-06-22 16:52:48 -04:00
Anuken
b87b79f4ba when git add . is too hard 2021-06-21 20:53:08 -04:00
Anuken
afec6181c4 More stone blocks 2021-06-21 20:52:49 -04:00
Anuken
4a88f64fa9 Asteroid ores (1) 2021-06-20 21:02:31 -04:00
Anuken
5d74795c02 Cleanup 2021-06-20 08:47:30 -04:00
Anuken
3c65a26d72 New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
Anuken
93651939f2 stop 2021-06-12 10:55:18 -04:00
Anuken
c4b1bf3e55 Asteroid progress 2021-06-11 19:59:18 -04:00
Anuken
9e8e0709b5 Merge 2021-06-10 18:51:49 -04:00
Anuken
8c32c00e2b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-06-09 17:10:49 -04:00
Anuken
b04c04f69f New metal floor / Selective floor attribute stats 2021-06-09 13:26:01 -04:00
Anuken
974ebe6937 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-06-05 11:57:14 -04:00
Anuken
677bad5c60 Fixed #5348 2021-06-04 08:30:16 -04:00
Anuken
fcf1bdd701 Shock mine team region 2021-06-03 21:49:58 -04:00
Anuken
9cd482d389 Minor bugfix 2021-06-03 16:01:51 -04:00
VozDuh
1cbd58820e Fix For Metal Environments (#5322) 2021-06-03 14:36:55 -04:00
Anuken
1c71ee2ed7 Moved bushes into correct directory 2021-06-02 11:24:15 -04:00
Anuken
e9129e6f43 Unspoiled 2021-06-02 11:15:30 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
ThePythonGuy
137792131e Fix Tetrative Reconstructor's sprite odd 1-pixel error (#5119) 
* Create e

* Delete e

* Add files via upload
 2021-04-17 12:53:57 -04:00
Patrick 'Quezler' Mounier
af20db4cf7 Colorize the inner corners of other conduit sprites (#4978) 2021-03-23 09:44:09 -04:00
Anuken
24195dac81 Added Voz-Duh's large launch pad sprite (#4861) 2021-03-05 14:27:15 -05:00
Anuken
b6c645b701 Better DefenderAI / Vela building / Anuken/Mindustry-Suggestions/issues/2074 2021-03-05 11:10:12 -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
1ef264d560 Added final campaign map (WIP, untested) 2020-11-18 18:58:54 -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
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