Commit Graph
17151 Commits
Author SHA1 Message Date
ApsZoldat c20684025e Small git shenanigans to actually (i really hope) revert all the bad stuff 2023-12-07 18:24:51 +03:00
ApsZoldat adada50f1c Minor map locales dialog fixes 2023-12-04 23:33:23 +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
OSPandGitHub 5d4d904ef9 Darkdustry reborn. Again. (#9346) 2023-12-04 10:35:37 -05:00
The1CruxandGitHub a0dc08aaca Update servers_v7.json (#9345)
new slots
2023-12-04 06:44:17 -05:00
Anuken fdfb79477b Merge remote-tracking branch 'origin/master' 2023-12-02 20:04:53 -05:00
Anuken c353163c34 Fixed #9342 2023-12-02 20:04:34 -05:00
112HackandGitHub c63e853f8b Update servers_v7.json (#9338) 2023-12-02 10:48:07 -05: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
ApsZoldatandGitHub 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
MEEPofFaithandGitHub 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 9307cd74ef Merge remote-tracking branch 'origin/master' 2023-12-01 13:34:24 -05:00
Anuken 88b10f4cf8 Fixed #9336 2023-12-01 13:34:17 -05:00
Redstonneur1256andGitHub af36f5fd6d Update servers_v7.json (#9333) 2023-11-30 15:56:57 -05:00
Anuken ed96b2eec8 Simplified JSON music/sound loading 2023-11-30 14:19:30 -05:00
Mythril382andGitHub 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
NazrinNyaandGitHub 0afed49b7c IP change of cyandustry (#9312)
* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json
2023-11-30 10:17:09 -05:00
alexandGitHub 0271089211 Update servers_v7.json for alex mindustry (#9330) 2023-11-30 07:18:59 -05:00
MEEPofFaithandGitHub 9bd494504e angleOffset is added twice in Weapon shoot (#9332) 2023-11-30 07:18:40 -05:00
abcxyzDustryandGitHub 871209d880 Update servers_v7.json (#9329) 2023-11-29 19:29:52 -05:00
routerandGitHub 08758ec29c Clean up 0.baseduser.eu.org (servers_v7.json) (#9328) 2023-11-29 15:01:41 -05:00
routerandGitHub ada2ee128b fix typo in russian bundle (#9326) 2023-11-29 07:10:52 +00:00
OSPandGitHub 45aee7d582 Darkdustry reborn (#9324) 2023-11-28 22:35:49 +00:00
Anuken f57d6a7ede Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-28 15:02:31 -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 20b2be5de8 "i forgor" fix 2023-11-28 22:19:08 +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
Arksource (ShardDustry [ES]) OwnerandGitHub 6543c41bde Agua en HD (#9323)
* Funny change

* Update servers_v7.json

* Update bundle_es.properties

Traductions for the bundle_es
By ArkSource

* Update servers_v7.json

* Agua prt 2

* Update servers_v7.json

* Update servers_v7.json

* Agua 2-3
2023-11-28 05:29:04 -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 e1ffc4ed62 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-27 20:38:02 -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
The1CruxandGitHub 0469bb5ce5 Update servers_v7.json (#9321)
last servers exploded 💀
2023-11-27 17:40:13 -05:00
ApsZoldat 6ea2188bee Add minimap mode to other objective markers 2023-11-27 22:56:26 +03:00
alexandGitHub a0c4b0e431 Update servers_v7.json (#9319)
add more servers
2023-11-27 14:06:29 +00:00
Anuken 8bace60059 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-27 06:57:01 -05:00
Anuken d759e71edc Fixed bombers stopping when patrolling 2023-11-27 06:55:40 -05:00
AnukenandGitHub 44f7c726b5 Revert #9294 2023-11-27 06:05:57 -05:00
OSPandGitHub 8d04a6820d Update servers_v7.json (#9318) 2023-11-27 09:51:47 +00:00
abcxyzDustryandGitHub f9d39ad31a Update servers_v7.json (#9315) 2023-11-25 12:54:05 -05:00
TheRadioactiveBananaandGitHub 589b8d9d37 Eradication Mindustry Merge (#9310)
Anuke finally gave the go ahead
2023-11-24 02:46:19 -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