Commit Graph
15489 Commits
Author SHA1 Message Date
Anuken 497a68e792 Merge remote-tracking branch 'origin/master' 2021-07-27 17:43:19 -04:00
Anuken 737fa4fa69 WIP launch animation progress 2021-07-27 17:43:12 -04:00
Volas171andGitHub 3d3e33912e Mindustry Reborn CAMS (update servers_v7.json) (#5651)
* CAMS

* space
2021-07-27 17:09:50 -04:00
Sunny KimandGitHub 235fee091e keep v6 mod compatibility (#5655) 2021-07-27 17:08:29 -04:00
Anuken 00e3a59463 Land animation progress / IntelliJ android plugin hack 2021-07-27 16:26:13 -04:00
Anuken 269c48b65b AmmoType refactoring 2021-07-27 12:42:50 -04:00
Anuken adbe55b0db Minor cloud bugfixes / Removed flow rate option 2021-07-27 09:08:09 -04:00
Anuken f5222674ff Unused sprite cleanup 2021-07-26 19:54:22 -04:00
Anuken c19a7e8452 New core landing animation 2021-07-26 19:29:14 -04:00
Anuken aab79a90fb Fixed #5648 2021-07-25 20:55:59 -04:00
Anuken f3b6f0a29b Fixed #5647 2021-07-25 20:17:18 -04:00
Anuken d1fb436d6d Further bridge cleanup 2021-07-25 19:55:07 -04:00
Anuken 1734d02291 Bridge code cleanup 2021-07-25 19:21:13 -04:00
Anuken f8c7739d5a Removed unitModifier flag 2021-07-25 17:17:07 -04:00
Anuken 7a1f332731 Ammo system redesign 2021-07-25 17:15:39 -04:00
Anuken 9cd19c0470 Fixed generator time not saving / 128 compat break 2021-07-25 14:35:56 -04:00
Anuken c9ca08ff1c Merge remote-tracking branch 'origin/master' 2021-07-25 12:04:52 -04:00
Anuken c14532ecae Fixed #5645 2021-07-25 12:04:17 -04:00
EnderquakeYTandGitHub b66cc8d8d7 Fixed stuff and added translation (#5440)
Fixed wave.enemy and added a translation for stat.charge
2021-07-25 09:08:16 -04:00
Anuken b6ed5fbd6f Disable keyboard option on iOS 2021-07-25 08:41:06 -04:00
Anuken 2fec2156f6 Fixed #5642 2021-07-24 23:14:28 -04:00
Anuken 35b3231b84 Merge remote-tracking branch 'origin/master' 2021-07-24 21:10:46 -04:00
Anuken f77c32cbb2 New flying unit targeting system 2021-07-24 21:10:39 -04:00
MEEP of FaithandGitHub 7ec5aa28b3 Include time in status effect draw (#5640) 2021-07-24 20:10:41 -04:00
Anuken 373d004752 Merge remote-tracking branch 'origin/master' 2021-07-24 12:48:29 -04:00
Anuken 0ee137fe05 Added hint & tooltip for derelict structures 2021-07-24 12:48:25 -04:00
buthed010203andGitHub 9c5d75c439 Typo Fix (#5639)
do
2021-07-24 10:41:01 -04:00
Anuken adbfcdf16a Reverted vault/container health buff due to "damaged" appearance in saves 2021-07-24 09:14:38 -04:00
Anuken 0716ecad55 Merge remote-tracking branch 'origin/master' 2021-07-24 08:44:47 -04:00
Anuken 9160ee546c Allow derelict block pickup / Fixed derelict blocks being targeted 2021-07-24 08:44:43 -04:00
SoMall-dumplingandGitHub 7897d2858c Update bundle_zh_CN.properties (#5530)
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Create bundle_zh_CN.properties

* Create bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

Updates the latest Navy Support Units description.

* Update bundle_zh_CN.properties

Perfectly matches.
2021-07-24 08:40:23 -04:00
Anuken b88364ab48 Fixed #5638 2021-07-24 08:36:20 -04:00
Anuken 7727da40b4 Merge remote-tracking branch 'origin/master' 2021-07-23 19:40:08 -04:00
Anuken 17e68f7a93 Fixed additive reconstructor center sprite 2021-07-23 19:39:52 -04:00
Anuken 385f493f36 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/net/CrashSender.java
	core/src/mindustry/ui/Links.java
	core/src/mindustry/ui/dialogs/SchematicsDialog.java
	core/src/mindustry/world/blocks/power/LightBlock.java
	gradle.properties
2021-07-23 17:58:02 -04:00
Anuken 120aa7c12a Cleanup 2021-07-23 17:56:13 -04:00
53214f0ddc Enable mining of sand when double click to mine is enabled (#4788)
* Sand mineable with double click to mine enabled

Since the only reason sand is un-mineable in the first place is because accidentally mining it is annoying, it should be enabled for double click to mine.

* only show sand as mineable when double click mine is enabled

Co-authored-by: Anuken <arnukren@gmail.com>
2021-07-23 15:51:26 -04:00
AnukenandGitHub d89a1fac70 Update pull_request_template.md 2021-07-23 15:50:09 -04:00
SemetrixandGitHub 0c00000910 Add a second Hungarian server (#5636) 2021-07-23 15:49:42 -04:00
buthed010203andGitHub f4f46eb924 Better plan skipping (#5634)
This prevents the plans being skipped when there is a large number of items entering the core yet the core is still starved of that item.
2021-07-23 13:45:48 -04:00
Anuken f98622fdc9 Class renaming 2021-07-23 13:18:08 -04:00
Anuken ef5c72c7f8 Fixed potential loader crash 2021-07-23 11:20:12 -04:00
Anuken b873adf5fc docs 2021-07-23 10:25:12 -04:00
Anuken ed1d02d2c2 Payload loader/unloader progress 2021-07-22 21:07:36 -04:00
Anuken bda461e480 Large constructor variant 2021-07-22 17:48:50 -04:00
Anuken d30c32eddc reorganization 2021-07-22 16:52:05 -04:00
Anuken 72fb66e5b2 Anuken/Mindustry-Suggestions/issues/2730 2021-07-22 11:21:23 -04:00
Anuken af691c980d Merge remote-tracking branch 'origin/master' 2021-07-21 21:03:30 -04:00
Anuken b3be906e28 Removed MendProjector phase coloration 2021-07-21 21:03:26 -04:00
buthed010203andGitHub 1c22e2ed28 Update StatValues.java (#5629)
Why is this number 0? The default amount should be 1, the timeperiod is already set to 0 everywhere anyways.
2021-07-21 15:50:35 -04:00