Commit Graph

393 Commits

Author SHA1 Message Date
Anuken
3f293190cf Merge branch 'master' of https://github.com/Anuken/Mindustry into messages
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites5.png
2019-09-21 18:59:49 -04:00
Anuken
dda1f18f67 Unit enemy spawnpoint camping 2019-09-20 23:09:11 -04:00
Anuken
209f0902c9 message blocks 2019-09-03 16:11:01 -04:00
Anuken
e314d199f0 By popular demand, re-added command center 2019-08-24 15:39:01 -04:00
Anuken
c4aa0b2863 New discord app ID / New testing sounds 2019-08-12 12:32:13 -04:00
Anuken
2341da995e Random in-game music, untested 2019-08-10 18:56:20 -04:00
Anuken
16f6b51857 Various tweaks, new music tracks 2019-08-09 23:23:45 -04:00
Anuken
8346d5fc13 Fixed connection not resetting on game load / Experimental click changes 2019-08-05 10:26:24 -04:00
Anuken
77d4b0972d Balancing 2019-08-02 12:39:21 -04:00
Anuken
8b3995686f Misc. in-game UI polish 2019-08-01 20:49:03 -04:00
Anuken
b1980a17ac Fixed editor not showing after second view 2019-08-01 11:26:28 -04:00
Anuken
69ee5257f2 Display current ammo type in turret info 2019-08-01 11:03:20 -04:00
Anuken
c4157d2ec8 New map / Better filters / Sand boulders 2019-07-26 18:59:33 -04:00
Anuken
c80be4940f Fixed unit tests / Fixed some major tile loading flaws 2019-07-23 23:29:48 -04:00
Anuken
3dfef06bba Bugfixes 2019-07-06 18:42:05 -04:00
Anuken
121e0a433b Final tweaks before merge 2019-07-06 10:12:22 -04:00
Anuken
0371126ccf Various menu fixes 2019-07-04 00:51:42 -04:00
Anuken
d43d4a1773 Cleanup, main menu progress 2019-07-03 23:36:51 -04:00
Anuken
0d39400f8b Fixed performance regression / Removed useless fallback sprites 2019-07-03 17:07:22 -04:00
Anuken
cb7b6eb3f8 More menu 2019-07-02 10:01:34 -04:00
Anuken
3021cc29da Fixed tops of some generator blocks 2019-06-30 11:25:39 -04:00
Anuken
ab716e96e2 Bugfixes 2019-06-24 16:54:50 -04:00
Anuken
b2a4cb42cf Sprite updates 2019-06-23 12:36:13 -04:00
Anuken
8c91aca838 New maps / New generation filter(s) and tweaks 2019-06-22 20:40:53 -04:00
Anuken
478d86677d Fixed boulder sprites 2019-06-20 00:16:22 -04:00
Anuken
185a7bb7d8 Bugfixes / Sprite update / Multiplayer in-game editor / Drone tweaks 2019-06-17 21:35:19 -04:00
Anuken
bc3405d11d Bugfixes 2019-06-17 15:45:10 -04:00
Anuken
4f40f3c4b2 More sprite updates 2019-06-17 10:08:24 -04:00
Anuken
910dab1896 More drone changes 2019-06-14 21:06:58 -04:00
Anuken
8ac497354a Miner drone / Editor bugfixes 2019-06-12 22:09:24 -04:00
Anuken
df78412896 Desktop/mobile descriptive tool modes 2019-06-11 23:31:57 -04:00
Anuken
af1746932f Fixed incorrect scaling 2019-06-11 08:47:16 -04:00
Anuken
ea0788f56c Better wave timer / Sprite tweaks / Core wave spawns 2019-06-09 21:09:29 -04:00
Anuken
4199702b9b Updated turret sprites 2019-06-09 14:46:48 -04:00
Anuken
444b5dbd97 Turret balance / Bugfixes 2019-06-09 12:04:45 -04:00
Anuken
aee800ab7a Changed turret outlines / Wall block tweaks 2019-06-06 21:18:54 -04:00
Anuken
895b46307a Sprite tweaks 2019-06-06 18:47:53 -04:00
Anuken
d300d45f22 Fixed unit factory sprites 2019-06-06 15:38:19 -04:00
Anuken
1897008c72 Pump sprites 2019-06-06 10:27:11 -04:00
Anuken
3942c6cd55 Even more sprites cleaned up 2019-06-06 00:28:09 -04:00
Anuken
f0f7b5aaf7 Updated sprites 2019-06-05 21:29:34 -04:00
Anuken
80bdaa1edc Cleanup 2019-06-04 23:30:07 -04:00
Anuken
39acb224d1 Merged replacement sprites. Scaling is now disabled by default. 2019-06-04 22:54:01 -04:00
Anuken
752267c521 Fixed many various map bugs 2019-05-26 16:46:44 -04:00
Anuken
3c643c917a Map bugfixes / Sprite tweak / Zone loadout moved to dialog 2019-04-29 23:58:16 -04:00
Anuken
4c17b56e28 Less messy respawning / Standard starter mech / Bugfixes 2019-04-28 10:34:53 -04:00
Anuken
5f89a1b9ca Sprite updates 2019-04-16 20:30:47 -04:00
Anuken
5b8084e1fa Solid bush block 2019-04-16 00:49:14 -04:00
Anuken
89b9501f35 Fixed tree color 2019-04-13 11:04:36 -04:00
Anuken
816ae84005 Overlay testing 2019-04-12 23:03:34 -04:00