Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,872 Commits 4 Branches 180 Tags
bdeef68a0be1966862f3c35996aa03784f5a4e05
Commit Graph

1523 Commits

Author SHA1 Message Date
Anuken
f46be924b9 Effects, collisions, method overrides 2020-02-08 13:14:23 -05:00
Anuken
4265d40024 Movement 2020-02-07 13:02:24 -05:00
Anuken
007a1bd1d2 Unit definitions 2020-02-07 11:04:58 -05:00
Anuken
33e818a757 Entity name mapping 2020-02-07 09:36:51 -05:00
Anuken
eeae5149a1 Basic unit rendering 2020-02-06 22:08:31 -05:00
MEEP of Faith
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
Anuken
ddecb2d831 Actual updating and rendering 2020-02-06 13:40:07 -05:00
Anuken
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
Anuken
84748afc55 the errors are back 2020-02-05 15:00:35 -05:00
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
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
Patrick 'Quezler' Mounier
445126ea65 Rename Track to CraterConveyor 
though it does not extend the conveyor class.
 2020-01-28 11:41:20 +01:00
Patrick 'Quezler' Mounier
683211cb1f Untangle conveyor entanglement 
Made track a standalone block due to the influx of conveyor code changes, and if it were ever to return it would make sense to also include the conduits in one form or another, like a 🐍 class/trait/abstract/method/etc
 2020-01-28 10:41:30 +01: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
Patrick 'Quezler' Mounier
6eb6870bb6 Register crater emoji via ui folder 
#1458
 2020-01-27 19:33:36 +01:00
Patrick 'Quezler' Mounier
883a2a9b59 Bruteforce crater emoji 2020-01-27 18:40:40 +01:00
Patrick 'Quezler' Mounier
9a289c83e6 Fuse with conveyor optimization 
# Conflicts:
#	core/src/mindustry/world/blocks/distribution/ItemConveyor.java
 2020-01-27 18:06:48 +01: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
Patrick 'Quezler' Mounier
6e970cb84d Fix tech tree entry 2020-01-24 20:26:49 +01:00
Patrick 'Quezler' Mounier
58a79d8631 Update to v103 
# 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/content/Blocks.java
#	core/src/mindustry/content/TechTree.java
#	core/src/mindustry/world/blocks/distribution/ItemConveyor.java
 2020-01-24 20:25:03 +01: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
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
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
Patrick 'Quezler' Mounier
2948738e33 Refractor away overhead 2020-01-05 10:28:43 +01:00
Patrick 'Quezler' Mounier
d843f29e09 Make crater speed configurable 2020-01-03 12:19:33 +01:00
Patrick 'Quezler' Mounier
e289f13d27 - newline 2020-01-02 21:40:04 +01:00