Merge Experimental #952
Draft
Merge Experimental #952
+21,551
−2,152
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-Restored the cut Rocket Turret content via playlistvar `enable_rocket_turrets` -Added Nuke Ticks option via playlistvar `player_nuke_ticks`
-Fixed Intro Dropships overlapping players (it will only do if there's more players than Dropship slots, a.k.a 8 which 4 per Dropship) -Fixed CTF Spawns (unrelated to FD yes, but this branch goes experimental with everything, not just FD) -Added a Minimap/Overlay Ping functionality, players can use that by binding the "pingspot" command to a key in the console -Fixed Score miscalculation of Healing allied Titans with Batteries
ASillyNeko
reviewed
Dec 16, 2025
Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut
Outdated
Show resolved
Hide resolved
* Some changes. * Remove bot check from `PlayerHasAutoEject` * Fix dropship being targeted. * Prevent dropship from crashing the game by having children. * Have fp embark and executions work in replays. * Evil space. * Use better camera. * Mhm. * Fix compile errors. * Fix angles being set wrong on player. * Some things. * Remove this. * Fix round not ending if enemy disconnects. * Mhm. * End match if no players are connected. * Use this. * Can't kill a already killed entity. * Fix teams not switching. * Remove unused bool. * Disable being targeted by npcs. * Add it to pilot executions. * Classic executions. * Fix some bugs. * Idk. * Move drop battery.
github-actions
bot
added
the
merge conflicts
Contributor
|
Merge conflicts. |
github-actions
bot
removed
the
merge conflicts
…arMods into experimental
Contributor
|
Gonna take forever to actually get this merged 😭 |
Contributor
* Should fix classic executions. * Support npc executions. * Add check to first person anim. * camelCase. * Bleh. * Angles fix. * Fix very rare chance of player not being valid. * Fix very rare chance of player being invalid on connect. * Bleh. * Mhm. * Need this. * Hide titan battery. * Pick loadout every round. * Add globalized challenges check. * Undo wargames changes. * Uh. * :). * Use nuke skin on 3p battery. * Add `ns_` to fp convars. * Mhm. * Remove more of elite titans. * Fix compile errors. * Can't be null. * Return the reaper. * Mhm. * Fix player not using fp phase embark anim event. * Some fp things. * Use nuke skin. * Remove switching sides. * Destroy entities earlier. * Correct model? * Super peak changes. * Breaks northstar. * This line killed my family :( * Silly spaces. * *Hiss*. * Some things. * Fix wait. * Add comment to remove it later. * Revert this. * Set this to be ns default. * Use all spawn points. * Make attacker invulnerable. * Always holster weapons. * Remove no target in customservers. * Remove it from here. * Mhm. * Gotta remove this if check. * Use correct holster weapons function. * Remove player checks. * Use deploy weapons function with view model. * Readd this. * Fix some bugs and add support to disabled `run_intro`. * Free up dropship slots on player death.
github-actions
bot
added
the
merge conflicts
github-actions
bot
removed
the
merge conflicts
ASillyNeko
reviewed
Jan 3, 2026
ASillyNeko
reviewed
Jan 3, 2026
| // gamemode settings | ||
| AddPrivateMatchModeSettingEnum( "#GAMEMODE_cp", "cp_amped_capture_points", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], "1" ) // would've been nice to use amped_capture_points, but this var is already used ingame and its value is default 0 | ||
|
|
||
| AddPrivateMatchModeSettingEnum( "#GAMEMODE_coliseum", "coliseum_loadouts_#SETTING_ENABLED", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], "1" ) |
ASillyNeko
reviewed
Jan 3, 2026
| AddPrivateMatchModeSettingEnum( difficulty, "fd_pro_titan_shields", [ "#SETTING_OFF", "#SETTING_ON" ], "0" ) | ||
| AddPrivateMatchModeSettingEnum( difficulty, "fd_respawn_dropship", [ "#SETTING_OFF", "#SETTING_ON" ], "0" ) | ||
| AddPrivateMatchModeSettingArbitrary( difficulty, "fd_money_per_round", FD_MONEY_PER_ROUND.tostring() ) | ||
| AddPrivateMatchModeSettingEnum( difficulty, "fd_money_flyouts", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], "#SETTING_DISABLED" ) |
Contributor
There was a problem hiding this comment.
Should replace the default value to 0 instead of #SETTING_DISABLED
ASillyNeko
reviewed
Jan 3, 2026
|
|
||
| void function DropBatteryCommand_Init() | ||
| { | ||
| AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_RIFF", "drop_battery_command", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], "#SETTING_DISABLED" ) |
Contributor
There was a problem hiding this comment.
Should also replace this ones default value to 0 instead of #SETTING_DISABLED
ASillyNeko
reviewed
Jan 3, 2026
| AddPrivateMatchModeSettingArbitrary( "#MODE_SETTING_CATEGORY_PILOT", "pilot_health_multiplier", "1.0" ) | ||
| AddPrivateMatchModeSettingArbitrary( "#MODE_SETTING_CATEGORY_PILOT", "respawn_delay", "0.0" ) | ||
| AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_PILOT", "boosts_enabled", [ "#SETTING_DEFAULT", "#SETTING_DISABLED" ], "1" ) | ||
| AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_PILOT", "earn_meter_pilot_overdrive", [ "#SETTING_DISABLED", "#SETTING_ENABLED", "Only" ], "1" ) |
Contributor
|
What is copilot doing here? |
Contributor
Author
When you edit files in the github web editor they generate a commit message with copilot, even if you then change it copilot still gets credited for some reason |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #25
Closes #354
Closes #884
Closes #885
Closes #949