Commit Graph
100 Commits
Author SHA1 Message Date
Anuken cb4ecbd4b8 Implemented % tile efficiency display 2020-03-26 18:25:10 -04:00
Anuken 0573160b2f Added sorter cross (#1566) 2020-03-26 17:39:23 -04:00
Anuken 152a987c3a Experimental flow display 2020-03-26 17:19:18 -04:00
Anuken f966489298 Various tweaks 2020-03-25 23:28:20 -04:00
Anuken e7ffb0214f Fixed some invalid sectors 2020-03-25 16:04:19 -04:00
Anuken 51b03725a2 Oregen fixes 2020-03-25 10:41:26 -04:00
Anuken 4fb74d1e39 Cleanup 2020-03-25 00:18:40 -04:00
Anuken 7d5ceafff2 Implemented #1129 / Bugfixes 2020-03-24 12:02:26 -04:00
Anuken a1b64900ab 2 2020-03-24 00:33:59 -04:00
Anuken 2b4ce01fac Updated arc 2020-03-24 00:25:36 -04:00
Anuken 52b6e756bc Fixed some issues with scaled ninepatches 2020-03-24 00:22:28 -04:00
Anuken 74b6bc5dd3 Added distributed ore gen 2020-03-23 14:08:37 -04:00
Anuken 2165a2af7d Better enemy spawn selection 2020-03-22 23:12:58 -04:00
Anuken 289cca3bf0 Cleanup 2020-03-22 13:16:11 -04:00
Anuken 53a6297b59 Better naval check 2020-03-22 11:30:15 -04:00
Anuken ea3e16ee16 Added water check 2020-03-22 09:44:38 -04:00
Anuken ad45bebbdc Better spawn selection 2020-03-22 09:28:55 -04:00
Anuken 196a9dd77e Fixed incorrect plane projection 2020-03-21 19:11:13 -04:00
Anuken 148abaccd9 Cleanup 2020-03-21 16:40:39 -04:00
Anuken 4813d6c8ff More reasonable AI behavior 2020-03-21 14:29:00 -04:00
Anuken 3563c929af Cleanup 2020-03-21 12:08:21 -04:00
Anuken d831fa7ba3 Added basic flying AI 2020-03-21 11:48:10 -04:00
Anuken d673167477 Added basic ground AI 2020-03-21 10:49:38 -04:00
Anuken c4d5314a1a Color script fixes 2020-03-19 20:15:41 -04:00
Anuken d91ff744f2 Fixed color methods 2020-03-19 20:14:37 -04:00
Anuken d2a2311cce Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/src/mindustry/core/ContentLoader.java
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/entities/type/Player.java
#	core/src/mindustry/io/MapIO.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/ui/dialogs/HostDialog.java
#	core/src/mindustry/ui/dialogs/JoinDialog.java
#	core/src/mindustry/world/LegacyColorMapper.java
2020-03-19 20:07:45 -04:00
Anuken 966321baca Merge remote-tracking branch 'origin/master' 2020-03-19 20:02:48 -04:00
Anuken f2f39573bb Color cleanup 2020-03-19 20:02:43 -04:00
Anuken 6cbc42d9de Fixed unnecessary Color rgba methods 2020-03-19 20:00:04 -04:00
Anuken c7bc05f560 Unlock tweaks 2020-03-19 12:45:21 -04:00
Anuken e9994794aa Sector lock state 2020-03-19 11:29:18 -04:00
Anuken 6bf031d0f5 Planet render cleanup 2020-03-18 13:32:23 -04:00
Anuken 436c76fd2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/src/mindustry/world/blocks/BuildBlock.java
2020-03-17 20:03:12 -04:00
Anuken 12d4aab48a Tweaks 2020-03-17 20:02:38 -04:00
AnukenandGitHub 71f20f928a Update build.gradle 2020-03-17 20:01:44 -04:00
Anuken 0ed21a1d5f Bugfixes, cleanup / Created stub processor class 2020-03-17 11:51:33 -04:00
Anuken 08488857da Removed DoubleTurret, merged functionality 2020-03-17 11:02:10 -04:00
Anuken 2c7ff64511 Fixed some variable shadowing 2020-03-17 10:28:18 -04:00
Anuken 24f5921863 Bugfixes 2020-03-17 09:07:31 -04:00
Anuken 32ffacf8f6 Added sector deployment UI 2020-03-16 23:09:07 -04:00
Anuken 928812142a Bugfixes & liquid unit tests 2020-03-16 10:41:32 -04:00
Anuken 2250f2f0bc Stack trace 2020-03-16 01:08:45 -04:00
Anuken 6079980a50 Fixed content loading crash 2020-03-15 09:08:27 -04:00
Anuken 1e3326fb8a Cleanup 2020-03-15 09:02:14 -04:00
Anuken cd019ab329 More bugfixes 2020-03-14 18:19:07 -04:00
Anuken 7e781d9ff8 Bugfixes 2020-03-14 12:29:12 -04:00
Anuken 808615a77c Bugfixes 2020-03-13 22:33:37 -04:00
Anuken 06e94b1800 Cleaned up weather class 2020-03-11 10:08:27 -04:00
Anuken 8550995c4e Fixed compilation 2020-03-10 19:51:31 -04:00
Anuken 930c342fb6 Shader cleanup 2020-03-10 19:48:38 -04:00
Anuken 25bbce2e10 Fixed a crash 2020-03-10 15:13:28 -04:00
Anuken 9398ac5088 GL fixes 2020-03-10 12:40:24 -04:00
Anuken 860efdc052 GL Optimization 2020-03-10 12:10:53 -04:00
Anuken ade989aecb Removed Shader#end 2020-03-10 10:32:40 -04:00
Anuken 876d193379 Bugfixes 2020-03-09 11:16:57 -04:00
Anuken f63d1874c2 Merge remote-tracking branch 'origin/master' 2020-03-09 09:41:51 -04:00
Anuken d7f9090c0b Fixed #1672 2020-03-09 09:41:39 -04:00
Anuken 1dc4fd0800 FX cleanup and installation 2020-03-08 22:45:32 -04:00
Anuken 0ff3c1ee78 Cleanup 2020-03-08 21:53:19 -04:00
Anuken 863c7ae2bc Removed unit factory limit 2020-03-08 17:49:19 -04:00
Anuken 7ae0192a09 Crash fix 2020-03-08 12:12:06 -04:00
Anuken 12c4395508 Added basic respawning 2020-03-07 23:24:22 -05:00
Anuken 7aa71f38c3 Merge remote-tracking branch 'origin/master' 2020-03-07 14:36:50 -05:00
Anuken 8b3d64a29a Better error detection 2020-03-07 14:36:47 -05:00
Anuken 7b144cbec6 Attribute tweaks 2020-03-07 13:56:57 -05:00
Anuken 1e0067d64b Bugfixes 2020-03-07 10:27:29 -05:00
Anuken 7655b65363 Bugfixes / Fixed #1680 2020-03-06 17:06:21 -05:00
Anuken ae0b84cef0 Increased max block size 2020-03-06 16:31:09 -05:00
Anuken a02c7989b4 Bugfixes 2020-03-06 16:10:13 -05:00
Anuken 60d28fb01b Bugfixes 2020-03-06 16:07:07 -05:00
Anuken f8b554aff8 Fixed some basic crashes 2020-03-06 15:30:51 -05:00
Anuken 77f406e9b8 Fixed core errors 2020-03-06 15:22:13 -05:00
Anuken 4358658889 Down to less than 100 errors 2020-03-06 14:55:06 -05:00
Anuken 73c0ebb75f Fixed most errors in block package 2020-03-06 14:41:38 -05:00
Anuken 4744465986 More cleanup, nearing completion of block refactor 2020-03-06 12:19:26 -05: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
AnukenandGitHub 89a5c957fd add mod name to js print() (#1677)
* add mod name to js print()

* add mod name to errors
2020-03-05 15:58:10 -05:00
Anuken 2dfbbdfd5b Beginning work on respawning 2020-03-05 12:12:03 -05:00
Anuken 39ee31d748 Fixed #1673 2020-03-05 08:45:14 -05:00
Anuken 882076030d Added back tapping 2020-03-04 19:58:48 -05:00
Anuken c02c00cdfb Schematic tweaks and improvements 2020-03-04 19:21:40 -05:00
AnukenandGitHub 0534a4da45 Update bundle_zh_TW.properties (#1665) 2020-03-04 13:53:54 -05:00
AnukenandGitHub 31c9b61358 Updated join.info (#1666) 2020-03-04 13:53:47 -05:00
AnukenandGitHub ff44b0ca85 Small RU fix (#1670) 2020-03-04 13:53:27 -05:00
AnukenandGitHub a36a0cad53 RU updates to Android description (#1663) 2020-03-04 13:53:19 -05:00
AnukenandGitHub 0dfb3b1c1b Update achievements.vdf (#1668)
* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

Co-authored-by: Anuken <arnukren@gmail.com>
2020-03-04 13:53:12 -05:00
AnukenandGitHub c7112a706a Update bundle_uk_UA.properties (#1636)
* Update bundle_uk_UA.properties

* Update uk metadata

* Update uk bundles

* Update achievemnts
2020-03-04 13:52:20 -05:00
AnukenandGitHub 2684a960fa Create 104.4 (#1671)
* Create 104.4

* Update 104.4
2020-03-04 13:52:02 -05:00
AnukenandGitHub a5e07bfd29 Created fastlane/metadata/android/ru-RU/changelogs (#1669)
* Created fastlane/metadata/android/ru-RU/changelogs

104.4.txt

* Update 104.4.txt
2020-03-04 13:51:56 -05:00
Anuken 3eea0ea065 Bugfixes, tweaks 2020-03-04 13:48:00 -05:00
Anuken fbbec816e8 Merged in object configuration 2020-03-04 13:33:14 -05:00
Anuken cf31293d7b Many internal changes 2020-03-04 13:32:31 -05:00
Anuken c96427c722 Bugfixes 2020-03-04 09:01:41 -05:00
Anuken 503607e36a Fixed #1661 2020-03-04 08:39:48 -05:00
Anuken aeae286273 Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
# Conflicts:
#	core/src/mindustry/entities/traits/BuilderTrait.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/game/EventType.java
#	core/src/mindustry/game/Schematics.java
#	core/src/mindustry/input/InputHandler.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/world/Block.java
#	core/src/mindustry/world/blocks/distribution/Sorter.java
2020-03-04 08:38:36 -05:00
Anuken 2581353c5e Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
# Conflicts:
#	core/src/mindustry/entities/traits/BuilderTrait.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/game/EventType.java
#	core/src/mindustry/game/Schematics.java
#	core/src/mindustry/input/InputHandler.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/world/Block.java
#	core/src/mindustry/world/blocks/distribution/Sorter.java
2020-03-03 21:33:03 -05:00
Anuken 087f8129b9 Tile code cleanup 2020-03-03 19:29:41 -05:00
Anuken bac1648d4b Added support for changing cached floor/terrain 2020-03-03 17:01:09 -05:00