1
0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-04 22:50:29 +07:00
Commit Graph

12294 Commits

Author SHA1 Message Date
Anuken
cc689fd114 Fixed 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 2021-08-29 09:12:03 -04:00
Matthew Peng
71f064bda1
Shouldn't shorten() also reset the counter? () 2021-08-29 08:28:38 -04:00
Anuken
e30d7e998d Allow unit icons for sectors 2021-08-28 20:49:39 -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 2021-08-28 14:17:01 -04:00
Darkness6030
d254d971a9
Add unitSpawnEvent () 2021-08-28 10:53:19 -04:00
SMOLKEYS.exe
800f0f4511
inconspicuous OCD goes to brazil () 2021-08-28 09:13:57 -04:00
Matthew Peng
60b2842d82
Rotator spinSpeed () 2021-08-28 08:47:11 -04:00
Matthew Peng
f8c7ff0159
Damage.damage doesn't properly convert cores ()
* `Damage.damage` doesn't properly convert cores

* Well that was a complete failure
2021-08-28 08:46:08 -04:00
Anuken
4d62b0321f Fixed 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
Zelaux
9f68fe520b
Fixed incorrect work of TextureRegion.found() when creating icons ()
* 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 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 Peng
5cc461edb0
Make hiding details optional ()
* Make hiding details optional

* Sandbox blocks shouldn't have their details hidden.
2021-08-26 20:47:35 -04:00
Anuken
9b22777dfb AGP 7.0.1 2021-08-26 15:15:29 -04:00
Anuken
3bd08bb047 Merge remote-tracking branch 'origin/master' 2021-08-26 15:07:13 -04:00
Anuken
139d6cd5cc Proper 2021-08-26 15:07:08 -04:00
RebornTrack970
309b0adb9e
Added Rush and Expansion to Omega Hub () 2021-08-26 08:33:10 -04:00
Anuken
c25e6b586b Allow empty maps in FileMapGenerator 2021-08-25 21:57:18 -04:00
Anuken
f46b22e4a7 Merge remote-tracking branch 'origin/master' 2021-08-25 13:22:23 -04:00
Anuken
2b6856634c Fixed 2021-08-25 13:22:19 -04:00
Ilya246
20305b5d36
Fix .pl BE server ()
The server is currently up and running BE
2021-08-25 13:06:19 -04:00
Anuken
9e16d7385a Implemented 2021-08-25 10:09:00 -04:00
Anuken
c573fd34a1 Bullet raycast clamp 2021-08-25 09:10:59 -04:00
Anuken
da7873cbd8 2021-08-25 08:49:41 -04:00
Anuken
a15f8131fa Merge remote-tracking branch 'origin/master' 2021-08-24 19:14:44 -04:00
Anuken
0d27e3afdc Fixed 2021-08-24 19:14:40 -04:00
Leonid Skorospelov
bdcae408e6
Added 2v2, 3v3 ranked gamemode servers to v6 () 2021-08-24 17:45:14 -04:00
Anuken
bc4783e9cd Implemented 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 2021-08-23 17:40:58 -04:00
VizardAlpha
4f22db8db5
Updates bundle_fr.properties ()
* 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 2021-08-23 14:47:11 -04:00
RebornTrack970
81f25b76fd
TR Fix () 2021-08-23 14:41:32 -04:00
Take
649c6ddfb3
Japanese Translation (Steam, Android description & Achivements) ()
* copy English achivement and description file to Japanese folder

* Translate Gameplay, Campaign

* Translate steam achievements

* Translate Gamemodes, Custom&Multiplayer, Editor

* Translate Android desctiption

* Create summary.txt

* remove the sentence to recommend to share in steam workshop

* fix: 個 → 種類

* minor translation change
2021-08-23 14:36:34 -04:00
SoMall-dumpling
3bd3d3aa37
Avoid ambiguity ()
* 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