|
|
85e4270536
|
New water textures
|
2020-04-04 00:31:29 -04:00 |
|
|
|
a26cd46a7e
|
Reflective planet water
|
2020-04-02 12:32:55 -04:00 |
|
|
|
ad45bebbdc
|
Better spawn selection
|
2020-03-22 09:28:55 -04:00 |
|
|
|
08488857da
|
Removed DoubleTurret, merged functionality
|
2020-03-17 11:02:10 -04:00 |
|
|
|
808615a77c
|
Bugfixes
|
2020-03-13 22:33:37 -04:00 |
|
|
|
863c7ae2bc
|
Removed unit factory limit
|
2020-03-08 17:49:19 -04:00 |
|
|
|
7b144cbec6
|
Attribute tweaks
|
2020-03-07 13:56:57 -05:00 |
|
|
|
f8b554aff8
|
Fixed some basic crashes
|
2020-03-06 15:30:51 -05:00 |
|
|
|
4358658889
|
Down to less than 100 errors
|
2020-03-06 14:55:06 -05:00 |
|
|
|
1c48c1a43e
|
Cleanup
|
2020-03-05 23:23:10 -05:00 |
|
|
|
2e19504b65
|
it begins
|
2020-03-05 20:27:42 -05:00 |
|
|
|
5a0d079a78
|
oh no
|
2020-03-05 18:05:59 -05:00 |
|
|
|
baa0eb1149
|
Added cliffs as separate block
|
2020-02-21 23:45:25 -05:00 |
|
|
|
da2cc292c3
|
Wall generation
|
2020-02-17 20:33:01 -05:00 |
|
|
|
6fd0205495
|
Merge
|
2020-02-11 19:55:02 -05:00 |
|
|
|
fb302d49c7
|
Improved battery brightness display / Palette tweak / Diffgen buff
|
2020-02-11 17:27:33 -05:00 |
|
|
|
a2706a80b1
|
Merged with master
|
2020-02-09 12:27:44 -05:00 |
|
|
|
5169e197b6
|
Bugfixes
|
2020-02-08 16:00:54 -05:00 |
|
|
|
ba1f59aa71
|
Better physics
|
2020-02-08 15:39:27 -05:00 |
|
|
|
da5755b7c1
|
For consistancy (#1517)
Swap "liquids" with "liquid." Also proposing because the category for liquid blocks is "liquid" and not "liquids" when modding.
|
2020-02-06 14:46:33 -05:00 |
|
|
|
a7b39e56bd
|
Cleanup continues
|
2020-02-04 18:00:32 -05:00 |
|
|
|
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 |
|
|
|
36b9451e01
|
Read-only component fields / Removed get/set prefix
|
2020-02-04 12:14:09 -05:00 |
|
|
|
a942ed2cad
|
More cleanup
|
2020-02-03 20:24:49 -05:00 |
|
|
|
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 |
|
|
|
0d5dd146ef
|
Fixed #1451
|
2020-01-26 10:58:14 -05:00 |
|
|
|
a4e820f907
|
Added default ore flags for modded ores
|
2020-01-23 20:20:04 -05:00 |
|
|
|
26676d60e1
|
Added underflow gates
|
2020-01-20 18:54:25 -05:00 |
|
|
|
c0844304a6
|
Merge
|
2020-01-19 11:10:14 -05:00 |
|
|
|
f044f30829
|
Merge
|
2020-01-18 11:16:03 -05:00 |
|
|
|
eaa86023f9
|
Visual tweaks
|
2020-01-14 17:07:39 -05:00 |
|
|
|
bbf87df373
|
a revelation
|
2020-01-11 23:41:12 -05:00 |
|
|
|
35835cacd3
|
Fixed #1355
|
2020-01-11 12:47:54 -05:00 |
|
|
|
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 |
|
|
|
f7791a2bb2
|
Merge; internal changes
|
2020-01-10 11:30:42 -05:00 |
|
|
|
8f208920f7
|
Merged in liquid void
|
2020-01-08 11:04:12 -05:00 |
|
|
|
3ae8065cf1
|
Merge
|
2020-01-06 17:20:16 -05:00 |
|
|
|
51bd74fcc1
|
Build time increase of basic blocks
|
2019-12-30 12:55:35 -05:00 |
|
|
|
f2e1d17ce9
|
Made junction harder to spam
|
2019-12-30 12:49:27 -05:00 |
|
|
|
730d30ef98
|
Added core schematic selection setting
|
2019-12-29 11:40:52 -05:00 |
|
|
|
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 |
|
|
|
8ac0949ddf
|
Added default liquid turret liquid display
|
2019-12-25 14:38:43 -05:00 |
|
|
|
1e7c83f0c9
|
Partial merge
|
2019-12-25 13:22:36 -05:00 |
|
|
|
514d4817c8
|
it is done
|
2019-12-25 01:39:38 -05:00 |
|
