Commit Graph
10961 Commits
Author SHA1 Message Date
Anuken cc689fd114 Fixed #5895 2021-08-29 10:26:39 -04:00
Anuken be5d9154a7 Merge remote-tracking branch 'origin/master' 2021-08-29 09:12:08 -04:00
Anuken bb9d7fedf7 Fixed #5894 2021-08-29 09:12:03 -04:00
Matthew PengandGitHub 71f064bda1 Shouldn't shorten() also reset the counter? (#5890) 2021-08-29 08:28:38 -04:00
Anuken e30d7e998d Allow unit icons for sectors 2021-08-28 20:49:39 -04:00
Anuken c6873a72f6 a 2021-08-28 20:46:54 -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 a3270dd908 this turned out to be pretty difficult 2021-08-28 16:29:58 -04:00
Anuken 48d568978b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/src/mindustry/entities/Damage.java
2021-08-28 14:17:29 -04:00
Anuken 9a7324ce54 Fixed #5887 2021-08-28 14:17:01 -04:00
Darkness6030andGitHub d254d971a9 Add unitSpawnEvent (#5876) 2021-08-28 10:53:19 -04:00
SMOLKEYS.exeandGitHub 800f0f4511 inconspicuous OCD goes to brazil (#5884) 2021-08-28 09:13:57 -04:00
Matthew PengandGitHub 60b2842d82 Rotator spinSpeed (#5881) 2021-08-28 08:47:11 -04:00
Matthew PengandGitHub f8c7ff0159 Damage.damage doesn't properly convert cores (#5882)
* `Damage.damage` doesn't properly convert cores

* Well that was a complete failure
2021-08-28 08:46:08 -04:00
Anuken 4d62b0321f Fixed #5885 2021-08-28 08:44:42 -04:00
Anuken 6ca2855365 Fixed RailBulletType effect length 2021-08-27 22:33:56 -04:00
Anuken ced97888e4 why 2021-08-27 21:51:37 -04:00
ZelauxandGitHub 9f68fe520b Fixed incorrect work of TextureRegion.found() when creating icons (#5879)
* Fixed incorrect work of TextureRegion.found() when creating icons

* fixed comment text

* fixed comment text
2021-08-27 11:08:04 -04:00
Anuken 8c32acbc30 Fixed #5878 2021-08-27 09:58:08 -04:00
Anuken bfc9b07651 Redundant cast cleanup 2021-08-27 09:31:18 -04:00
Anuken e53b578043 Merge remote-tracking branch 'origin/master' 2021-08-27 09:17:31 -04:00
Anuken b2ed066faa Fixed BE server not updating 2021-08-27 09:17:26 -04:00
Matthew PengandGitHub 5cc461edb0 Make hiding details optional (#5871)
* Make hiding details optional

* Sandbox blocks shouldn't have their details hidden.
2021-08-26 20:47:35 -04:00
Anuken 139d6cd5cc Proper #5872 2021-08-26 15:07:08 -04:00
Anuken c25e6b586b Allow empty maps in FileMapGenerator 2021-08-25 21:57:18 -04:00
Anuken 2b6856634c Fixed #5864 2021-08-25 13:22:19 -04:00
Anuken 9e16d7385a Implemented #5853 2021-08-25 10:09:00 -04:00
Anuken 55269846f1 Unit drown color fixes 2021-08-25 09:35:07 -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 c573fd34a1 Bullet raycast clamp 2021-08-25 09:10:59 -04:00
Anuken da7873cbd8 #5855 2021-08-25 08:49:41 -04:00
Anuken 0d27e3afdc Fixed #5856 2021-08-24 19:14:40 -04:00
Anuken bc4783e9cd Implemented #5851 properly 2021-08-24 12:45:28 -04:00
Anuken 8143cb7be0 Unit balancing 2021-08-24 12:10:44 -04:00
Anuken 8e90527609 Chat prefix empty message fix / Call.sound volume limit increase 2021-08-24 10:19:46 -04:00
Anuken 8949fd279e Build error fix / Anuken/Mindustry-Suggestions/issues/2897 2021-08-24 09:28:51 -04:00
Anuken 901d594768 Prevent server sound ear destruction / Particle effect rand param 2021-08-23 20:27:01 -04:00
Anuken 3964c8e826 Merge remote-tracking branch 'origin/master' 2021-08-23 17:41:02 -04:00
Anuken 044a124bc7 Fixed #5847 2021-08-23 17:40:58 -04:00
4f22db8db5 Updates bundle_fr.properties (#5663)
* Updates bundle_fr.properties

Final core launch animation / Added option to skip core animations

* Translation end

* Proper name/impl for "borderless windowed" on Windows

* Mod import progress bar

* WIP team icons

* Improved environmental block internal names

* Update core/assets/bundles/bundle_fr.properties

Co-authored-by: Lucien Perregaux <57545107+Luhrel@users.noreply.github.com>

* payload source and void descriptions

* Game stats cleanup

* Added max units field for wave editor

* Added max units

Co-authored-by: Lucien Perregaux <57545107+Luhrel@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
2021-08-23 16:58:31 -04:00
Anuken 80ef3cee34 Suppress gen deprecatio warning / Anuken/Mindustry-Suggestions/issues/2888 2021-08-23 15:33:28 -04:00
Anuken 254284760f Hid details of locked content 2021-08-23 15:20:56 -04:00
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
RebornTrack970andGitHub 81f25b76fd TR Fix (#5781) 2021-08-23 14:41:32 -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
Prosta4okuaandGitHub fa9573e6dc [UKR] Translation (#5810)
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
2021-08-23 12:27:17 -04:00
SharlotteandGitHub b4d19bf71b Update bundle_ko.properties (#5842) 2021-08-23 12:26:27 -04:00
YellOw139andGitHub 0f019f58bd [Bundle][RO] Update (#5839)
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 5d4ab9ecd7
- Typo fixes & various other improvements

* new button

* derelict changes
2021-08-23 12:26:15 -04:00
kitutaandGitHub 572166b157 Update bundle_ja.properties (#5813)
* Update bundle_ja.properties

Corrections to notational errors. //表記揺れの修正
Change to appropriate wording. //適切な語句への変更

* Update bundle_ja.properties

Add and remove. //追加と削除
2021-08-23 12:26:08 -04:00