mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-24 09:56:32 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,527 Commits 4 Branches 160 Tags 2.3 GiB
200aa3e32b
Commit Graph

983 Commits

Author SHA1 Message Date
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
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
Patrick 'Quezler' Mounier
14a97976cc
Realign pixels 
Bothered me for ages.
 2020-03-05 19:48:36 +01:00
Patrick 'Quezler' Mounier
e5e4884448
Merge branch 'master' into crater 
# Conflicts:
#	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/world/modules/ItemModule.java
 2020-03-05 10:00:02 +01:00
Anuken
2afb175560 Generation tweaks 2020-02-22 12:05:31 -05:00
Anuken
4a40172782 Cleaned up bullet sprites 2020-02-22 00:28:03 -05:00
Anuken
baa0eb1149 Added cliffs as separate block 2020-02-21 23:45:25 -05:00
Anuken
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
Anuken
fb302d49c7 Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
Anuken
d45d7f21b6 Procedural scorch marks / Bugfixes 2020-02-09 12:07:36 -05:00
Anuken
8814dbe29a Sprite cleanup / Bullets 2020-02-08 14:48:04 -05:00
Patrick 'Quezler' Mounier
8c7b688f78
Add layered blendbitz 2020-02-06 20:19:00 +01:00
Patrick 'Quezler' Mounier
c0d250560a
🐍 is kil 2020-02-06 19:33:42 +01:00
Anuken
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
Arkanic
ce7eccf524 i forgot -base 2020-02-05 18:10:57 +00:00
Patrick 'Quezler' Mounier
05ccdfd51b
Merge branch 'master' into crater 
# Conflicts:
#	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/world/modules/ItemModule.java
 2020-02-05 10:26:34 +01:00
Arkanic
ff06a005a0 become exist 2020-02-05 00:53:15 +00:00
Anuken
be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl 
# Conflicts:
#	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/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
 2020-02-04 12:25:18 -05:00
Patrick 'Quezler' Mounier
9bc24ae47a
Darken yellow square on nucleus core (#1497) 
#1496
 2020-02-03 08:51:19 -05:00
Patrick 'Quezler' Mounier
0f92f77b55
Draw crater unto plastanium conveyor icon 
And remove whitespaces from the emoji one.
 2020-01-28 10:57:51 +01:00
Anuken
ad6e0bcd0f Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# Conflicts:
#	android/src/mindustry/android/AndroidLauncher.java
#	annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
#	annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java
#	build.gradle
#	core/assets-raw/fontgen/config.json
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/fonts/font.ttf
#	core/assets/fonts/icon.ttf
#	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/UnitTypes.java
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/core/NetServer.java
#	core/src/mindustry/entities/bullet/BulletType.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/maps/filters/FilterOption.java
#	core/src/mindustry/mod/Scripts.java
#	core/src/mindustry/ui/Fonts.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/ui/fragments/HudFragment.java
#	core/src/mindustry/ui/fragments/MenuFragment.java
#	core/src/mindustry/world/blocks/production/Cultivator.java
#	core/src/mindustry/world/blocks/units/CommandCenter.java
#	gradle.properties
#	tools/src/mindustry/tools/FontGenerator.java
 2020-01-27 15:51:02 -05:00
Patrick 'Quezler' Mounier
6eb6870bb6
Register crater emoji via ui folder 
#1458
 2020-01-27 19:33:36 +01:00
Patrick 'Quezler' Mounier
883a2a9b59
Bruteforce crater emoji 2020-01-27 18:40:40 +01:00
Patrick 'Quezler' Mounier
58a79d8631
Update to v103 
# Conflicts:
#	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/content/TechTree.java
#	core/src/mindustry/world/blocks/distribution/ItemConveyor.java
 2020-01-24 20:25:03 +01:00
Anuken
26676d60e1 Added underflow gates 2020-01-20 18:54:25 -05:00
Anuken
c0844304a6 Merge 2020-01-19 11:10:14 -05:00
Anuken
f044f30829 Merge 2020-01-18 11:16:03 -05:00
Anuken
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken
eaa86023f9 Visual tweaks 2020-01-14 17:07:39 -05:00
Anuken
e45df98f26 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/graphics/Bloom.java
#	gradle.properties
 2020-01-10 15:19:07 -05:00
Anuken
f7791a2bb2 Merge; internal changes 2020-01-10 11:30:42 -05:00
Patrick 'Quezler' Mounier
ed765ad10a
Merge branch 'master' into crater 
# Conflicts:
#	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
 2020-01-10 12:02:07 +01:00
Anuken
8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Patrick 'Quezler' Mounier
5f047603bf
Revert "Blend prototype" 
This reverts commit 35afc94d34.

# Conflicts:
#	core/assets/sprites/sprites.png
 2020-01-08 12:17:28 +01:00
Patrick 'Quezler' Mounier
5c485eff04
Ressurect OG corner 2020-01-08 10:58:05 +01:00
Patrick 'Quezler' Mounier
0f2f8f2411
Revert "Stash cursed loading dock" 
This reverts commit 9bdf475049.
 2020-01-08 10:42:34 +01:00
Patrick 'Quezler' Mounier
9bdf475049
Stash cursed loading dock 2020-01-08 10:41:09 +01:00
Patrick 'Quezler' Mounier
35afc94d34
Blend prototype 2020-01-08 10:27:06 +01:00
Patrick 'Quezler' Mounier
f6af699428
Revert "🎩" 
This reverts commit 10e4268dd5.

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
 2020-01-03 17:26:19 +01:00
Patrick 'Quezler' Mounier
0b0007502f
Revert "Differentiate texture from armored conveyor" 
This reverts commit 59451fcc0b.
 2020-01-03 17:09:13 +01:00
Patrick 'Quezler' Mounier
59451fcc0b
Differentiate texture from armored conveyor 
By removing the turtleshell it looks less armored while still somewhat high-tech (ish)
 2020-01-03 17:09:06 +01:00
Patrick 'Quezler' Mounier
0ae6527584
Sacrifice hivemind to convert craters to drawings 
Sad, yes, but crater units would never sync well over the net in its current state, so faking them unto conveyors is the only real option.

Forgive me future ai overlord <3
 2020-01-02 21:29:19 +01:00
Patrick 'Quezler' Mounier
10e4268dd5
🎩 
Leaving this here until it gets merged or something :)
 2020-01-02 09:02:37 +01:00
