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 |
|
Anuken
|
256f805754
|
Payload fixes
|
2020-04-16 09:55:57 -04: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Anuken
|
8f208920f7
|
Merged in liquid void
|
2020-01-08 11:04:12 -05: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 |
|
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
|
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
|
56917483d6
|
Cleaned up diode
|
2019-11-11 23:32:49 -05:00 |
|