Commit Graph

8259 Commits

Author SHA1 Message Date
Anuken
71ee7558ab Merge remote-tracking branch 'origin/master' 2021-08-23 14:47:16 -04:00
Anuken
5f4a3e341f #5785 2021-08-23 14:47:11 -04:00
SoMall-dumpling
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
b52d645459 #5837 2021-08-23 12:04:54 -04:00
Anuken
006c796da7 Added database button in menu 2021-08-23 10:03:26 -04:00
Anuken
160fdee596 Consistent tile attribute display 2021-08-23 09:12:36 -04:00
Anuken
542412bbe0 ech 2021-08-23 09:11:58 -04:00
Anuken
dd8279bab3 Crawl progress 2021-08-22 20:25:46 -04:00
Anuken
5e737510a3 Leg collision bugfixes 2021-08-22 18:48:12 -04:00
Anuken
6388e8da56 More drown tweaks 2021-08-22 16:01:49 -04:00
Anuken
2ef9cfdad6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/entities/comp/FlyingComp.java
2021-08-22 15:53:33 -04:00
Anuken
5cc50b0ff3 Fixed floorSpeedMultiplier being squared 2021-08-22 15:53:07 -04:00
Anuken
502816d210 New mech drowning algorithm 2021-08-22 15:41:03 -04:00
Anuken
0a0ec12e6c Allow logic itemDrop to @air 2021-08-22 11:43:14 -04:00
Anuken
4e12289eaa progress 2021-08-22 11:40:38 -04:00
Anuken
4af101bf7d Drownable legged units 2021-08-22 11:06:25 -04:00
Anuken
9c826a5fdd Merge remote-tracking branch 'origin/master' 2021-08-22 10:21:24 -04:00
Anuken
50d01ef6f8 FlyingComp cleanup 2021-08-22 10:21:20 -04:00
Anuken
1d46fb5425 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-22 09:52:19 -04:00
Matthew Peng
b860b2bbfb Don't show core ghosts (#5834) 2021-08-22 09:45:17 -04:00
JrTRinny
7773a3b17b let payload source/void replace each other (#5835) 2021-08-22 09:45:05 -04:00
Anuken
c605418e33 public Setting constructor 2021-08-22 09:40:55 -04:00
Anuken
55270996ff Cleanup 2021-08-22 00:36:25 -04:00
Anuken
466118319f Fixed naval units with canBoost = true 2021-08-22 00:35:40 -04:00
Anuken
b98395c8ba progress 2021-08-22 00:30:15 -04:00
Anuken
b2aaca45d5 progress 2021-08-21 18:35:27 -04:00
Anuken
7afc6d3631 CrawlComp progress 2021-08-21 15:32:25 -04:00
Anuken
f85c078de8 PR cleanup 2021-08-21 11:34:05 -04:00
Matthew Peng
9cc08ada22 Heal Targetting on Turrets (#5820)
* Heal Targetting on Turrets

* Just in case
2021-08-21 11:33:20 -04:00
Sunny Kim
ec1afdfdc4 Hidden blocks only in the Placement UI (#5806)
* placeablePlayer

* placeablePlayer unlocked
2021-08-21 11:29:16 -04:00
Anuken
a6c8b3a2bd Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-21 10:15:44 -04:00
Anuken
92d3d3cd9c Fixed #5824 2021-08-21 09:54:05 -04:00
Anuken
ec61598a52 Minke ability moved to Oxynoe 2021-08-20 23:04:43 -04:00
Anuken
8b4112f705 Check for repo & display name in mod browser search 2021-08-20 13:35:41 -04:00
Anuken
caeabe3ee8 Cleanup 2021-08-20 12:28:05 -04:00
Anuken
8f389665a1 Space 'puddles' 2021-08-20 11:42:27 -04:00
Anuken
e5c77ef69a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-20 11:10:55 -04:00
Anuken
f0a8c6e281 Oyxgen env 2021-08-20 10:06:16 -04:00
Anuken
465afc3128 Sound fixes 2021-08-20 08:54:02 -04:00
Anuken
cd7103e3f4 Cryo vapor 2021-08-20 00:15:47 -04:00
Anuken
5ddb22ab61 Various minor tweaks 2021-08-20 00:05:08 -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
3a3622bb58 Boss status color fix 2021-08-19 23:42:27 -04:00
Anuken
38ec05807a Disallow logic-building invalid blocks 2021-08-19 23:32:21 -04:00
Anuken
5d4ab9ecd7 Added max units field for wave editor 2021-08-19 23:26:39 -04:00
Anuken
efb4a643e4 Liquid container tweak 2021-08-19 22:26:54 -04:00
Anuken
148c95e1f2 Crash fix 2021-08-19 22:03:19 -04:00
Anuken
9e9cd213f3 Liquid container 2021-08-19 21:48:18 -04:00
Anuken
0ab5f5bb14 hide hidden units in menu 2021-08-19 21:29:50 -04:00
Anuken
f1207fd3f1 Disposable containers for unloaders 2021-08-19 20:45:48 -04:00