Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,161 Commits 4 Branches 180 Tags
a3f8ca9ca573d8ff40e84bbac1562d4a416bd535
Commit Graph
1371 Commits
Author SHA1 Message Date
Anuken 6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken 082edbff6f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	tools/src/mindustry/tools/Generators.java
 2021-10-14 19:15:59 -04:00
Anuken ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
Anuken 4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Anuken d2ec511ede Bundle things 2021-10-13 09:53:52 -04:00
Anuken 44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00
SoMall-dumplingandGitHub 55537f09dc Torpedos->Torpedoes (#6113) 
Typo, yes.
 2021-10-07 09:32:24 -04:00
Anuken 10b8a6e4a5 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
 2021-10-01 09:41:33 -04:00
Anuken b265ddac03 Don't suggest changing the mod disable option 2021-10-01 09:28:23 -04:00
Anuken 5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
 2021-09-28 18:45:09 -04:00
SoMall-dumplingandGitHub 30e6bb2625 Retusa Description Change (#6061) 
Now that Retusa has been remaked, the description needs to be changed too.
 2021-09-27 19:11:48 -04:00
TranquillyUnpleasantandGitHub dbd31b9031 Cryo tiles (#6054) 
* Cryo tile

* tile name

* Shader

* Icon and property
 2021-09-27 14:46:28 -04:00
TranquillyUnpleasantandGitHub bf89ef1e5e Map search (#6004) 
* Map search

* Fix format

* check and continue

* icons and style

* grow pane so search bar doesnt move

* Inline focusing

* Use boolean instead of checking size
 2021-09-27 11:33:12 -04:00
Anuken ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
Anuken caa34c959e More campaign map progress 2021-09-10 17:07:06 -04:00
Anuken 2222330b43 Added hint for high threat level sector 2021-09-08 11:23:37 -04:00
Matthew PengandGitHub d257adf0c1 Show All (#5954) 2021-09-07 15:20:59 -04:00
TranquillyUnpleasantandGitHub 34d2a0d3a0 Hide all button for units (#5953) 
* Hide all button for units

* Add bundle property
 2021-09-07 13:38:43 -04:00
Anuken 4da21ba363 Added cliff support to editor 2021-09-05 20:08:02 -04:00
Anuken 393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
 2021-09-04 23:12:28 -04:00
Anuken 24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
Anuken ed1d4414a0 Payload conveyors are magnetic 2021-09-04 12:27:15 -04:00
Anuken 259d0baeb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-28 16:30:07 -04:00
Anuken 9e16d7385a Implemented #5853 2021-08-25 10:09:00 -04:00
Anuken 26dd7e00eb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/UnitTypes.java
 2021-08-25 09:22:23 -04:00
Anuken 254284760f Hid details of locked content 2021-08-23 15:20:56 -04:00
SoMall-dumplingandGitHub 3bd3d3aa37 Avoid ambiguity (#5809) 
* Avoid ambiguity

When you see 'boost: 150%'
It can be 'increase the speed to 150%' or 'increase the speed to 250%'.
Maybe you will say that the colon has already avoided this ambiguity.
But you know there's always someone who ignores those things, and also translating 'boost' is hard with no 'x' to avoid ambiguity.
With a 'x', it will show 'Boost: x150%', which will never be thought as 250%.

* Update OverdriveProjector.java

When power is low, show 'low power: -{0}%';
When power is high, show 'boost: +{0}%'.

* Update bundle.properties

* Update bundle.properties

* Update OverdriveProjector.java

bugfix（perhaps）

* Update OverdriveProjector.java

what if

* Update OverdriveProjector.java

InTeReStInG

* Update OverdriveProjector.java

back to the past

* Update OverdriveProjector.java

Now using Math.max.

* Update bundle_bg.properties

* Update bundle_de.properties

* Update bundle_fr.properties

* Update bundle_hu.properties

* Update bundle_in_ID.properties

* Update bundle_ja.properties

* Update bundle_ko.properties

* Update bundle_pl.properties

* Update bundle_ro.properties

* Update bundle_ru.properties

* Update bundle_th.properties

* Update bundle_uk_UA.properties

* Update bundle_vi.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_TW.properties

* Update OverdriveProjector.java

Maybe this is necessary.

* Update OverdriveProjector.java

The stats are '+50%' ,etc. now.

* Update OverdriveProjector.java

Necessary, because the previous one is strange.
2.5 does not make sense. 12.5 does.
 2021-08-23 12:37:34 -04:00
Anuken 006c796da7 Added database button in menu 2021-08-23 10:03:26 -04:00
Anuken 946bba63d0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-19 23:52:06 -04:00
Anuken 5d4ab9ecd7 Added max units field for wave editor 2021-08-19 23:26:39 -04:00
Anuken ba48373bbc Game stats cleanup 2021-08-18 16:39:20 -04:00
Anuken f3cacb9e99 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-18 15:04:30 -04:00
Sunny KimandGitHub d1271f3e4b Boss (Guardian) Status Sprite (#5773) 
* boss status

* almost forgot

* Update bundle_ko.properties
 2021-08-17 18:00:00 -04:00
JrTRinnyandGitHub 59456b67a1 payload source and void descriptions (#5778) 2021-08-16 08:22:03 -04:00
Anuken 2200a44653 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-13 10:08:34 -04:00
Anuken 1b0de739f9 Sector info list / Minor hint fixes 2021-08-12 22:16:13 -04:00
Anuken a5fe8970c6 Per-team AI settings / Errors for missing player cores 2021-08-12 09:24:20 -04:00
Anuken 1cf2bd4892 Team-specific rules / Player+Enemy team rules 2021-08-11 23:36:06 -04:00
Anuken e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
 2021-08-10 15:15:07 -04:00
Anuken 7e047ef726 Stone craters name fix 2021-08-09 12:13:07 -04:00
Anuken b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Anuken 4fa04b9e23 Bannable units / Show tech tree icon for unresearched units 2021-08-05 23:01:58 -04:00
Anuken 79bf77f4be WIP team icons 2021-07-31 18:23:22 -04:00
Anuken 1d257c1a35 Mod import progress bar 2021-07-31 10:58:09 -04:00
Anuken a7cc6185ad Proper name/impl for "borderless windowed" on Windows 2021-07-30 14:27:46 -04:00
Anuken d855840fe2 Fixed #5672 2021-07-30 13:05:12 -04:00
Anuken 5ca5025fb1 Final core launch animation / Added option to skip core animations 2021-07-27 19:02:04 -04:00
Anuken adbe55b0db Minor cloud bugfixes / Removed flow rate option 2021-07-27 09:08:09 -04:00
Anuken c14532ecae Fixed #5645 2021-07-25 12:04:17 -04:00
Anuken 0ee137fe05 Added hint & tooltip for derelict structures 2021-07-24 12:48:25 -04:00