Commit Graph
100 Commits
Author SHA1 Message Date
Anuken a11f6efe0a Rudimentary rendering 2020-02-05 23:04:48 -05:00
Anuken 8172e69f8c it launches 2020-02-05 22:08:57 -05:00
Anuken 65857d77c4 .... 2020-02-05 21:14:53 -05:00
Anuken dfecfa3964 . 2020-02-05 20:11:49 -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 eb0ea9030b ? 2020-02-05 13:08:48 -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 878f570472 Cleanup 2020-02-04 12:23:38 -05:00
Anuken 36b9451e01 Read-only component fields / Removed get/set prefix 2020-02-04 12:14:09 -05:00
Anuken 1d0cfd4435 UnitType cleanup 2020-02-04 11:40:56 -05:00
Anuken 006004fd70 Decal cleanup 2020-02-04 09:39:12 -05:00
Anuken a07e275e11 Entity groups 2020-02-04 01:03:34 -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 88d2ec5be8 Cleanup 2020-02-03 15:59:54 -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 63fa50d111 Implementation begins 2020-02-02 18:33:59 -05:00
Anuken ad84329688 Abstract component method support 2020-02-02 17:21:35 -05:00
Anuken ae6d33cad1 Bugfixes 2020-02-02 16:44:51 -05:00
Anuken ad9dd83032 Better entity code generation + minor refactoring 2020-02-02 16:13:25 -05:00
Anuken 382ca09f6e Merge branches 'master' and 'splinterface' of https://github.com/Anuken/Mindustry 2020-02-02 13:59:41 -05:00
Anuken c978410cb3 Scale cleanup / Name cleanup 2020-02-02 13:59:24 -05:00
Anuken 5eb3f0f3de Interface + base component support 2020-02-02 12:25:46 -05:00
Anuken acb3438cc8 More entity processor features 2020-02-02 11:51:58 -05:00
Anuken 7ddfcbfabd Utility method copying 2020-02-02 00:39:29 -05:00
Anuken da2aee7d31 Entity components based on code generation - experiment 2020-02-01 23:54:41 -05:00
Anuken 9f20ff151c Shortened annotation processors 2020-02-01 17:27:24 -05:00
Anuken 5f7fc3441c Merge remote-tracking branch 'origin/master' 2020-02-01 17:17:08 -05:00
Anuken 62179233ef Bugfixes 2020-02-01 17:17:03 -05:00
Anuken eabebcefc7 Disabled data folder button due to terrible file manager support 2020-01-31 23:09:21 -05:00
Anuken 63d84bead3 Cleanup 2020-01-31 20:10:21 -05:00
Anuken 51b4824c92 Fixed #1484 2020-01-31 11:07:25 -05:00
Anuken 2721aa550d Implemented #1444 2020-01-30 22:56:17 -05:00
Anuken f92b91c17b Switched to arc bloom 2020-01-30 17:50:35 -05:00
Anuken 221b28c153 Merge remote-tracking branch 'origin/master' 2020-01-30 17:43:48 -05:00
Anuken 7c2541afa2 Fixed bloom black screen on iOS/Android 2020-01-30 17:43:36 -05:00
Anuken 97cfc33abb Merge remote-tracking branch 'origin/master' 2020-01-28 13:44:13 -05:00
Anuken 867a642859 Fixed #1460 2020-01-28 13:44:06 -05:00
AnukenandGitHub d99cad8793 Update SERVERLIST.md 2020-01-28 13:28:34 -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 a2933e030a More severe votekick 2020-01-27 15:43:17 -05:00
Anuken d21c47a582 Merge remote-tracking branch 'origin/master' 2020-01-27 13:15:15 -05:00
Anuken 5ad0193a86 Fixed reduced conveyor edge throughput 2020-01-27 13:15:12 -05:00
AnukenandGitHub 5ebc04ab29 Update SERVERLIST.md 2020-01-27 11:59:17 -05:00
Anuken 379f860a6b Merge remote-tracking branch 'origin/master' 2020-01-27 11:01:57 -05:00
Anuken 65211a6021 Fixed #1447 2020-01-27 11:01:48 -05:00
AnukenandGitHub 9395fa99be Create SERVERLIST.md 2020-01-27 10:50:08 -05:00
Anuken b7e1adb8b1 Fixed 103 network compatibility 2020-01-27 10:19:18 -05:00
Anuken b9e8694e68 Added synced server label + effect methods 2020-01-27 00:25:32 -05:00
Anuken cd1ed97e52 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-01-27 00:11:24 -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 db3d4b170f Merge branches 'conveyor-refactor' and 'master' of https://github.com/Anuken/Mindustry 2020-01-26 16:12:35 -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 d7ea0bc21e why 2020-01-26 13:16:42 -05:00
Anuken adbfb15932 Cleanup 2020-01-26 13:13:01 -05:00
Anuken fda6ea4b45 Fixed #1452 2020-01-26 11:40:28 -05:00
Anuken 93cada6a16 Conveyor benchmark test 2020-01-26 11:40:09 -05:00
Anuken 0d5dd146ef Fixed #1451 2020-01-26 10:58:14 -05:00
Anuken e14a36a97e Fixed #1445 2020-01-25 17:50:59 -05:00
Anuken ca69aafd11 Fixed #1440 2020-01-25 10:44:46 -05:00
Anuken 923d576a5f Fixed #1436 / Fixed crawlers not exploding 2020-01-24 23:21:23 -05:00
Anuken 081edde1f2 Fixed double client commands 2020-01-24 22:48:05 -05:00
Anuken 1ab81fa4ab Bugfixes 2020-01-24 19:14:49 -05:00
Anuken 69711151a5 Bugfixes 2020-01-24 18:48:26 -05:00
Anuken aefc4ed83c Better annotation processing 2020-01-24 18:31:54 -05:00
Anuken 83f44abb5a Suppress d/c messages when necessary 2020-01-24 14:27: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 78fb427120 Minor fixes 2020-01-24 13:02:03 -05:00
Anuken b9876e267b Headless load fix 2020-01-24 12:31:34 -05:00
Anuken 4c1459c47e Fixed page limits in /help 2020-01-24 11:50:51 -05:00
Anuken 8141361a30 Fix script whitelist 2020-01-24 11:27:47 -05:00
Anuken 99e51411d5 Implemented #1048 2020-01-24 11:24:35 -05:00
Anuken 4ca1a506b6 Merge remote-tracking branch 'origin/master' 2020-01-24 11:17:22 -05:00
Anuken 125d6ef8cd Cleanup 2020-01-24 11:17:18 -05:00
Anuken d58098ca94 Added server info toast method 2020-01-24 11:03:15 -05:00
Anuken 1a6436355c Merge remote-tracking branch 'origin/master' 2020-01-24 10:26:16 -05:00
Anuken 63c277f78e Implemented mod name display in content desc 2020-01-24 10:26:10 -05:00
Anuken a4e820f907 Added default ore flags for modded ores 2020-01-23 20:20:04 -05:00
Anuken bc56b8127f Merge remote-tracking branch 'origin/master' 2020-01-23 19:17:16 -05:00
Anuken b16ad97d93 Updated font 2020-01-23 19:17:11 -05:00
Anuken 92df6e6e06 Merge remote-tracking branch 'origin/master' 2020-01-23 18:33:38 -05:00
Anuken f4940fffab Minor tweaks 2020-01-23 18:33:32 -05:00
Anuken d031efe1f2 Added Steam player limit + reduced votekick cooldown 2020-01-23 17:49:53 -05:00
Anuken 235142c869 Implemented #1093 2020-01-23 15:50:03 -05:00
Anuken 288da868bf Merged #1406 manually 2020-01-23 14:53:27 -05:00
Anuken 1716076cdf Minor UI tweaks 2020-01-23 14:40:07 -05:00
Anuken eb8479f7f7 Switched from gdx-packer to arc-packer 2020-01-22 19:16:56 -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