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 |
|
Anuken
|
36b9451e01
|
Read-only component fields / Removed get/set prefix
|
2020-02-04 12:14:09 -05:00 |
|
Anuken
|
a942ed2cad
|
More cleanup
|
2020-02-03 20:24:49 -05:00 |
|
Anuken
|
f937cb30f0
|
More components, less entities
|
2020-02-02 23:38:16 -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
|
0d5dd146ef
|
Fixed #1451
|
2020-01-26 10:58:14 -05:00 |
|
Anuken
|
923d576a5f
|
Fixed #1436 / Fixed crawlers not exploding
|
2020-01-24 23:21:23 -05:00 |
|
Anuken
|
a4e820f907
|
Added default ore flags for modded ores
|
2020-01-23 20:20:04 -05:00 |
|
Anuken
|
f4940fffab
|
Minor tweaks
|
2020-01-23 18:33:32 -05:00 |
|
Anuken
|
501ca5dd4e
|
New tech tree layout
|
2020-01-20 22:39:46 -05:00 |
|
Anuken
|
200e85d970
|
Added underflow gate to tech tree
|
2020-01-20 18:55:26 -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
|
b1df52e0c8
|
Added self-destruct bullet property
|
2020-01-19 10:43:38 -05:00 |
|
Anuken
|
b2f9b2ef77
|
Planet cleanup
|
2020-01-18 17:03:03 -05:00 |
|
Anuken
|
f044f30829
|
Merge
|
2020-01-18 11:16:03 -05:00 |
|
Anuken
|
f7c4ea3e58
|
Weapon mount cleanup
|
2020-01-16 10:52:20 -05:00 |
|
Anuken
|
eaa86023f9
|
Visual tweaks
|
2020-01-14 17:07:39 -05:00 |
|
Anuken
|
bbf87df373
|
a revelation
|
2020-01-11 23:41:12 -05:00 |
|
Anuken
|
35835cacd3
|
Fixed #1355
|
2020-01-11 12:47:54 -05:00 |
|
Anuken
|
6f3c771d73
|
Refactoring
|
2020-01-10 17:28:37 -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
|
b123b8b074
|
Removed Mech/UnitType
|
2020-01-10 15:08:13 -05:00 |
|
Anuken
|
f7791a2bb2
|
Merge; internal changes
|
2020-01-10 11:30:42 -05:00 |
|
Anuken
|
50355b45d5
|
Tech tree balance
|
2020-01-08 23:28:25 -05:00 |
|
Anuken
|
8f208920f7
|
Merged in liquid void
|
2020-01-08 11:04:12 -05:00 |
|
Anuken
|
3ae8065cf1
|
Merge
|
2020-01-06 17:20:16 -05:00 |
|
Anuken
|
51bd74fcc1
|
Build time increase of basic blocks
|
2019-12-30 12:55:35 -05:00 |
|
Anuken
|
f2e1d17ce9
|
Made junction harder to spam
|
2019-12-30 12:49:27 -05:00 |
|
Anuken
|
730d30ef98
|
Added core schematic selection setting
|
2019-12-29 11:40:52 -05:00 |
|
Anuken
|
c250b1d24a
|
Fixes
|
2019-12-28 11:16:35 -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
|
c0c0ffa682
|
Bugfixes
|
2019-12-27 01:22:50 -05:00 |
|
Anuken
|
de5979f4ee
|
Many various internal changes
|
2019-12-26 17:46:01 -05:00 |
|
Anuken
|
8ac0949ddf
|
Added default liquid turret liquid display
|
2019-12-25 14:38:43 -05:00 |
|
Anuken
|
c307fc02cf
|
Full merge
|
2019-12-25 13:34:27 -05:00 |
|
Anuken
|
c681cc5cf8
|
Compile fixes
|
2019-12-25 13:25:44 -05:00 |
|
Anuken
|
1e7c83f0c9
|
Partial merge
|
2019-12-25 13:22:36 -05:00 |
|
Anuken
|
514d4817c8
|
it is done
|
2019-12-25 01:39:38 -05:00 |
|