Commit Graph

24 Commits

Author SHA1 Message Date
Anuken
a375dd3fc2 Cleanup 2020-05-26 19:39:50 -04:00
Anuken
46bc2207ff Initial reconstructor impl 2020-05-23 18:49:28 -04:00
Anuken
14e79b50d2 Removed legacy IO code 2020-05-21 16:50:49 -04:00
Anuken
d110fe5ea3 Removed usage of Core.settings#save 2020-05-16 10:23:06 -04:00
Anuken
becc23ca42 Cleaner formatting 2020-05-03 21:18:25 -04:00
Anuken
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
Anuken
6cbc42d9de Fixed unnecessary Color rgba methods 2020-03-19 20:00:04 -04:00
Anuken
47f075133f Merge 2020-02-13 11:22:29 -05:00
Anuken
031b6e0bf8 Fixed #1565 2020-02-12 13:26:29 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Anuken
a5fd881f8d Full implementation of #1494 2020-02-05 19:01:53 -05:00
Anuken
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
Anuken
a7b39e56bd Cleanup continues 2020-02-04 18:00:32 -05:00
Anuken
67106abb9b Updated arc 2020-02-03 20:30:18 -05:00
Anuken
a942ed2cad More cleanup 2020-02-03 20:24:49 -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
85e0103ff8 UI fixes 2020-01-22 11:13:27 -05:00
Anuken
c0844304a6 Merge 2020-01-19 11:10:14 -05:00
Anuken
95352e1729 Added server descriptions 2020-01-18 10:05:18 -05:00
Anuken
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken
b01d56aae8 Bugfixes 2019-12-28 18:22:20 -05:00
Anuken
60d83751e8 Fixed server port not being parsed 2019-12-28 17:55:00 -05:00
Anuken
179bf4d525 Added BE-specific server list 2019-12-28 16:34:35 -05:00
Anuken
514d4817c8 it is done 2019-12-25 01:39:38 -05:00