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

1452 Commits

Author SHA1 Message Date
Patrick 'Quezler' Mounier
087aef6b85 Move capacity into crater 2020-03-06 11:06:35 +01:00
Anuken
1c48c1a43e Cleanup 2020-03-05 23:23:10 -05:00
Anuken
2e19504b65 it begins 2020-03-05 20:27:42 -05:00
Anuken
5a0d079a78 oh no 2020-03-05 18:05:59 -05:00
Patrick 'Quezler' Mounier
e5e4884448 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
#	core/src/mindustry/world/modules/ItemModule.java
 2020-03-05 10:00:02 +01:00
Anuken
7a01719816 Real-time lighting + solar system rendering 2020-02-29 11:58:10 -05:00
Anuken
f0857fa22d Universe time + Progress on solar system framework 2020-02-28 20:21:00 -05:00
Anuken
baa0eb1149 Added cliffs as separate block 2020-02-21 23:45:25 -05:00
Anuken
a5e469e96c Complete planet panning 2020-02-21 13:48:50 -05:00
Anuken
99d3e9ae7c Generator cleanup 2020-02-20 20:28:23 -05:00
Anuken
65800a51c6 Sector darkness boundaries 2020-02-19 00:29:48 -05:00
Anuken
48c04bda8c Map tweaks 2020-02-18 20:07:07 -05:00
Anuken
53996d8a8d Circular sector maps 2020-02-18 19:34:07 -05:00
Anuken
da2cc292c3 Wall generation 2020-02-17 20:33:01 -05:00
Anuken
6d68e10804 Bugfixes, cleanup 2020-02-16 22:22:10 -05:00
Anuken
e71230755d Fixed omnidirectional shooting with ignored rotation 2020-02-16 13:49:29 -05:00
Anuken
7a8bd82f8e Improved controls / Re-added engine sprite 2020-02-16 13:16:18 -05:00
Anuken
e677538c53 Fixed a crash 2020-02-15 15:55:37 -05:00
Anuken
8b4fcf99a6 Building / Fixed some tests 2020-02-15 14:51:31 -05:00
Anuken
e3621f44da Barely functional IO 2020-02-13 19:26:36 -05:00
Anuken
ad248e2e20 Autogeneration of some IO code 2020-02-13 13:30:30 -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
Patrick 'Quezler' Mounier
562fa07755 Merge branch 'master' into crater 2020-02-10 12:09:14 +01:00
Anuken
e9b066b866 Fires, puddles, feature reimplementations 2020-02-09 23:43:08 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Anuken
5169e197b6 Bugfixes 2020-02-08 16:00:54 -05:00
Anuken
ba1f59aa71 Better physics 2020-02-08 15:39:27 -05:00
Anuken
8814dbe29a Sprite cleanup / Bullets 2020-02-08 14:48:04 -05:00
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