]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
23 months agoUpdate gameplay hash
Mario [Sun, 27 Nov 2022 13:42:10 +0000 (23:42 +1000)]
Update gameplay hash

23 months agoMerge branch 'pending-release' into Mario/team_keepaway
Mario [Sat, 26 Nov 2022 14:11:19 +0000 (00:11 +1000)]
Merge branch 'pending-release' into Mario/team_keepaway

23 months agoMerge branch 'master' into Mario/team_keepaway
Mario [Sat, 26 Nov 2022 14:10:20 +0000 (00:10 +1000)]
Merge branch 'master' into Mario/team_keepaway

23 months agoTransifex autosync
Rudolf Polzer [Wed, 23 Nov 2022 06:23:36 +0000 (07:23 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Tue, 22 Nov 2022 06:23:38 +0000 (07:23 +0100)]
Transifex autosync

23 months agoMerge branch 'bones_was_here/sandbox_object_fix' into 'master'
terencehill [Mon, 21 Nov 2022 07:55:22 +0000 (07:55 +0000)]
Merge branch 'bones_was_here/sandbox_object_fix' into 'master'

Work around float precision problems with scaled model bboxes

Closes #2742

See merge request xonotic/xonotic-data.pk3dir!1078

23 months agoTransifex autosync
Rudolf Polzer [Mon, 21 Nov 2022 06:23:35 +0000 (07:23 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Sun, 20 Nov 2022 06:24:12 +0000 (07:24 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Sat, 19 Nov 2022 06:23:39 +0000 (07:23 +0100)]
Transifex autosync

23 months agoMerge branch 'terencehill/blocking_mover_fix' into 'master'
bones_was_here [Fri, 18 Nov 2022 07:15:03 +0000 (07:15 +0000)]
Merge branch 'terencehill/blocking_mover_fix' into 'master'

Fix #2744 "Blocking of bmodel movers is broken"

Closes #2744

See merge request xonotic/xonotic-data.pk3dir!1092

23 months agoTransifex autosync
Rudolf Polzer [Tue, 15 Nov 2022 06:23:44 +0000 (07:23 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 14 Nov 2022 06:23:37 +0000 (07:23 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sun, 13 Nov 2022 06:24:19 +0000 (07:24 +0100)]
Transifex autosync

2 years agoForcedly stop player movement too when opening the scoreboard team selection
terencehill [Wed, 9 Nov 2022 18:47:12 +0000 (19:47 +0100)]
Forcedly stop player movement too when opening the scoreboard team selection

2 years agoFix #2674 "Voting screens in demos respond visually to client cursor making them...
terencehill [Wed, 9 Nov 2022 18:39:38 +0000 (19:39 +0100)]
Fix #2674 "Voting screens in demos respond visually to client cursor making them confusing"

2 years agoTeam radar: make teammate arrow icon rotation smoother
terencehill [Tue, 8 Nov 2022 14:09:24 +0000 (15:09 +0100)]
Team radar: make teammate arrow icon rotation smoother

2 years agoMenu: Improve wording of some fraglimit sliders
terencehill [Tue, 8 Nov 2022 14:00:53 +0000 (15:00 +0100)]
Menu: Improve wording of some fraglimit sliders

2 years agosv_q3compat_changehitbox: change the values to exactly match the Q3 sources
bones_was_here [Mon, 7 Nov 2022 13:44:27 +0000 (23:44 +1000)]
sv_q3compat_changehitbox: change the values to exactly match the Q3 sources

The box dimensions and camera position relative to the box are unchanged.
The origin is raised 4u relative to the box and camera.

2 years agoMany whitespace fixes
bones_was_here [Mon, 7 Nov 2022 13:43:09 +0000 (23:43 +1000)]
Many whitespace fixes

2 years agoTransifex autosync
Rudolf Polzer [Mon, 7 Nov 2022 06:23:54 +0000 (07:23 +0100)]
Transifex autosync

2 years agoFix #2744 "Blocking of bmodel movers is broken"
terencehill [Sat, 5 Nov 2022 17:40:53 +0000 (18:40 +0100)]
Fix #2744 "Blocking of bmodel movers is broken"

2 years agoDon't link mover controllers to the world, should improve performance a little
terencehill [Sat, 5 Nov 2022 17:33:50 +0000 (18:33 +0100)]
Don't link mover controllers to the world, should improve performance a little

2 years agoTransifex autosync
Rudolf Polzer [Thu, 3 Nov 2022 06:23:48 +0000 (07:23 +0100)]
Transifex autosync

2 years agoDomination: immediately set domination_teams as a team mask if teams are overridden...
terencehill [Wed, 2 Nov 2022 14:49:23 +0000 (15:49 +0100)]
Domination: immediately set domination_teams as a team mask if teams are overridden to avoid wasting a TeamBalance_GetAllowedTeams call to update domination_teams

2 years agoDomination: fix domination percentage on the HUD not reset for spectators when the...
terencehill [Wed, 2 Nov 2022 14:44:33 +0000 (15:44 +0100)]
Domination: fix domination percentage on the HUD not reset for spectators when the warmup ends

2 years agoTransifex autosync
Rudolf Polzer [Wed, 2 Nov 2022 06:23:41 +0000 (07:23 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 31 Oct 2022 06:23:48 +0000 (07:23 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sun, 30 Oct 2022 06:24:17 +0000 (07:24 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Fri, 28 Oct 2022 05:23:44 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Wed, 26 Oct 2022 05:23:46 +0000 (07:23 +0200)]
Transifex autosync

2 years agoWork around float precision problems with scaled model-based bboxes
bones_was_here [Sun, 2 Oct 2022 22:05:54 +0000 (08:05 +1000)]
Work around float precision problems with scaled model-based bboxes

Fixes #2742

2 years agoTransifex autosync
Rudolf Polzer [Tue, 25 Oct 2022 05:23:42 +0000 (07:23 +0200)]
Transifex autosync

2 years agoDon't disable sv_gameplayfix_unstickplayers in Xonotic's configuration as the default...
Mario [Sat, 22 Oct 2022 01:16:40 +0000 (11:16 +1000)]
Don't disable sv_gameplayfix_unstickplayers in Xonotic's configuration as the default is enabled, fixes #2746 but undoes #2740

2 years agoTransifex autosync
Rudolf Polzer [Fri, 21 Oct 2022 05:23:44 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Thu, 20 Oct 2022 05:24:01 +0000 (07:24 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Wed, 19 Oct 2022 05:23:49 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Tue, 18 Oct 2022 05:23:44 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'terencehill/player_sorting' into 'master'
terencehill [Sun, 16 Oct 2022 21:28:09 +0000 (21:28 +0000)]
Merge branch 'terencehill/player_sorting' into 'master'

Fix mismatching player sorting between server and client

See merge request xonotic/xonotic-data.pk3dir!1026

2 years agoUpdate hash
terencehill [Sun, 16 Oct 2022 21:17:42 +0000 (23:17 +0200)]
Update hash

2 years agoMerge branch 'master' into terencehill/player_sorting
terencehill [Sun, 16 Oct 2022 21:07:33 +0000 (23:07 +0200)]
Merge branch 'master' into terencehill/player_sorting

# Conflicts:
# .gitlab-ci.yml

2 years agoMerge branch 'drjaska/ctsdamagestats' into 'master'
terencehill [Sun, 16 Oct 2022 20:56:03 +0000 (20:56 +0000)]
Merge branch 'drjaska/ctsdamagestats' into 'master'

Disable CTS recording damage taken(/dealt) to scores

See merge request xonotic/xonotic-data.pk3dir!1025

2 years agoForbid CTS from adding player damage dealt or taken to scorefields as its meaningless...
Dr. Jaska [Sun, 16 Oct 2022 20:56:03 +0000 (20:56 +0000)]
Forbid CTS from adding player damage dealt or taken to scorefields as its meaningless and those scoreboardfields are not even shown by default.

2 years agoMerge branch 'drjaska/ca-less-stalemates' into 'master'
terencehill [Sun, 16 Oct 2022 19:53:24 +0000 (19:53 +0000)]
Merge branch 'drjaska/ca-less-stalemates' into 'master'

New opt-in feature for less stalemates in CA when round timer runs out

See merge request xonotic/xonotic-data.pk3dir!1068

2 years agoNew opt-in feature for less stalemates in CA when round timer runs out
Dr. Jaska [Sun, 16 Oct 2022 19:53:24 +0000 (19:53 +0000)]
New opt-in feature for less stalemates in CA when round timer runs out
New cvar: `g_ca_prevent_stalemate 0|1`
First the amount of players alive in each team is checked, if there is a single highest then that team wins the round.
If two teams have the same amount of players then their total health counts are calculated and compared.
If there is the same amount of players and total health in the 2 top teams then it's still a stalemate.

Code cleanup by z411

2 years agoMerge branch 'terencehill/bot_ai' into 'master'
terencehill [Sun, 16 Oct 2022 15:38:34 +0000 (15:38 +0000)]
Merge branch 'terencehill/bot_ai' into 'master'

Bot aim improvements

See merge request xonotic/xonotic-data.pk3dir!1063

2 years agoTransifex autosync
Rudolf Polzer [Sun, 16 Oct 2022 05:24:21 +0000 (07:24 +0200)]
Transifex autosync

2 years agoRevert "Revert "Merge branch 'Mario/ctf_colormaps' into 'master'" because it breaks...
terencehill [Sat, 15 Oct 2022 10:17:59 +0000 (12:17 +0200)]
Revert "Revert "Merge branch 'Mario/ctf_colormaps' into 'master'" because it breaks backwards-compatibility. It will be merged back when we are close to a release."

This reverts commit b299b9bcb82c12791406f3540305919414d745a7.

2 years agoRevert "Merge branch 'Mario/ctf_colormaps' into 'master'" because it breaks backwards...
terencehill [Sat, 15 Oct 2022 10:08:45 +0000 (12:08 +0200)]
Revert "Merge branch 'Mario/ctf_colormaps' into 'master'" because it breaks backwards-compatibility. It will be merged back when we are close to a release.

This reverts commit 07bbfa46e816c94bd63a2af533c4a2a31e0078a5, reversing
changes made to 0db0001bd383b6d57f9583120d0868feb70290e7.

2 years agoTransifex autosync
Rudolf Polzer [Sat, 15 Oct 2022 05:23:47 +0000 (07:23 +0200)]
Transifex autosync

2 years agoProperly set serverflags's flags
terencehill [Fri, 14 Oct 2022 20:52:52 +0000 (22:52 +0200)]
Properly set serverflags's flags

2 years agoTransifex autosync
Rudolf Polzer [Thu, 13 Oct 2022 05:23:46 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'Mario/q3compat_sanity' into 'master'
bones_was_here [Wed, 12 Oct 2022 07:38:38 +0000 (07:38 +0000)]
Merge branch 'Mario/q3compat_sanity' into 'master'

Merge branch Mario/q3compat_sanity (M merge request)

Closes #2281

See merge request xonotic/xonotic-data.pk3dir!856

2 years agoTransifex autosync
Rudolf Polzer [Wed, 12 Oct 2022 05:23:49 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'Mario/qc_droptofloor' into 'master'
Mario [Tue, 11 Oct 2022 11:04:09 +0000 (11:04 +0000)]
Merge branch 'Mario/qc_droptofloor' into 'master'

Merge branch Mario/qc_droptofloor (XS merge request)

See merge request xonotic/xonotic-data.pk3dir!1042

2 years agoMerge branch 'terencehill/welcome_dialog_fix' into 'master'
terencehill [Tue, 11 Oct 2022 10:49:20 +0000 (10:49 +0000)]
Merge branch 'terencehill/welcome_dialog_fix' into 'master'

Fix #2724 "Pressing escape opens wrong menu when watching demos".

Closes #2724

See merge request xonotic/xonotic-data.pk3dir!1058

2 years agoMerge branch 'Mario/elevator_view_fix' into 'master'
terencehill [Mon, 10 Oct 2022 23:32:52 +0000 (23:32 +0000)]
Merge branch 'Mario/elevator_view_fix' into 'master'

Disable sv_gameplayfix_unstickplayers as it introduces glitchy visuals while riding elevators

Closes #2740

See merge request xonotic/xonotic-data.pk3dir!1071

2 years agoRemove sv_gameplayfix_unstickplayers 2 as it is no longer necessary
Mario [Sun, 9 Oct 2022 11:49:48 +0000 (21:49 +1000)]
Remove sv_gameplayfix_unstickplayers 2 as it is no longer necessary

2 years agoTransifex autosync
Rudolf Polzer [Sat, 8 Oct 2022 05:23:49 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Fri, 7 Oct 2022 05:23:47 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'z411/powerups_drop' into 'master'
LegendaryGuard [Thu, 6 Oct 2022 07:57:22 +0000 (07:57 +0000)]
Merge branch 'z411/powerups_drop' into 'master'

Use Mario's RemoveItem function to remove powerup when expired

See merge request xonotic/xonotic-data.pk3dir!1080

2 years agoUse Mario's RemoveItem function to remove powerup when expired
z411 [Thu, 6 Oct 2022 07:57:22 +0000 (07:57 +0000)]
Use Mario's RemoveItem function to remove powerup when expired

2 years agoTransifex autosync
Rudolf Polzer [Thu, 6 Oct 2022 05:23:47 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'Mario/reset_clear_item_waypoints' into 'master'
terencehill [Wed, 5 Oct 2022 16:08:25 +0000 (16:08 +0000)]
Merge branch 'Mario/reset_clear_item_waypoints' into 'master'

Clear item waypoints when deleting items to fix issues with dropped powerups

Closes #2735 and #2721

See merge request xonotic/xonotic-data.pk3dir!1070

2 years agoClear item waypoints when deleting items to fix issues with dropped powerups
Mario [Wed, 5 Oct 2022 16:08:24 +0000 (16:08 +0000)]
Clear item waypoints when deleting items to fix issues with dropped powerups

2 years agoMerge branch 'z411/powerups_drop' into 'master'
terencehill [Wed, 5 Oct 2022 15:39:33 +0000 (15:39 +0000)]
Merge branch 'z411/powerups_drop' into 'master'

Allow manual powerup dropping (with use key) & fix powerup dropping outside of the map

See merge request xonotic/xonotic-data.pk3dir!1074

2 years agoMerge branch 'terencehill/mapvote_winnermap' into 'master'
terencehill [Wed, 5 Oct 2022 14:59:18 +0000 (14:59 +0000)]
Merge branch 'terencehill/mapvote_winnermap' into 'master'

Map vote screen: expand winner map image to the center of the screen for a second before loading the winner map

See merge request xonotic/xonotic-data.pk3dir!1060

2 years agoMerge branch 'bones_was_here/teameditems' into 'master'
terencehill [Wed, 5 Oct 2022 14:32:56 +0000 (14:32 +0000)]
Merge branch 'bones_was_here/teameditems' into 'master'

Teamed items fixes and Q3 compatibility

Closes #2368

See merge request xonotic/xonotic-data.pk3dir!1079

2 years agoCompact timelimit / leadlimit display code
terencehill [Wed, 5 Oct 2022 14:09:28 +0000 (16:09 +0200)]
Compact timelimit / leadlimit display code

2 years agoLOG_HELP: print a new line only if missing, like LOG_INFO does. It fixes console...
terencehill [Wed, 5 Oct 2022 13:21:08 +0000 (15:21 +0200)]
LOG_HELP: print a new line only if missing, like LOG_INFO does. It fixes console output of dumpturrets -, dumpweapons - and dumpnotifs -

2 years agoTransifex autosync
Rudolf Polzer [Tue, 4 Oct 2022 05:23:47 +0000 (07:23 +0200)]
Transifex autosync

2 years agoDon't drop powerfup if something has dropped before
z411 [Tue, 4 Oct 2022 05:23:42 +0000 (02:23 -0300)]
Don't drop powerfup if something has dropped before

2 years agoRemove unnecessary setorigin() calls in Item_Respawn() and Item_Reset()
bones_was_here [Mon, 3 Oct 2022 07:37:04 +0000 (17:37 +1000)]
Remove unnecessary setorigin() calls in Item_Respawn() and Item_Reset()

Item_Show() already did it, no need to immediately do it again.

2 years agoAdd support for teamed items on Q3 maps by using fullspawndata
bones_was_here [Mon, 3 Oct 2022 06:36:08 +0000 (16:36 +1000)]
Add support for teamed items on Q3 maps by using fullspawndata

Closes #2368

2 years agoFix bug where ReadyRestart could cause teamed items to all spawn together
bones_was_here [Mon, 3 Oct 2022 06:36:01 +0000 (16:36 +1000)]
Fix bug where ReadyRestart could cause teamed items to all spawn together

For weapons this was subtle: ghost item(s) would appear as well as
the item selected to spawn.

For powerups they would all spawn at once, and/or previously scheduled
spawns were not cancelled.

Fixing this requires leaving the first of the teamed items marked so
Item_FindTeam() will do its job again at ReadyRestart.  This requires
changing the abused effect field to a bitmask other than EF_NODRAW so
that DP will draw the ghost for the marked item.

Some minor cleanups to Item_FindTeam() are included.

2 years agoFix indenting in Item_RespawnCountdown()
bones_was_here [Mon, 3 Oct 2022 06:35:31 +0000 (16:35 +1000)]
Fix indenting in Item_RespawnCountdown()

2 years agoReduce indent level in Item_FindTeam()
bones_was_here [Mon, 3 Oct 2022 06:35:22 +0000 (16:35 +1000)]
Reduce indent level in Item_FindTeam()

2 years agoTransifex autosync
Rudolf Polzer [Mon, 3 Oct 2022 05:23:46 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sun, 2 Oct 2022 05:24:19 +0000 (07:24 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sat, 1 Oct 2022 05:23:48 +0000 (07:23 +0200)]
Transifex autosync

2 years agoDon't write notification count to file: it's useless and often causes merge conflicts
terencehill [Fri, 30 Sep 2022 23:02:25 +0000 (01:02 +0200)]
Don't write notification count to file: it's useless and often causes merge conflicts

2 years agoMerge branch 'bones_was_here/playernums' into 'master'
terencehill [Fri, 30 Sep 2022 13:55:08 +0000 (13:55 +0000)]
Merge branch 'bones_was_here/playernums' into 'master'

Automatic per-map min & max player limits, many warmup and player count and Welcome message things

See merge request xonotic/xonotic-data.pk3dir!1022

2 years agoUpdate description of g_mapinfo_q3compat and move its definition to the correct location
Mario [Fri, 30 Sep 2022 12:16:25 +0000 (22:16 +1000)]
Update description of g_mapinfo_q3compat and move its definition to the correct location

2 years agoMerge branch 'master' into Mario/q3compat_sanity
Mario [Fri, 30 Sep 2022 09:54:07 +0000 (19:54 +1000)]
Merge branch 'master' into Mario/q3compat_sanity

2 years agoAdjust the map size diameter needed for some gamemodes to 3250, fixes medium sized...
Mario [Fri, 30 Sep 2022 09:49:33 +0000 (19:49 +1000)]
Adjust the map size diameter needed for some gamemodes to 3250, fixes medium sized maps generating with support for Duel

2 years agoFix support for Clan Arena and Key Hunt in Q3 maps
Mario [Fri, 30 Sep 2022 09:10:41 +0000 (19:10 +1000)]
Fix support for Clan Arena and Key Hunt in Q3 maps

2 years agoAdd some "always supported" gamemodes to the supported gamemodes list when the .arena...
Mario [Fri, 30 Sep 2022 09:05:06 +0000 (19:05 +1000)]
Add some "always supported" gamemodes to the supported gamemodes list when the .arena file contains type ffa

2 years agoAttempt to avoid generating mapinfo data if a .defi file exists when g_mapinfo_q3comp...
Mario [Fri, 30 Sep 2022 09:00:18 +0000 (19:00 +1000)]
Attempt to avoid generating mapinfo data if a .defi file exists when g_mapinfo_q3compat is enabled, to reduce the number of potential crashes from random defrag maps. Don't add regular gamemodes if a target_stopTimer entity exists in the map when generating mapinfo data

2 years agoWhitelist g_mapinfo_q3compat
Mario [Fri, 30 Sep 2022 07:50:35 +0000 (17:50 +1000)]
Whitelist g_mapinfo_q3compat

2 years agoCheck for an empty string after processing it a little, fixes a few more edge cases
Mario [Fri, 30 Sep 2022 07:20:33 +0000 (17:20 +1000)]
Check for an empty string after processing it a little, fixes a few more edge cases

2 years agoTransifex autosync
Rudolf Polzer [Fri, 30 Sep 2022 05:23:51 +0000 (07:23 +0200)]
Transifex autosync

2 years agoReplace arena settings with a single q3compat cvar to handle mapinfo generation with...
Mario [Fri, 30 Sep 2022 05:14:51 +0000 (15:14 +1000)]
Replace arena settings with a single q3compat cvar to handle mapinfo generation with .arena and .defi files, fix some edge cases and avoid using fallbacks if they aren't for the current map

2 years agoSkip commented out lines when scanning .arena files for map information
Mario [Thu, 29 Sep 2022 08:25:56 +0000 (18:25 +1000)]
Skip commented out lines when scanning .arena files for map information

2 years agoTransifex autosync
Rudolf Polzer [Thu, 29 Sep 2022 05:23:46 +0000 (07:23 +0200)]
Transifex autosync

2 years agoProper powerup throwing bugfix
z411 [Wed, 28 Sep 2022 20:48:47 +0000 (17:48 -0300)]
Proper powerup throwing bugfix

2 years agoClean up welcome message newlines
bones_was_here [Mon, 26 Sep 2022 05:23:33 +0000 (15:23 +1000)]
Clean up welcome message newlines

2 years agoMake MOTD header fancier in welcome message
bones_was_here [Mon, 26 Sep 2022 05:23:23 +0000 (15:23 +1000)]
Make MOTD header fancier in welcome message

2 years agoUse a translatable chatcon notification for "Match is restarting..."
bones_was_here [Mon, 26 Sep 2022 05:23:20 +0000 (15:23 +1000)]
Use a translatable chatcon notification for "Match is restarting..."

2 years agog_warmup -1: abort countdown if player count falls too low
bones_was_here [Mon, 26 Sep 2022 05:23:16 +0000 (15:23 +1000)]
g_warmup -1: abort countdown if player count falls too low

Includes translatable chatcon + centreprint notification for this case.

2 years agoFix unnecessary inflation of g_warmup_majority_factor in some cases
bones_was_here [Mon, 26 Sep 2022 05:23:11 +0000 (15:23 +1000)]
Fix unnecessary inflation of g_warmup_majority_factor in some cases

For example with 10 players joined and g_warmup_majority_factor 0.8
the old code required 9 players to be ready, new code requires 8.
Behaviour is unchanged when joined players * factor is not an integer.

Also improve cvar description.

2 years agoImprove centreprint shown when max player limit blocks joining
bones_was_here [Mon, 26 Sep 2022 05:23:07 +0000 (15:23 +1000)]
Improve centreprint shown when max player limit blocks joining