Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,132 Commits 4 Branches 180 Tags
54cf7812f0c9e442c150551dadb0d78760fed993
Commit Graph
17132 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
ElixiasandGitHub 9af7a864bd f (#9309) 2023-11-23 23:59:14 +00:00
Anuken 31eee11bf5 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-23 14:25:07 -05:00
Anuken d2956d1f2c ConnectFilter API now public 2023-11-23 14:24:59 -05:00
karlo292andGitHub 1feeef7aef Update servers_v7.json (#9307) 2023-11-23 13:35:26 -05:00
Anuken f5424ea59b Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-23 06:29:38 -05:00
Anuken 4076a146b1 Reject invalid tile configs 2023-11-23 06:28:57 -05:00
Hahaa13andGitHub f4741e0e59 Back back vndustry (#9297) 
* Update servers_v7.json

* Update servers_v7.json

* Back :))
 2023-11-23 06:25:36 -05:00
ElectronGitHubElectron
 		3fcaf8f916 Update servers_v7.json (#9294) 
Co-authored-by: Electron <135461023+Electorn215@users.noreply.github.com>
 2023-11-23 09:59:32 +00:00
abcxyzDustryandGitHub 726ba2af31 Update servers_v7.json (#9304) 2023-11-22 17:06:05 -05:00
112HackandGitHub 8bb6acfacb Update servers_v7.json (#9303) 2023-11-22 13:24:45 +00: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
Arksource (ShardDustry [ES]) OwnerandGitHub 0787cbbb5f Agua 3, 20% more water (#9295) 
* 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
 2023-11-18 20:54:20 -05:00
Anuken efce844e4e Merge remote-tracking branch 'origin/master' 2023-11-18 11:25:38 -05:00
Anuken 46b88092db Re-enabled mod unit tests 2023-11-18 11:25:31 -05:00
abcxyzDustryandGitHub bdbf168797 Update servers_v7.json (#9293) 2023-11-18 11:11:21 -05:00