Commit Graph
361 Commits
Author SHA1 Message Date
Anuken 9f20ff151c Shortened annotation processors 2020-02-01 17:27:24 -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 93cada6a16 Conveyor benchmark test 2020-01-26 11:40:09 -05:00
Anuken 081edde1f2 Fixed double client commands 2020-01-24 22:48:05 -05:00
Anuken aefc4ed83c Better annotation processing 2020-01-24 18:31:54 -05:00
Anuken 78b2fe64a3 Fixed annotation source version warnings 2020-01-22 15:59:02 -05:00
Anuken 5e977312a7 Annotation processor cleanup 2020-01-22 12:24:00 -05:00
Anuken 85cf7e9d5c Added previously-missing icons 2020-01-19 18:45:25 -05:00
Anuken a797618f6c Fixed #1397 2020-01-19 14:56:12 -05:00
Anuken c0844304a6 Merge 2020-01-19 11:10:14 -05:00
Anuken 8d61ddbbd4 Added chat icons for in-game items and blocks 2020-01-17 18:08:23 -05:00
Anuken c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken 4f29c80814 Single-texture font+UI packing 2020-01-16 22:25:57 -05:00
Anuken f7c4ea3e58 Weapon mount cleanup 2020-01-16 10:52:20 -05:00
Anuken 15f5f2fad9 Cleanup 2020-01-11 14:08:03 -05:00
Anuken 647ae27020 Fixes 2020-01-10 15:20:48 -05:00
Anuken ec4c2c7adb Fixed compilation 2019-12-25 12:22:12 -05:00
Anuken 03342dc2f5 Android fixes 2019-12-25 12:06:19 -05:00
Anuken 475794640d More cleanup 2019-12-25 11:16:54 -05:00
Anuken 514d4817c8 it is done 2019-12-25 01:39:38 -05:00
Anuken 675e15ddca Minor refactor of class names 2019-12-11 14:23:53 -05:00
Anuken d2fda57f2c Revert merge 2019-10-21 19:32:46 -04:00
Anuken 982483f178 Merged #812 2019-10-20 17:05:23 -04:00
Anuken 204332a76a Mobile input fixes 2019-10-10 22:13:45 -04:00
Anuken cce0040eaf why does this work 2019-10-02 23:17:06 -04:00
Anuken e0ec9a047c Modded consumers 2019-10-02 14:44:18 -04:00
Anuken 33416aadef Parsing fixes / Moved annotations to Arc 2019-09-29 16:09:43 -04:00
Anuken bbaaa91575 Fixed black styles on game reload (Android) 2019-09-12 09:06:25 -04:00
Anuken 7aa71a7201 Steam workshop publishing 2019-09-10 14:25:34 -04:00
Anuken c4c0f45228 cleaning up what remains 2019-09-08 22:55:36 -04:00
Anuken d981bb95b9 it is gone 2019-09-08 22:32:47 -04:00
Anuken 4fb7430fb7 More cleanup, removed connection IDs 2019-09-07 15:23:13 -04:00
Anuken e90c8c4d3e Extensive network refactor 2019-09-07 14:11:50 -04:00
Anuken 316f4d471f Fixed iOS crash 2019-09-02 20:58:15 -04:00
Anuken 34df9cca2c Fixed Java 8+ compatibility 2019-08-31 16:54:29 -04:00
Anuken 1e80bdf19f Functional loading 2019-08-27 09:27:09 -04:00
Anuken 76cd7ba8d1 non-functional loading screen 2019-08-26 22:53:11 -04:00
Anuken 1fc9c82aaf Attempts to improve the loading system 2019-08-26 13:15:53 -04:00
Anuken dc435d88f4 Fixed massive music files on iOS, now using MP3 2019-08-16 14:49:35 -04:00
Anuken b68734d679 iOS-specific format loading 2019-08-14 11:03:36 -04:00
Anuken 0770574f17 Sound things 2019-08-11 16:55:32 -04:00
Anuken 2341da995e Random in-game music, untested 2019-08-10 18:56:20 -04:00
Anuken 2d504521b1 Bugfixes 2019-08-07 08:39:59 -04:00
Anuken dafbba0907 Fixed more things 2019-07-31 22:49:41 -04:00
Anuken 28ab2b3917 Fixed crashes not saving or displaying 2019-08-01 02:28:01 -06:00
Anuken d8085d88a8 Re-added classic sound effects for testing 2019-07-31 16:25:25 -04:00
Anuken d6b023709d Initial menu music test 2019-07-30 22:50:15 -04:00
Anuken a00a208ff8 Annotation processor for sound asset generation 2019-07-30 12:05:59 -04:00
Anuken 7a2234cd25 Tweaks to improve in-game editing 2019-05-11 00:37:29 -04:00
Anuken 486e3ffc0a Actual map conversion, loading of saves 2019-05-09 10:53:52 -04:00