Patrick 'Quezler' Mounier
c3186b63ce
Rename compression to plastanium 
Breaking change.
 2020-01-01 13:43:14 +01:00
Patrick 'Quezler' Mounier
56351b427b
Revert "Attempt to remove unused regions" 
This reverts commit 4f5b737f7c.
 2019-12-30 10:53:50 +01:00
Patrick 'Quezler' Mounier
4f5b737f7c
Attempt to remove unused regions 
Failed, conveyor code depends to much on it, gonna revert this.
 2019-12-30 10:53:45 +01:00
Patrick 'Quezler' Mounier
e0cfbc7609
All hail the cuteness of this crater roomba critter 2019-12-27 20:45:27 +01:00
Anuken
186a2aaa45 Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# Conflicts:
#	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/ai/BlockIndexer.java
#	core/src/mindustry/core/World.java
#	core/src/mindustry/entities/traits/Entity.java
#	core/src/mindustry/entities/type/BaseEntity.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/world/blocks/defense/MendProjector.java
#	core/src/mindustry/world/blocks/defense/OverdriveProjector.java
#	core/src/mindustry/world/blocks/production/Drill.java
#	gradle.properties
 2019-12-27 01:41:06 -05:00
Anuken
32d28a4070 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# 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/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/ctype/ContentType.java
#	core/src/io/anuke/mindustry/ctype/UnlockableContent.java
#	core/src/io/anuke/mindustry/io/LegacyMapIO.java
#	core/src/io/anuke/mindustry/type/WeatherEvent.java
#	gradle.properties
 2019-12-24 12:40:23 -05:00
Patrick 'Quezler' Mounier
f89af1b26a Override inverted sorter arrow colours (#1252) 
Override hex’s of the arrows by those of the unloader.
 2019-12-24 00:32:04 -05:00
Patrick 'Quezler' Mounier
c279fda5e4
Suggest liquid void sprite 
Uses the color of the corner(s) for the inner ring, just like how the item void is colored based on the item source.
 2019-12-23 17:24:38 +01:00
ado1928
5e568eac0d Added Feathub to the "About" tab (#1234) 
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update Links.java
 2019-12-19 19:33:24 -05:00
TsjipTsjip
2366d25de7
Add liquid void block. 2019-12-12 21:11:14 +01:00
Anuken
9e3870acbe Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# Conflicts:
#	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/io/anuke/mindustry/world/blocks/defense/MendProjector.java
#	gradle.properties
 2019-12-02 22:45:05 -05:00