mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-05 23:20:27 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,179 Commits 4 Branches 160 Tags 2.3 GiB
acb4593390
Commit Graph

1186 Commits

Author SHA1 Message Date
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
38471d68d7 Fixed Salt Flats being deadlocked 2020-11-25 20:23:17 -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
f089f2c2ff Bugfixes 2020-11-10 18:13:49 -05:00
Anuken
2d7562255a More sector overview visual changes 2020-11-10 14:54:07 -05:00
Anuken
fe27ac6aec Testing mp3 sounds + hiding servers 2020-11-09 14:33:28 -05:00
Anuken
ad3ce9fb14 Icon cleanup 2020-11-05 22:05:32 -05:00
Anuken
a18ae3ccf9 Icon refactoring 2020-11-05 20:21:30 -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
summetdev
2918a0ea86 Newlines 2020-10-27 22:08:53 +03:00
summetdev
a3abadd8c2 Revert "Newlines" 
This reverts commit a78faa57
 2020-10-27 21:55:40 +03:00
summetdev
a78faa57f3 Newlines 2020-10-27 21:36:02 +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
Anuken
d4d3b71d7d Fixed #2735 2020-09-26 09:46:16 -04: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
a6c10a97f2 Fixed #2654 / Fixed #2651 / fine I'll add a base 2020-09-22 10:03:05 -04:00
Anuken
87032c82b1 T4/5 support mechs 2020-09-21 23:32:30 -04:00
Anuken
ff58ccf659 Sprite tweaks 2020-09-21 13:22:07 -04:00
Anuken
1aa8bb9dd2 T5 air support unit 2020-09-21 11:41:11 -04:00
Anuken
63e35bd462 T4 air carrier unit (*unfinished*) 2020-09-20 19:34:12 -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
8a99a89f57 how many times do I neet to press refresh before IntelliJ sees the files that were there all along 2020-09-18 21:19:26 -04:00
Anuken
8dd1c5f1f8 hhhhh 2020-09-18 18:56:01 -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
f242a2b2cd Fixed #2585 2020-09-17 22:25:56 -04:00
Anuken
ea224bd1f1 many things 2020-09-17 21:05:16 -04:00
Anuken
030542890e Bugfixes 2020-09-16 16:04:11 -04:00
Anuken
50816deb9e Smarter payload routers / 2x display / Campaign tweaks 2020-09-14 14:09:15 -04:00
Anuken
8901838c19 Fixed #2551 2020-09-14 09:41:54 -04:00
Anuken
7ce93c7f85 Prototype health/ammo indication 2020-09-13 21:08:24 -04:00
Anuken
27e9b5aeb9 Removed cliffs / Nerfed explosion bombing 2020-09-13 12:13:42 -04:00
Anuken
8234f31e83 Various tweaks 2020-09-12 21:41:43 -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
d9a067b4d2 Small sprite tweaks & bugfixes 2020-09-08 21:40:50 -04:00
Anuken
68f00a8983 Bugfixes 2020-09-04 22:36:38 -04:00
Anuken
d77830ebf0 Added boss mechs to reconstructors 2020-09-04 22:17:28 -04:00
Anuken
739c4f2de2 Final mech boss unit (unfinished) 2020-09-04 22:05:15 -04:00
Anuken
ee2b099799 Initial Vestige mech implementation 2020-09-04 14:27:55 -04:00
Anuken
439c9c5599 Bugfixes 2020-09-02 16:24:05 -04:00
Anuken
6f6e9f4cc2 Initial Toxopid implementation 2020-09-02 13:32:08 -04:00
Anuken
6de1920042 Fixed #2476 2020-09-02 09:35:03 -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
71b55317c1 Balance 2020-08-25 22:24:46 -04:00
Anuken
bce85ded79 Added arkyid boss 2020-08-25 22:01:46 -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
Anuken
ac46b77380 Logic progress 2020-08-08 14:14:33 -04:00
Anuken
8411cc16f1 Logic stuff 2020-08-07 23:01:40 -04:00
Anuken
5dc78a24e0 Logic progress 2020-08-06 12:31:04 -04:00
Anuken
54d37b63b3 Bugfixes 2020-08-05 09:47:11 -04:00
Anuken
75eed2926a Start of work on logic stuff 2020-08-04 23:37:12 -04:00
Anuken
0d4e75fc42 Re-added remote effect methods 2020-08-04 13:38:40 -04:00
Anuken
b1da2faa04 Flying boss tweaks 2020-08-03 10:51:10 -04:00
Anuken
3966ff6817 Boss weapon tweaks 2020-08-02 21:54:33 -04:00
Anuken
a7c0f9e73c Antumbra weapons 2020-08-01 21:52:12 -04:00
Anuken
658079fab6 Bugfixes 2020-07-31 09:51:03 -04:00
Anuken
20077738d2 Research fixes 2020-07-24 23:56:14 -04:00
Anuken
38e55ab541 Added most things to tech tree 2020-07-24 23:38:33 -04:00
Anuken
58c39e14d6 risse -> risso 2020-07-24 13:27:15 -04:00
Felix Corvus
916a00b6ff textures micro fixes and improvements 2020-07-22 03:40:58 +03:00
Felix Corvus
2ef0e33227 spore-press frames sprites 6.0-ed 2020-07-22 02:18:55 +03:00
Anuken
60ce8ca935 Naval unit sprites complete 2020-07-17 16:41:46 -04:00
Anuken
1bb621bbd5 Naval unit tweaks 2020-07-17 11:15:07 -04:00
Anuken
660abe188b Fixed #2237 2020-07-17 08:46:11 -04:00
Anuken
208105f21d Prototype T1 naval unit 2020-07-16 21:09:42 -04:00
Anuken
3eca6b770e <added missing sprites IntelliJ missed> 2020-07-14 14:39:11 -04:00
Anuken
a1a72ee713 <added missing sprites IntelliJ missed> 2020-07-14 13:21:12 -04:00
Anuken
9dc49743e8 Implemented #1335 2020-07-14 13:20:50 -04:00
Anuken
dad5b186db Bugfixes / Negative knockback / Unit progress 2020-07-11 23:35:58 -04:00
Anuken
430eef02e2 Multi-legged unit implementations 2020-07-11 22:41:26 -04:00
Anuken
0555e4dfa7 Various palette changes 2020-07-11 14:44:50 -04:00
Anuken
0752076bf2 Bullet cleanup 2020-07-11 09:08:17 -04:00
Anuken
a8d5198ca6 IntelliJ still refusing to add new files 2020-07-10 20:05:10 -04:00
Anuken
9cb4645b11 More unit progress 2020-07-10 20:04:45 -04:00
Anuken
d1485e3e65 IntelliJ has failed to commit this file 3 times 
It's been checked in my version control UI for my last 3 commits, and was invisible in my first commit despite me refreshing the list
 2020-07-10 13:26:05 -04:00
