Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,414 Commits 4 Branches 180 Tags
5365014d4f72ea8bf55b18e20af47c33c5f8d6b3
Commit Graph
17414 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
BnDLettandGitHub a2a690834d Add DDNS experimental server to server list (#9360) 
Added DDNS experimental server to the server list under "mindustry.ddns.net".
 2023-12-08 17:03:40 -05:00
Lifeless-DarknessandGitHub d15de9f4fc Update servers_v7.json (#9357) 2023-12-08 07:11:11 -05:00
CamoGekkoandGitHub dd5dfa6a97 Fixed an error message (#9355) 2023-12-07 12:38:12 -05:00
ApsZoldat 2b0a6a6f97 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-12-07 18:26:55 +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
Gamer-art9044andGitHub ec48733150 Update servers_v7.json (#9352) 
add a STP server to the list
 2023-12-07 07:20:14 -05:00
Anuken 45c21d60bf Merge remote-tracking branch 'origin/master' 2023-12-05 15:43:42 -05:00
Anuken 3232e97d1a Display banned status in Steam lobbies 2023-12-05 15:43:33 -05:00
Github Actions 3aa4da7ebd Automatic bundle update 2023-12-05 20:18:42 +00:00
Anuken 351c2c84f2 Fixed banned Steam users loading indefinitely 2023-12-05 15:17:55 -05:00
Anuken 91cc4f922e steamtest task destination 2023-12-05 13:57:41 -05:00
Anuken 2f9f371c88 ok buthed 2023-12-05 13:55:47 -05:00
Anuken 1df0495a2f Merge remote-tracking branch 'origin/master' 2023-12-05 13:54:54 -05:00
Anuken b3c26fac05 Fixed Steam kicking 2023-12-05 13:54:47 -05: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