Anuken
2c4dcff72d
Cleanup
2020-01-20 16:15:15 -05:00
Anuken
f6595937f4
Cleanup
2020-01-20 16:14:45 -05:00
Anuken
85cf7e9d5c
Added previously-missing icons
2020-01-19 18:45: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
95352e1729
Added server descriptions
2020-01-18 10:05:18 -05:00
Anuken
6e6f8f3cdb
Icon cleanup
2020-01-17 22:50:27 -05:00
Anuken
ca519a94af
Font improvements
2020-01-17 18:29:18 -05:00
Anuken
d9e5dc8ba2
Added missing icons
2020-01-17 15:24:34 -05:00
Anuken
c3d2351b2d
Various icon changes
2020-01-17 13:57:04 -05:00
Anuken
4f29c80814
Single-texture font+UI packing
2020-01-16 22:25:57 -05:00
Anuken
ce18e32826
Added font icon generate+merge pipeline
2020-01-16 17:05:20 -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
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
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 and Anuken
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 and Anuken
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
Anuken
3d8e5bd36a
Added new Cyrillic font
2019-12-15 21:31:55 -05:00
Anuken
61d724ee2b
Added Thai font
2019-12-12 15:54:25 -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
Anuken
78f146fbcf
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/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/io/anuke/mindustry/graphics/Shaders.java
# gradle.properties
2019-12-01 17:42:56 -05:00
Anuken
a5fbc07561
Texture overrides / Potential mod texture binding optimizations
2019-11-25 20:50:32 -05:00
Patrick 'Quezler' Mounier and Anuken
7830372477
Beep boop add f-droid ( #1087 )
...
Full credit to @ZacBytes for the initial implementation.
2019-11-18 15:52:44 -05:00
Anuken
9b732017a9
Added contribution guide
2019-11-18 00:55:33 -05:00
Anuken
fad6fe9a2a
Added armored conduit / Lighting improvements / Moved liquid package
2019-11-17 13:51:36 -05:00
Anuken
84968c9f73
Added color picker / Customizable lighting rules
2019-11-16 23:27:42 -05:00
Anuken
913a703d41
Illuminator textures
2019-11-16 20:06:11 -05:00
Anuken
faf64f11f2
More lights
2019-11-16 19:57:33 -05:00
Anuken
8798fa101a
Merge
2019-11-16 00:15:45 -05:00
Patrick 'Quezler' Mounier
8a089ba3c9
Resolve conflicts
...
# 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
2019-11-12 08:44:26 +01:00
Anuken
Patrick 'Quezler' Mounier
ado1928andAnuken
TsjipTsjip