Commit graph

14368 commits

Author SHA1 Message Date
Anuken
de50b207e5 Revert back to {0}-style format 2023-12-01 21:16:37 -05:00
ApsZoldat
862d3153d9
Map-specific locale bundles system (#9199)
* Fix text setting in marker control

* Fix marker and bridge calculation game crashes, minor marker instruction code fixes

* Add privileged desynced client constant global variables

* Remove broken attempt to not initialize client vars on server

* Make @clientLocale variable non-constant, make @server and @client privileged

* WIP Implementation of map-specific locale bundles

* Progress on map locale bundles: add locale data to saves, make objectives use map locales if possible

* Add print formatting and map locale printing to world processors

* 🗿

* Minor map locales dialog ui changes

* Make map locale bundles load when joining multiplayer server

* Remove static declaration of current locale in MapLocales to fix tests failing

* Unify name of localeprint instruction, minor instruction description change, fix map locales incorrectly loading from clipboard

* Fix locale bundles not saving in game state, add  global var, make objective markers use map locale bundles and .mobile properties on mobile devices

* Even more map locales dialog improvements

* Fix english locale picking (when property isn't presented in current locale but english version has it) not working

* Add icon pasting to map locales dialog, minor ui changes

* Fix inconsistent game crash with null text in objectives, define player.locale on game loading (for clientLocale var)

* Change format instruction placeholders to backslash, fix map locales system incorrectly handling default locale

* understood
2023-12-01 21:14:10 -05:00
MEEPofFaith
2d6e1cdf65
PointLaserBulletType support for Weapons (#9331)
* PointLaserBulletType support for Weapons

I hate adding more fields to Weapon, but oh well. It's the price to pay when the behavior of what should be spread across multiple classes is compacted into a single class.

* Fix several problems
2023-12-01 20:50:32 -05:00
Anuken
88b10f4cf8 Fixed #9336 2023-12-01 13:34:17 -05:00
Anuken
ed96b2eec8 Simplified JSON music/sound loading 2023-11-30 14:19:30 -05:00
Mythril382
5fe28254e7
Custom Launch Music for Each Planet (#8901)
* plant

* what

* literal ctrl+c ctrl+v

* more music

* issue

* feedback

* commit return
2023-11-30 14:16:44 -05:00
MEEPofFaith
9bd494504e
angleOffset is added twice in Weapon shoot (#9332) 2023-11-30 07:18:40 -05:00
router
ada2ee128b
fix typo in russian bundle (#9326) 2023-11-29 07:10:52 +00:00
Anuken
2ad5e37302 Fixed #9325 2023-11-28 15:00:39 -05:00
Anuken
120860665d Fixed #9322 2023-11-28 05:31:14 -05:00
Anuken
1a3824700a Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-27 20:48:11 -05:00
Anuken
bc308847f4 Clarify that only ASCII is supported 2023-11-27 20:47:24 -05:00
Anuken
5f06ce0bff Added draw print instruction 2023-11-27 20:37:25 -05:00
Github Actions
8db6ca8b59 Automatic bundle update 2023-11-28 01:35:56 +00:00
Anuken
d759e71edc Fixed bombers stopping when patrolling 2023-11-27 06:55:40 -05:00
Anuken
fbf8b2bff1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-23 19:04:19 -05:00
Anuken
130336bff0 arc 2023-11-23 19:04:17 -05:00
Elixias
9af7a864bd
f (#9309) 2023-11-23 23:59:14 +00:00
Anuken
d2956d1f2c ConnectFilter API now public 2023-11-23 14:24:59 -05:00
Anuken
4076a146b1 Reject invalid tile configs 2023-11-23 06:28:57 -05:00
Anuken
b189bfdf44 Closes Anuken/Mindustry-Suggestions/issues/4780 (dumping neoplasm from tanks) 2023-11-19 19:09:15 -05:00
Anuken
afc2e15c51 Fixed #9298 2023-11-19 10:55:42 -05:00
Ilya246
533c5a8afb
fix shield arc ability (#9290)
* fix shield arc ability

* Update ShieldArcAbility.java
2023-11-18 08:35:10 -05:00
Anuken
5d1ec319bc BulletType delayFrags workaround 2023-11-17 19:12:56 -05:00
Anuken
4c33eed833 RailBulletType pierceCap 2023-11-17 18:47:52 -05:00
Anuken
299457cea5 Merge remote-tracking branch 'origin/master' 2023-11-14 20:08:22 -05:00
Anuken
1a763a5db3 Beam nodes now display graph status 2023-11-14 20:08:13 -05:00
Darkness
d138aa7568
Update Blocks.java (#9278) 2023-11-14 10:27:51 -05:00
BalaM314
dd9927d72d
Correctly read item capacity in linked vaults (#9273) 2023-11-13 02:10:45 -05:00
Anuken
a836a64b5b Merge remote-tracking branch 'origin/master' 2023-11-12 21:55:21 -05:00
Anuken
06bacab710 Crash fix 2023-11-12 21:55:16 -05:00
Phinner
d2595543f9
Update French translations (#9140)
* chore: Synchronize lines

* chore: Remove empty space in bundle.properties

* chore: Translate to baguette

* Fixes for baguette language translations (#3)

* fix fpr translate to bagette language

---------

Co-authored-by: Phinner <62483793+phinner@users.noreply.github.com>

* chore: Smolchange

* chore: Apply @VizardAlpha suggestions

---------

Co-authored-by: ZetaMap <56844734+ZetaMap@users.noreply.github.com>
2023-11-12 21:19:45 -05:00
Anuken
84eb35ec83 Merge remote-tracking branch 'origin/master' 2023-11-12 09:49:12 -05:00
Anuken
8282a1e1bb Fixed #9269 2023-11-12 09:49:07 -05:00
ApsZoldat
c4dc095adb
Minor ban/unban instruction and join dialog changes (#9249)
* Make PlacementFragment update after world processor's ban/unban instructions, add buttons in community server list to add server as remote

* Small world processor ban/unban optimization
2023-11-11 09:55:01 -05:00
Anuken
9bf23bfcc8 Fixed #9260 2023-11-10 02:00:15 -05:00
Anuken
66b8a6f939 Reverted fix for #9257 2023-11-08 10:12:35 -05:00
Anuken
bc6434bb64 Merge remote-tracking branch 'origin/master' 2023-11-08 09:02:27 -05:00
Anuken
7f805f1712 Fixed #9257 2023-11-08 09:02:20 -05:00
Gerald Elder-Vass
498bf079ec
Move Surge Alloy in ErekirTechTree to the correct position (#9253)
Surge Alloy can be first obtained on the "Ravine" map.
Thorium can be first obtained on the "Caldera" map.
The "Ravine" map must be unlocked and completed before the "Caldera" map can be accessed.
Since Surge Alloy isn't required to produce Thorium (and vice versa), they should appear at the same level of the tech tree, under Tungsten.

Signed-off-by: Gerald Elder-Vass <geraldev@hotmail.co.uk>
2023-11-07 22:44:22 -05:00
Anuken
884482e9b6 Fixed #9248 2023-11-06 13:29:40 -05:00
Anuken
8f4c21799c Merge remote-tracking branch 'origin/master' 2023-11-06 08:59:40 -05:00
Anuken
c0ed5b48f7 Fixed #9247 2023-11-06 08:59:33 -05:00
PloVez
f0963ef302
Update bundle_ru.properties (#9244)
I've translated the settinG
2023-11-05 19:09:23 -05:00
Anuken
cdb6e3f85b Merge remote-tracking branch 'origin/master' 2023-11-04 17:38:56 -04:00
Anuken
6b2229ffb9 Fixed #9239 2023-11-04 17:38:50 -04:00
summoner001
24c2be4994
Update bundle_hu.properties (#9236)
Minor fixes
2023-11-04 14:00:32 -04:00
Ilya246
b4f01742cc
overdrivable meltdown (#9234) 2023-11-04 10:56:24 -04:00
ErosAa2
e02bb988c6
Slight adjusment (#9231) 2023-11-04 09:12:21 -04:00
Anuken
318ff1b5ad Merge remote-tracking branch 'origin/master' 2023-11-03 18:56:10 -04:00