Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,039 Commits 4 Branches 180 Tags
9797026a41ebdecf61ba17a29727bb6af5e5dc77
Commit Graph

1487 Commits

Author SHA1 Message Date
ApsZoldat
2b0a6a6f97 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-12-07 18:26:55 +03:00
Anuken
351c2c84f2 Fixed banned Steam users loading indefinitely 2023-12-05 15:17:55 -05:00
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
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
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
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
ApsZoldat
6ea2188bee Add minimap mode to other objective markers 2023-11-27 22:56:26 +03: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
Ilya246
6014f2353a foreshadow overhaul (#9223) 
* overhaul foreshadow

* whar ?
 2023-11-02 08:58:26 -04:00
Anuken
968fa2f9b1 Derelict repair rule 2023-10-30 21:01:04 -04:00
Anuken
3229c1e7b7 Derelict block click repair 2023-10-23 11:18:01 -04:00
Anuken
e391434dc9 Unit enter payload command 2023-10-20 01:48:11 -04:00
Anuken
8bbf5b1f52 Marker instruction rework 2023-09-28 01:04:03 -04: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
Anuken
d63133c720 Bindings per command/stance 2023-09-23 12:02:06 -04:00
Anuken
06a5201ae8 Payload stances changed to commands 2023-09-22 18:32:35 -04: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
Anuken
78b4d366cc Closes Anuken/Mindustry-Suggestions/issues/4677 2023-09-21 12:33:09 -04:00
Anuken
8598eedd6f Keybind tweaks 2023-09-21 10:40:44 -04:00
Anuken
a6ec8f4bcc Ram stance + Mobile command queue support 2023-09-21 09:57:57 -04:00
Anuken
9d9d5d2e18 Patrol + pursue target stances 2023-09-20 22:45:45 -04:00
Anuken
3e15f70efa Added unit stances 2023-09-20 21:55:06 -04:00
Anuken
aecd220574 RTS Control groups 2023-09-19 23:48:40 -04:00
Anuken
2e0c5619b1 WIP command queueing 2023-09-19 17:25:49 -04:00
Anuken
73e9ed4919 Implements Anuken/Mindustry-Suggestions/issues/4665 2023-09-14 01:53:09 -04: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
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
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
Anuken
16223af87d Fixed #8978 2023-08-27 11:39:05 -04:00
Anuken
207806440b Fixed #8967 2023-08-22 10:10:08 -04:00
Anuken
2f991a85af Added logic autoPathfind command 2023-08-13 11:05:43 -04:00
Anuken
fb4787ba52 Closes Anuken/Mindustry-Suggestions/issues/4608 2023-08-11 12:16:40 -04:00
Anuken
bc42b5a91e Fixed #8893 2023-08-04 10:59:33 -04:00
Anuken
6bf5e8ae1e WIP logic particle effect instruction 2023-08-02 22:15:44 -04:00
Anuken
6ed336ad95 Misc fixes 2023-06-17 17:40:29 -04:00
Anuken
017aa71da8 Merge remote-tracking branch 'origin/master' 2023-06-16 13:19:57 -04:00
Anuken
58cd1852f1 Conduit junction replacement fix 2023-06-16 13:19:52 -04:00
Даркнесс#3729
4e5475f0ed Team improvements (#8704) 
* Update Team.java

* Update ServerControl.java

* better

* kill me please

* kill me please

* kill me please

* Update bundle_ca.properties

* kill me please

* Update bundle_da.properties

* kill me please

* kill me please

* Update bundle_et.properties

* Update bundle_eu.properties

* Update bundle_fi.properties

* Update bundle_fil.properties

* Update bundle_fr.properties

* Update bundle_hu.properties

* Update bundle_id_ID.properties

* Update bundle_ja.properties

* Update bundle_ko.properties

* Update bundle_lt.properties

* Update bundle_nl.properties

* Update bundle_nl_BE.properties

* Update bundle_pl.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_PT.properties

* Update bundle_ro.properties

* Update bundle_ru.properties

* Update bundle_sr.properties

* Update bundle_sv.properties

* Update bundle_th.properties

* Update bundle_tr.properties

* Update bundle_tk.properties

* Update bundle_uk_UA.properties

* Update bundle_vi.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_TW.properties

* Update World.java

* Update CustomRulesDialog.java

* skill issue

* skill issue x2

* skill issue x3
 2023-06-13 18:54:10 -04:00
Anuken
0006291631 e 2023-06-12 00:03:41 -04:00
Anuken
4b0824a20c Admin player team switch + more trace info 2023-06-11 23:18:04 -04:00
Даркнесс#3729
ebe965ef40 Better votekick reason input (#8673) 
* Update bundle.properties

* Update PlayerListFragment.java

* Update bundle.properties

* Update bundle.properties
 2023-06-04 20:50:48 -04:00
Alex Gusev
32c146cdf1 Adapt interface to display notch of mac laptops (#8666) 
* Adapt interface to display notch of mac laptops

* `macNotchHeight` as a separate variable, and description for mac notch setting
 2023-06-04 12:43:07 -04:00