Commit Graph

6098 Commits

Author SHA1 Message Date
ApsZoldat
cf131696bd Merge remote-tracking branch 'upstream/master' 2023-12-04 22:43:59 +03:00
ApsZoldat
cf02b0f36d Make setmarker ignor null values, remove redundant marker control operations 2023-12-04 22:39:32 +03:00
Anuken
6bc01a07a6 Merge remote-tracking branch 'origin/master' 2023-12-01 21:16:43 -05:00
Anuken
de50b207e5 Revert back to {0}-style format 2023-12-01 21:16:37 -05:00
Github Actions
54cf7812f0 Automatic bundle update 2023-12-02 02:14:51 +00: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
Anuken
ed96b2eec8 Simplified JSON music/sound loading 2023-11-30 14:19:30 -05:00
router
ada2ee128b
fix typo in russian bundle (#9326) 2023-11-29 07:10:52 +00:00
ApsZoldat
557f2d4447 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-11-28 22:08:33 +03:00
ApsZoldat
02a53daa58 Marker autoscale now works outside of minimap mode, another yet lmarkercontrol instructions cleanup, fix renderer's draw color breaking after drawing markers 2023-11-28 22:00:08 +03: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
ApsZoldat
6ea2188bee Add minimap mode to other objective markers 2023-11-27 22:56:26 +03:00
Elixias
9af7a864bd
f (#9309) 2023-11-23 23:59:14 +00:00
ApsZoldat
c434e18f8f Add drawing layers to markers 2023-11-13 23:25:44 +03: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
ApsZoldat
6dff68e7d9 Texture marker implementation 2023-11-07 22:42:42 +03:00
PloVez
f0963ef302
Update bundle_ru.properties (#9244)
I've translated the settinG
2023-11-05 19:09:23 -05:00
summoner001
24c2be4994
Update bundle_hu.properties (#9236)
Minor fixes
2023-11-04 14:00:32 -04:00
summoner001
fb53ea735d
Update bundle_hu.properties (#9229)
Fix minor translation.
hint.derelict = .... updated
Ready to merge
2023-11-03 09:34:14 -04:00
summoner001
e98c112378
Update bundle_hu.properties (#9227)
The last one. Sorry! :( Ready to merge.
2023-11-02 11:45:08 -04:00
Github Actions
9eaf9ddddd Automatic bundle update 2023-11-02 15:03:05 +00:00
summoner001
e139baf858
Update bundle_hu.properties - The finishing touches (#9207)
* Update bundle_hu.properties - The finishing touches

Correction, completion and correction of errors in the Hungarian translation.

Sorry for the many commits, this is the first time I've done this.

This is the final corrections. If you find any problem, I will repair it asap.

* Update bundle_hu.properties

Filling in a missing translation

* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation

* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation

delete unnecessary spaces

* Update bundle_hu.properties

Minor fixes

* Update bundle_hu.properties

minor fixes
fixing typos

* Update bundle_hu.properties

minor fixes

* Update bundle_hu.properties

new translations

1263 - rules.derelictrepair = Allow Derelict Block Repair

Minor fixes

* Update bundle_hu.properties

more fixes

* Update bundle_hu.properties

Minor fixes

* Update bundle_hu.properties

fixes

* Update bundle_hu.properties

fixes

* Update bundle_hu.properties

fixes

* Update bundle_hu.properties

minor fixing
2023-11-02 11:02:26 -04:00
Github Actions
1cdbb562f8 Automatic bundle update 2023-11-02 12:59:20 +00:00
Ilya246
6014f2353a
foreshadow overhaul (#9223)
* overhaul foreshadow

* whar ?
2023-11-02 08:58:26 -04:00
Anuken
ad6c9a5029 Fixed basin tank doors 2023-11-01 19:13:26 -04:00
Github Actions
b0612fa33d Automatic bundle update 2023-10-31 15:25:06 +00:00
Anuken
968fa2f9b1 Derelict repair rule 2023-10-30 21:01:04 -04:00
router
f38a6ed7f5
Update bundle_ru attributions (#9205)
* Update bundle_ru attributions

i don't think anyone calls me by my old alias anymore

* Update bundle_ru.properties
2023-10-28 09:32:03 -04:00
Arksource
2bc8a25bc6
Edit bundle_es (#9198)
* Funny change

* Update servers_v7.json

* Update bundle_es.properties

Traductions for the bundle_es
By ArkSource
2023-10-27 18:36:15 -04:00
Github Actions
93c46ec2dc Automatic bundle update 2023-10-27 22:07:10 +00:00
summoner001
35742f00f1
Update bundle_hu.properties (#9203)
* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation

* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation

* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation

* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation

* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation

* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation
2023-10-27 18:06:26 -04:00
Github Actions
cdb77defb0 Automatic bundle update 2023-10-24 05:00:24 +00:00
summoner001
4745c51901
Update bundle_hu.properties (#9189)
* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation

* Update bundle_hu.properties

* Update bundle_hu.properties
2023-10-24 00:59:40 -04:00
Anuken
3229c1e7b7 Derelict block click repair 2023-10-23 11:18:01 -04:00
Github Actions
1641d50661 Automatic bundle update 2023-10-20 05:49:09 +00:00
Anuken
e391434dc9 Unit enter payload command 2023-10-20 01:48:11 -04:00
WayZer
a6d0a17bd9
PR: world-switch (#9167) 2023-10-14 09:09:59 -04:00
Joan Josep
f4bf76e3b2
Update bundle_ca.properties (#9158) 2023-10-13 09:23:14 -04:00
Anuken
1cc862d74d Fixed #9148 2023-10-09 10:04:45 -04:00
Github Actions
e2521dc47f Automatic bundle update 2023-10-02 16:01:48 +00:00
RTOmega
b046861530
TR Bundle Update (mostly by Ekozet) (#9130)
* Update bundle_tr.properties

* Update bundle_tr.properties
2023-10-02 12:00:25 -04:00
Jerzozwierz
3e53c14d86
Update bundle_pl.properties (#9127)
Fixed translations
2023-10-01 14:58:44 -04:00
Iván Cea Fontenla
4a28f73d65
Changed "perpendicular" to "ortogonal" (#9125) 2023-10-01 11:51:56 -04:00
Github Actions
198d18bac4 Automatic bundle update 2023-09-28 05:06:36 +00:00
Anuken
8bbf5b1f52 Marker instruction rework 2023-09-28 01:04:03 -04:00
Github Actions
68a5ab14be Automatic bundle update 2023-09-27 21:18:48 +00:00
ApsZoldat
8c777e79fa
Add marker instruction to world processors (#9087)
* Basic implementation of world processor marker control

* Add line marker, some marker control fixes

* Add remote for setting markers, add marker writer/reader to TypeIO

* Add sides cap to ShapeTextMarker's draw() method

* Marker instruction code refactor, revert accident auto-formatting, fix marker control bugs

* Cleanup LMarkerControl.java

* Remove deleted marker controls from MapObjectives

* Marker control method refactor, fix minimap marker rendering

* Refactor, proper double comparsion in MapObjectives

* Fix line marker's color not changing through world processors
2023-09-27 17:17:59 -04:00
Arksource
6310d54b53
Update bundle_es.properties (#9100) 2023-09-27 10:54:48 -04:00
Anuken
f63837fa4b Craters + Naval fortress wave changes 2023-09-23 16:32:01 -04:00
Anuken
0965d90bc0 Stained mountains has Scepter again 2023-09-23 15:13:28 -04:00
Github Actions
8f12bccecf Automatic bundle update 2023-09-23 16:02:54 +00:00
Anuken
d63133c720 Bindings per command/stance 2023-09-23 12:02:06 -04:00
Github Actions
a539d6277d Automatic bundle update 2023-09-22 22:33:39 +00:00
Anuken
e6bb34acf2 Merge remote-tracking branch 'origin/master' 2023-09-22 18:32:40 -04:00
Anuken
06a5201ae8 Payload stances changed to commands 2023-09-22 18:32:35 -04:00
Github Actions
c04757414f Automatic bundle update 2023-09-22 22:23:22 +00:00
Anuken
b6c28bc27d Added stances for payloads 2023-09-22 18:22:19 -04:00
Anuken
f633fb0af5 Fixed setProp x/y not teleporting on strict servers 2023-09-22 10:06:43 -04:00
Github Actions
4899b2765d Automatic bundle update 2023-09-21 16:34:07 +00:00
Anuken
1c76087930 Merge remote-tracking branch 'origin/master' 2023-09-21 12:33:15 -04:00
Anuken
78b4d366cc Closes Anuken/Mindustry-Suggestions/issues/4677 2023-09-21 12:33:09 -04:00
Github Actions
674d1bbcb6 Automatic bundle update 2023-09-21 14:41:58 +00:00
Anuken
8f0fe86366 Merge remote-tracking branch 'origin/master' 2023-09-21 10:40:52 -04:00
Anuken
8598eedd6f Keybind tweaks 2023-09-21 10:40:44 -04:00
Github Actions
64765cc4d3 Automatic bundle update 2023-09-21 13:59:23 +00:00
Anuken
36193c755f Merge remote-tracking branch 'origin/master' 2023-09-21 09:58:12 -04:00
Anuken
a6ec8f4bcc Ram stance + Mobile command queue support 2023-09-21 09:57:57 -04:00
Github Actions
6fa88cdcb0 Automatic bundle update 2023-09-21 02:46:40 +00:00
Anuken
7ce05fde7a Merge remote-tracking branch 'origin/master' 2023-09-20 22:45:51 -04:00
Anuken
9d9d5d2e18 Patrol + pursue target stances 2023-09-20 22:45:45 -04:00
Github Actions
9ac8debf7a Automatic bundle update 2023-09-21 01:56:15 +00:00
Anuken
3e15f70efa Added unit stances 2023-09-20 21:55:06 -04:00
Github Actions
815ee809b0 Automatic bundle update 2023-09-20 03:51:07 +00:00
Anuken
d7e0aea6e7 Merge remote-tracking branch 'origin/master' 2023-09-19 23:48:46 -04:00
Anuken
aecd220574 RTS Control groups 2023-09-19 23:48:40 -04:00
Github Actions
d9c9e0794d Automatic bundle update 2023-09-19 21:26:43 +00:00
Anuken
2e0c5619b1 WIP command queueing 2023-09-19 17:25:49 -04:00
Github Actions
68dd1bb2ae Automatic bundle update 2023-09-14 05:54:13 +00:00
Anuken
73e9ed4919 Implements Anuken/Mindustry-Suggestions/issues/4665 2023-09-14 01:53:09 -04:00
OpalSoPL
6b04f7eb1c
PL translation of missing texts (#9040)
* translation of most of the missing translations

* Update contributors
2023-09-09 19:34:47 -04:00
Anuken
d54f7acceb e 2023-09-04 11:29:08 -04:00
Anuken
d2de8e7880 2023-09-04 11:28:34 -04:00
Anuken
3ce71aa891 Fixed mod loading 2023-09-03 22:45:37 -04:00
Github Actions
f0e272d84c Automatic bundle update 2023-09-02 23:18:45 +00:00
Anuken
e07ab5cef6 Merge remote-tracking branch 'origin/master' 2023-09-02 11:49:41 -04:00
Anuken
2e1b4934ad Added setting to disable lighting 2023-09-02 11:49:34 -04:00
Github Actions
91964da088 Automatic bundle update 2023-09-02 13:20:23 +00:00
nullevoy
cc66ccb49f
most ability displays (#8981)
* works

* why not

* idk if that changes it but

* json

* destringening

* automatic imports and leftover marker

* uirfirf
2023-09-02 09:19:32 -04:00
Github Actions
6a53a0e7be Automatic bundle update 2023-08-30 13:06:00 +00:00
Darkness
4edf4cac25
Add language to trace info (#8990)
* Update Administration.java

* im stoopid

* Update TraceDialog.java

* Update bundle.properties
2023-08-30 09:05:05 -04:00
Github Actions
3942445d1f Automatic bundle update 2023-08-27 15:39:50 +00:00
Anuken
16223af87d Fixed #8978 2023-08-27 11:39:05 -04:00
Anuken
beeeee9169 Merge remote-tracking branch 'origin/master' 2023-08-22 10:10:15 -04:00
Anuken
207806440b Fixed #8967 2023-08-22 10:10:08 -04:00
SITUVNgcd
9d21c0173d
Update Vietnamese translation (#8959)
- Translated new strings.
- Fixed gammar issue/typo.
- Fixed strings format form (`{0}`).
2023-08-20 10:08:45 -04:00
Github Actions
161be3e8d3 Automatic bundle update 2023-08-13 15:06:41 +00:00
Anuken
2f991a85af Added logic autoPathfind command 2023-08-13 11:05:43 -04:00