Anuken
|
da97aee8e4
|
it never ends
|
2020-02-05 13:03:22 -05:00 |
|
Anuken
|
a7b39e56bd
|
Cleanup continues
|
2020-02-04 18:00:32 -05:00 |
|
Anuken
|
012421afcb
|
Class ID mapping
|
2020-02-04 13:57:42 -05: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 |
|
Anuken
|
36b9451e01
|
Read-only component fields / Removed get/set prefix
|
2020-02-04 12:14:09 -05:00 |
|
Anuken
|
006004fd70
|
Decal cleanup
|
2020-02-04 09:39:12 -05:00 |
|
Anuken
|
a942ed2cad
|
More cleanup
|
2020-02-03 20:24:49 -05:00 |
|
Anuken
|
141cf518a2
|
Refactoring
|
2020-02-03 14:07:06 -05:00 |
|
Anuken
|
f937cb30f0
|
More components, less entities
|
2020-02-02 23:38:16 -05:00 |
|
Anuken
|
f2f31120a0
|
Gradual component conversion
|
2020-02-02 20:17:22 -05:00 |
|
Anuken
|
89e1c5afc0
|
Conveyor tweaks
|
2020-01-28 00:21:05 -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
|
5ad0193a86
|
Fixed reduced conveyor edge throughput
|
2020-01-27 13:15:12 -05:00 |
|
Anuken
|
65211a6021
|
Fixed #1447
|
2020-01-27 11:01:48 -05:00 |
|
Anuken
|
a61234d21e
|
Minor tweaks
|
2020-01-26 21:50:55 -05:00 |
|
Anuken
|
9baaacc8ac
|
Crash fix
|
2020-01-26 16:55:24 -05:00 |
|
Anuken
|
621233a5b3
|
More optimization
|
2020-01-26 16:12:11 -05:00 |
|
Anuken
|
9a3245c23e
|
Clamp
|
2020-01-26 15:13:55 -05:00 |
|
Anuken
|
6fe2697185
|
2x faster conveyor optimization
|
2020-01-26 15:04:00 -05:00 |
|
Anuken
|
adbfb15932
|
Cleanup
|
2020-01-26 13:13:01 -05:00 |
|
Anuken
|
93cada6a16
|
Conveyor benchmark test
|
2020-01-26 11:40:09 -05:00 |
|
Anuken
|
923d576a5f
|
Fixed #1436 / Fixed crawlers not exploding
|
2020-01-24 23:21:23 -05:00 |
|
Anuken
|
f2bc3e78d7
|
Fixed #1429
|
2020-01-24 14:00:06 -05:00 |
|
Anuken
|
2fe6a3525b
|
Added null check for attribute
|
2020-01-24 13:37:23 -05:00 |
|
Anuken
|
b9876e267b
|
Headless load fix
|
2020-01-24 12:31:34 -05:00 |
|
Anuken
|
99e51411d5
|
Implemented #1048
|
2020-01-24 11:24:35 -05:00 |
|
Anuken
|
a4e820f907
|
Added default ore flags for modded ores
|
2020-01-23 20:20:04 -05:00 |
|
Anuken
|
235142c869
|
Implemented #1093
|
2020-01-23 15:50:03 -05:00 |
|
Anuken
|
26676d60e1
|
Added underflow gates
|
2020-01-20 18:54:25 -05:00 |
|
Anuken
|
a4ac318c9e
|
Changed deconstruct event to fire before tile removal
|
2020-01-20 15:00:38 -05:00 |
|
Anuken
|
d2bc2baefe
|
Fixed #1401
|
2020-01-20 14:32:07 -05:00 |
|
Anuken
|
8aec6d24db
|
Fixed #776
|
2020-01-20 14:28:18 -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
|
5328875ba5
|
nothing
|
2020-01-18 11:14:47 -05:00 |
|
Anuken
|
c3d2351b2d
|
Various icon changes
|
2020-01-17 13:57:04 -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
|
7e7d2019af
|
Made Android files external
|
2020-01-11 19:21:16 -05:00 |
|
Anuken
|
10634af104
|
Fixed #1360
|
2020-01-11 17:11:51 -05:00 |
|
Anuken
|
35835cacd3
|
Fixed #1355
|
2020-01-11 12:47:54 -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
|
677aa0d0bf
|
Shortening of a few classes
|
2020-01-10 15:13:34 -05:00 |
|
Anuken
|
f7791a2bb2
|
Merge; internal changes
|
2020-01-10 11:30:42 -05:00 |
|
Anuken
|
a7cddf97b8
|
Implemented bridge opacity from #1006
|
2020-01-08 16:16:19 -05:00 |
|
Anuken
|
7b4ee27fe4
|
Bugfixes
|
2020-01-08 11:37:12 -05:00 |
|
Anuken
|
8f208920f7
|
Merged in liquid void
|
2020-01-08 11:04:12 -05:00 |
|
Patrick 'Quezler' Mounier
|
406c11a14d
|
Make rebuildable a block attribute (#1338)
|
2020-01-08 10:28:28 -05:00 |
|