Commit Graph

426 Commits

Author SHA1 Message Date
Mythril382
7f80a1879e sound id 2024-05-27 03:35:37 +08:00
Mythril382
bc2be5de25 Delete core/src/mindustry/logic/LogicSound.java 2024-05-27 02:10:12 +08:00
Mythril382
753e992d6e slight desktop issue 2024-04-12 21:48:49 +08:00
Mythril382
74cf56d43c h 2024-04-12 14:03:32 +08:00
Mythril382
c77b866e56 much error 2024-04-12 13:58:54 +08:00
Mythril382
67fc5ba15b h 2024-04-12 13:47:58 +08:00
Mythril382
780f13be57 el ui 2024-04-12 13:02:25 +08:00
Mythril382
e9a4699c8b the ctrl+c ctrl+v is real 2024-04-12 12:36:02 +08:00
Mythril382
75106282c3 forgor 2024-04-12 12:35:32 +08:00
Mythril382
38b5ce0853 i have no idea how to do this automatically 2024-04-12 12:22:05 +08:00
Mythril382
63783a1795 why don't you do this by default 2024-04-12 12:15:32 +08:00
Mythril382
05d499fb18 bingor 2024-04-12 12:09:52 +08:00
Mythril382
03e9c861e3 Merge branch 'Anuken:master' into do-you-hear-the-voices-too 2024-04-12 11:55:10 +08:00
Redstonneur1256
e8e8189a92 Add ShapeMarker starting and ending angles (#9729) 2024-04-08 19:51:50 -04:00
Cubical box
d3a78a9d42 Fetching unit by type, build without type, and fixing a nullpointer crash (#9703)
* Pluh

* Pluh

* Update LExecutor.java

* fixed the null

* Update LExecutor.java

* I will point your null exception

* is it null or nah

* it is nah

* Update LExecutor.java

* Update LExecutor.java

* null zero
2024-04-02 10:03:14 -04:00
Anuken
a8588c38b4 Fixed #9687 2024-03-30 14:22:22 -04:00
MEEPofFaith
60c6e03d32 Weather with World Logic (#9621)
* Weather sense

Honestly, doesn't seem game changing enough to warrant privileged restriction.

* Weather set

* Rename "snow" to "snowing"

Fix conflict with the snow floor block, though I don't know if this'll have negative repercussions on saves.

* Don't last forever

* Cleanup and bundle

* add space
2024-03-14 14:25:03 -04:00
Mythril382
11f9052715 Merge branch 'Anuken:master' into do-you-hear-the-voices-too 2024-03-11 17:25:34 +08:00
Cubical box
f18a61d579 add shield to settable list (#9612) 2024-03-03 00:29:03 -05:00
Anuken
e3b24ac980 WIP logic display transform matrix support 2024-02-26 10:29:14 -05:00
Anuken
54967429fe Fixed #9566 2024-02-17 09:03:09 -05:00
Anuken
1542f7c28e UI#loadColors moved earlier in init 2024-02-10 17:20:35 -05:00
Anuken
2fd92b8c80 Processor global variable dialog 2024-02-09 18:09:41 -05:00
MEEPofFaith
e1a5484074 Allow mods to add to logic effect map (#9507)
* Allow mods to add to logic effect map

* Switch to being only a single add.
2024-02-01 19:04:51 -05:00
Redstonneur1256
6a429184aa update markers (#9506)
* update markers

* update markers & minimap rendering
2024-01-30 19:35:39 -05:00
Redstonneur1256
b9bf4ee794 Allow markers to be deleted (#9485) 2024-01-23 22:05:14 -05:00
Mythril382
57e317fa3f foror 2024-01-20 23:00:15 +08:00
Mythril382
2b0653bda2 aaaa 2024-01-20 22:59:45 +08:00
Mythril382
1edfd9b0e1 issue 2024-01-20 22:55:32 +08:00
Mythril382
eed30eb2e7 hell 2024-01-20 22:53:14 +08:00
Mythril382
2387963936 hell 2024-01-20 22:50:22 +08:00
Redstonneur1256
9d4f5ff87c Fix wait instruction inconsistency (#9479) 2024-01-20 09:37:18 -05:00
Anuken
944797f8e1 Cleared unit timeouts on reset 2024-01-15 12:59:21 -05:00
BlackDeluxeCat
931c03945d Further Fixed #7310 (#9456) 2024-01-15 12:58:36 -05:00
Anuken
1d894bdacd Objective marker cleanup & optimization 2024-01-14 12:41:20 -05:00
ApsZoldat
8ab37c5ce4 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-12-15 19:39:30 +03:00
ApsZoldat
317a533b5c millimicronanopico setmarker texture fix (object print consistency) 2023-12-13 18:24:08 +03:00
ApsZoldat
5830259e41 Markers draw code refactor, minor text marker control changes 2023-12-12 22:40:33 +03:00
BalaM314
68b06fdea6 Allow fetching unitCount by type, and buildCount without type (#9374)
* Allow fetching unitCount by type, and buildCount without type

* show in processor ui
2023-12-12 08:47:40 -05:00
ApsZoldat
4802076bf8 WIP marker changes, fix server name not appearing for saved hosts in join dialog 2023-12-10 22:44:30 +03:00
ApsZoldat
c20684025e Small git shenanigans to actually (i really hope) revert all the bad stuff 2023-12-07 18:24:51 +03: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
Anuken
2ad5e37302 Fixed #9325 2023-11-28 15:00:39 -05:00
ApsZoldat
90e40af8c1 Minor setmarker ui statement fix (farming tiny commits?) 2023-11-28 22:24:48 +03: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
120860665d Fixed #9322 2023-11-28 05:31:14 -05:00