Anuken
baa9f22a0b Ground support unit implementations 2020-07-10 12:14:24 -04:00
Anuken
f39702e1cc Core unit balance 2020-07-10 09:43:59 -04:00
Anuken
56ffe5aea8 Campaign mechanics 2020-07-06 21:53:34 -04:00
Anuken
a6523630bf Unit sprite cleanup 2020-07-06 11:05:37 -04:00
Anuken
403597f860 Unit cleanup 2020-07-05 10:39:54 -04:00
Anuken
add0d0cd86 Unit naming / Fixed #2209 2020-07-04 23:53:22 -04:00
Anuken
fb7633cb07 Cyclone hits ground targets again 2020-07-02 23:35:36 -04:00
Anuken
f4a7108382 Weapon system refactoring 2020-07-02 22:48:37 -04:00
Anuken
cecb5cf4b4 Added tractor beam turret 2020-07-02 14:02:33 -04:00
Anuken
fd2deb0a82 Moved pref saving to specific locations 2020-07-02 10:20:16 -04:00
Anuken
e907c2045c Cleanup 2020-06-30 19:14:32 -04:00
Anuken
810a59f146 Mass driver resprite 2020-06-29 16:23:25 -04:00
Anuken
d90807b29c Bugfixes 2020-06-25 12:51:30 -04:00
Anuken
7dfd20d020 Core launch cost 2020-06-22 21:02:53 -04:00
Anuken
93ae73abb6 Sprite cleanup 2020-06-21 10:38:13 -04:00
Anuken
71ea9b3bd9 (IntelliJ refuses to add new files after refresh) 2020-06-21 10:34:00 -04:00
Anuken
6517eaf62f Implemented #2177 2020-06-21 10:33:08 -04:00
Anuken
6bcc103cf7 Research system progress 2020-06-19 19:31:14 -04:00
Anuken
08ac91359b Sprite cleanup 2020-06-19 12:26:58 -04:00
Anuken
2bfe0c30ec Cleanup 2020-06-17 12:17:29 -04:00
Anuken
1823bc8f15 Support for compiling on Java 14 2020-06-14 11:10:54 -04:00
Anuken
b48736e771 Reconstructor sprites / Bugfixes 2020-06-13 16:27:15 -04:00
Anuken
f55fb48ea7 Slightly higher contrast black palette 2020-06-13 12:24:50 -04:00
Anuken
186ae4e2a2 why 2020-06-13 12:13:57 -04:00
Anuken
fef4882c15 Turbine generator tweaks 2020-06-13 12:08:03 -04:00
Anuken
3b3a1dd496 Editor map fix / Crafter renderer system 2020-06-13 10:33:19 -04:00
Anuken
a47e300297 Cleanup 2020-06-12 14:57:57 -04:00
Anuken
a76cb3cb1a Scrapped reaper segments 2020-06-12 13:32:00 -04:00
Anuken
ce9f515543 Fallback atlas / Bugfixes / Cleanup 2020-06-11 15:25:46 -04:00
Anuken
2b1bd90dfa Out of atlas space / GL30 progress 2020-06-10 12:55:01 -04:00
Anuken
a51a8d7473 Added cool new reconstructors™️ 2020-06-09 23:11:02 -04:00
Anuken
9fbe421905 Sprites 2020-06-09 17:04:38 -04:00
Anuken
d0565420ef Sprites 2020-06-09 11:08:22 -04:00
Anuken
b346b9114a Updated Gradle 2020-06-09 08:46:28 -04:00
Anuken
6501071510 Cleanup, renaming 2020-06-08 21:03:29 -04:00
Anuken
8ea28e1ced Seq. 2020-06-08 17:19:47 -04:00
Anuken
87ab895253 Sprites moved 2020-06-08 17:10:55 -04:00
Anuken
43762e82a8 Unit tweaks 2020-06-08 16:33:21 -04:00
Anuken
bb9855e830 Merge remote-tracking branch 'origin/master' 2020-06-08 11:52:27 -04:00
Anuken
1f905790e7 kinematic lerp 2020-06-08 11:45:48 -04:00
EyeOfDarkness
b9ccc528e9
Updated Chaos Array and Eradicator sprites (#2155) 
* updated sprite

* lich

* Add files via upload

* Add files via upload

* ground

* Add files via upload
 2020-06-08 10:57:02 -04:00
Anuken
5869b7d27e leg 1 2020-06-08 10:03:46 -04:00
Anuken
210971fedb Bugfixes 2020-06-07 17:22:17 -04:00
Anuken
42a6b0e369 Unit cleanup 2020-06-07 14:17:42 -04:00
Anuken
8993c1db04 Fixed editor crash 2020-06-07 13:28:22 -04:00
Anuken
93fe794f63 Sprite tweaks 2020-06-05 22:38:41 -04:00
Anuken
65e94850ca Sprite tweaks 2020-06-05 20:59:30 -04:00
EyeOfDarkness
305c19496e
Updated Segment and Lich sprite (#2143) 
* updated sprite

* lich
 2020-06-05 20:39:58 -04:00
Anuken
803f9e8eb6 Made save format support removed blocks 2020-06-04 14:50:08 -04:00
Anuken
5bcaed54c6 3x3 separator 2020-06-03 19:42:42 -04:00
Anuken
6fff4ad8a1 Point defense blocks 2020-06-03 16:22:07 -04:00
Anuken
3d98de34eb Thermal -> AttributeSmelter 2020-06-03 12:19:27 -04:00
Anuken
3c89ccf7c3 Added silicon crucible 2020-06-03 12:11:40 -04:00
Anuken
7f6dcbd75a Cleanup 2020-06-03 01:27:40 -04:00
Anuken
0382d40dcc Payload router 2020-06-03 01:13:44 -04:00
Anuken
5b4a22e219 Implemented #1329 2020-05-31 20:16:32 -04:00
Anuken
8598b0a23a Fixed bizzare planet render bugs 2020-05-31 16:45:03 -04:00
Anuken
bd349803d3 Moved some blocks around 2020-05-31 14:39:10 -04:00
Anuken
0842c3f0a0 Progress on sector state 2020-05-30 21:04:41 -04:00
Anuken
b08eafc78e Revenant 2020-05-29 20:08:23 -04:00
Anuken
92d265402b Payload support 2020-05-27 18:11:42 -04:00
Anuken
a375dd3fc2 Cleanup 2020-05-26 19:39:50 -04:00
Anuken
5c4ce00dec Sprites 2020-05-26 13:00:20 -04:00
Anuken
a7c7295893 Various tweaks 2020-05-26 12:59:05 -04:00
Anuken
90f38fd135 Cleanup 2020-05-25 23:56:03 -04:00
Anuken
39e3ae931c more legs 2020-05-25 22:19:31 -04:00
Anuken
732d90635f Removed pad sprites 2020-05-25 14:36:52 -04:00
Anuken
1ae9d04f47 Experimental: block loader/unloaders 2020-05-25 14:36:40 -04:00
Anuken
0e59a22cbe Respawn key 2020-05-24 22:27:14 -04:00
Anuken
65f63fd4d2 Re-added Tau 2020-05-23 21:53:11 -04:00
Anuken
46bc2207ff Initial reconstructor impl 2020-05-23 18:49:28 -04:00
Anuken
d8ee862125 Functional payload factories 2020-05-23 11:53:49 -04:00
Anuken
39b0051b73 Directional unit factories (unfinished) 2020-05-23 10:39:44 -04:00
Anuken
f250008db3 Cleanup 2020-05-22 20:00:02 -04:00
Anuken
76aa201a99 Name changes / Bugfixes 2020-05-22 17:37:38 -04:00
Anuken
12d9479184 Added dart as default starter 2020-05-22 14:35:25 -04:00
Anuken
61d9fd3d72 Cleanup / Armor support 2020-05-21 14:57:15 -04:00
Anuken
5b445c59c1 Implemented ground mech boosting 2020-05-20 18:48:04 -04:00
Anuken
dc58626602 Removed zone files 2020-05-20 14:11:40 -04:00
Anuken
aa19c80567 Targeting bugfixes 2020-05-20 13:56:17 -04:00
Anuken
371debceb7 Unit tweaks 2020-05-19 21:06:07 -04:00
Anuken
1bc7454146 Unit tweaks 2020-05-19 21:05:34 -04:00
Anuken
945be0c524 Various tweaks 2020-05-19 17:49:25 -04:00
Anuken
77c0163a79 Re-implemented some units / Bugfixes 2020-05-19 14:58:04 -04:00
Anuken
434a754c9a Better pad animations / Balancing 2020-05-14 23:16:26 -04:00
Anuken
a4987f864f Refactoring / Launch pad tweaks 2020-05-14 22:00:04 -04:00
Anuken
27ffefa0cd Added sprites 2020-05-12 09:41:07 -04:00
Patrick 'Quezler' Mounier
8280d11054
Move pump fluid sprite from production to liquid (#1980) 2020-05-04 10:04:00 -04:00
MEEP of Faith
9def4eaba4
Unjank Plated Conduit Background Transparency (#1961) 
The background transparent part was for some reason 3-6 different colors. Invisible, but still there.
 2020-05-01 18:09:39 -04:00
Anuken
626a06ca00 Bugfixes / Better titan sprite 2020-04-30 18:21:50 -04:00
Anuken
3397557737 Sprites 2020-04-30 16:04:43 -04:00
Patrick 'Quezler' Mounier
a226cd390c
Cleanup stack conveyor code (#1946) 
- removes now obsolete adhoc boosteffect listing
- clarrify comments a bit more
- monospace align some code
- retexture to avoid shadow conflict
 2020-04-30 15:16:19 -04:00
Anuken
2dbb099d79 AI tweaks / Control tweaks / Plastanium conveyor tweaks / Unit factories 2020-04-30 14:46:22 -04:00
Anuken
dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
Anuken
fa62336096 Cleanup 2020-04-25 23:14:12 -04:00
Anuken
08f8323465 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets-raw/sprites/units/phantom-cell.png
 2020-04-25 22:49:38 -04:00
Anuken
9b74b69950 Unit tweaks 2020-04-25 22:49:30 -04:00
MEEP of Faith
46762ab0e1
New power cells for everything (#1915) 
* Ground Unit Power Cells

* Flying Unit Cells

* Player/Mech Cells
 2020-04-25 22:48:58 -04:00
Anuken
8b7d75c5ba Unit tweaks 2020-04-25 22:48:25 -04:00
Anuken
ceee1d36e6 Bugfixes 2020-04-25 17:34:35 -04:00
Anuken
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Patrick 'Quezler' Mounier
39266d23c8
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
 2020-04-23 21:10:48 +02:00
Anuken
cec5c24d69 progress 2020-04-23 13:58:06 -04:00
Anuken
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
Patrick 'Quezler' Mounier
1acc6461e6
Grow the circle slightly inward 2020-04-16 22:05:55 +02:00
Patrick 'Quezler' Mounier
9864383300
Revert 〃 2020-04-16 21:15:49 +02:00
Patrick 'Quezler' Mounier
41eb51a340
Experiment with visible ports 2020-04-16 21:11:59 +02:00
Patrick 'Quezler' Mounier
a05f4338c5
Waspify the crater 🐝 2020-04-16 20:24:07 +02:00
Patrick 'Quezler' Mounier
589d4c92d1
Scale crater from 16x16 to 20x20 2020-04-16 18:39:24 +02:00
Patrick 'Quezler' Mounier
83511368f6
Stash shadow draft 2020-04-16 17:44:43 +02:00
Patrick 'Quezler' Mounier
a1d4804fae
Merge branch '6.0' into crater 
# 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/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 17:13:18 +02:00
Anuken
256f805754 Payload fixes 2020-04-16 09:55:57 -04:00
Patrick 'Quezler' Mounier
5c28985ee6
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java
 2020-04-16 12:39:52 +02:00
Anuken
a234949b8c Visual tweaks 2020-04-15 13:03:37 -04:00
Anuken
c717084cb9 Cleanup 2020-04-13 18:07:00 -04:00
Anuken
2af12a632a Added basic multi-unit factories 2020-04-13 16:56:33 -04:00
Anuken
603d8b16d0 Various tweaks 2020-04-12 10:26:18 -04:00
Anuken
2395bc9308 Bugfixes / Testing reaper sprite 2020-04-10 12:55:58 -04:00
Anuken
85e4270536 New water textures 2020-04-04 00:31:29 -04:00
Anuken
0573160b2f Added sorter cross (#1566) 2020-03-26 17:39:23 -04:00
Anuken
06e94b1800 Cleaned up weather class 2020-03-11 10:08:27 -04:00