]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
2 years agoMerge from master to fix nades orb
LegendaryGuard [Mon, 10 Jan 2022 01:49:49 +0000 (02:49 +0100)]
Merge from master to fix nades orb

2 years agoMerge branch 'LegendaryGuard/armorizing_and_dark_nades' of https://gitlab.com/xonotic...
LegendaryGuard [Mon, 10 Jan 2022 01:46:32 +0000 (02:46 +0100)]
Merge branch 'LegendaryGuard/armorizing_and_dark_nades' of https://gitlab.com/xonotic/xonotic-data.pk3dir into LegendaryGuard/armorizing_and_dark_nades

2 years agoMerge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
LegendaryGuard [Mon, 10 Jan 2022 01:34:55 +0000 (02:34 +0100)]
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades

2 years agoWrong statement, it should when match ended
LegendaryGuard [Wed, 5 Jan 2022 18:30:47 +0000 (18:30 +0000)]
Wrong statement, it should when match ended

2 years agoSeveral spamming CSQC error fixes, fix dark blinking effect when player is dead or...
LegendaryGuard [Wed, 5 Jan 2022 17:15:01 +0000 (18:15 +0100)]
Several spamming CSQC error fixes, fix dark blinking effect when player is dead or match is over. Disabled turret feature, no longer works to assign owner and team to stop attacking no sense

2 years agoFix #2597 "Game not listed in XonStats if a player has turned off stats tracking...
terencehill [Wed, 5 Jan 2022 00:10:02 +0000 (01:10 +0100)]
Fix #2597 "Game not listed in XonStats if a player has turned off stats tracking" by handling cl_allow_uidtracking as string rather than float in the client (reverting change of commit 2d8c8577).

This commit also reverts a422dfd5 "Respect cl_allow_uidtracking on player stats reset" in warmup as it was actually replicating the misbehaviour causing #2597

2 years agoLMS: Apply INGAME_STATUS_JOINED when players are reset
terencehill [Tue, 4 Jan 2022 18:29:37 +0000 (19:29 +0100)]
LMS: Apply INGAME_STATUS_JOINED when players are reset

2 years agoAdd API to handle in-game status for game modes that temporarily turn players into...
terencehill [Tue, 4 Jan 2022 00:27:48 +0000 (01:27 +0100)]
Add API to handle in-game status for game modes that temporarily turn players into spectators/observers when they are eliminated but keeping them "in game". Replaces caplayer and lmsplayer and the GetPlayerStatus mutator hook

2 years agoMerge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
LegendaryGuard [Mon, 3 Jan 2022 15:45:53 +0000 (16:45 +0100)]
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades

2 years agoMerge branch 'z411/timer_bound' into 'master'
terencehill [Sun, 2 Jan 2022 18:43:48 +0000 (18:43 +0000)]
Merge branch 'z411/timer_bound' into 'master'

Added upper bound for decreasing timer

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

2 years agoAdded upper bound for decreasing timer
z411 [Sun, 2 Jan 2022 18:43:48 +0000 (18:43 +0000)]
Added upper bound for decreasing timer

2 years agoMerge branch 'bones_was_here/lms_items' into 'master'
terencehill [Sun, 2 Jan 2022 18:07:13 +0000 (18:07 +0000)]
Merge branch 'bones_was_here/lms_items' into 'master'

Add support for LMS with items

Closes #2640

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

2 years agoMerge branch 'bones_was_here/xonstat_https' into 'master'
terencehill [Sun, 2 Jan 2022 18:03:11 +0000 (18:03 +0000)]
Merge branch 'bones_was_here/xonstat_https' into 'master'

Use https for xonstat submissions

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

2 years agoFix eliminated players not considered winners even if they belong to the winner team...
terencehill [Sun, 2 Jan 2022 17:22:57 +0000 (18:22 +0100)]
Fix eliminated players not considered winners even if they belong to the winner team in CA; also show a message in console reporting the winner team of the match in all game modes

2 years agoAssault: add a couple informational messages and fix various bugs related to the...
terencehill [Sun, 2 Jan 2022 16:23:31 +0000 (17:23 +0100)]
Assault: add a couple informational messages and fix various bugs related to the start of the second round

2 years agoFix parameter name in ReadyRestart
terencehill [Sun, 2 Jan 2022 10:10:30 +0000 (11:10 +0100)]
Fix parameter name in ReadyRestart

2 years agoMerge branch 'z411/srestart' into 'master'
terencehill [Sun, 2 Jan 2022 09:55:44 +0000 (09:55 +0000)]
Merge branch 'z411/srestart' into 'master'

Add resetmatch command to soft restart the map without the need to respawn the server [restart] (fixes #2609)

Closes #2609

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

2 years agoMerge branch 'terencehill/playerstats_reset' into 'master'
terencehill [Sun, 2 Jan 2022 09:24:53 +0000 (09:24 +0000)]
Merge branch 'terencehill/playerstats_reset' into 'master'

Reset player stats on repeated readyrestart, it fixes #2656

Closes #2656

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

2 years agoReset player stats on repeated readyrestart, it fixes #2656
terencehill [Sun, 2 Jan 2022 09:24:52 +0000 (09:24 +0000)]
Reset player stats on repeated readyrestart, it fixes #2656

2 years agoLMS: fix screwed up rankings when a spectator disconnects
terencehill [Sat, 1 Jan 2022 22:23:41 +0000 (23:23 +0100)]
LMS: fix screwed up rankings when a spectator disconnects

2 years agoRename Team_*ControlPoints functions to Team_*OwnedItems so they can be used without...
terencehill [Fri, 31 Dec 2021 14:59:58 +0000 (15:59 +0100)]
Rename Team_*ControlPoints functions to Team_*OwnedItems so they can be used without ambiguity to count control points in Domination and generators in Onslaught

2 years agoSimplify and share some duplicated code
terencehill [Fri, 31 Dec 2021 00:21:11 +0000 (01:21 +0100)]
Simplify and share some duplicated code

2 years agoTransifex autosync
Rudolf Polzer [Wed, 29 Dec 2021 06:23:20 +0000 (07:23 +0100)]
Transifex autosync

2 years agoMenu: fix Apply buttons not working if a button is pressed with the spacebar
terencehill [Tue, 28 Dec 2021 14:11:20 +0000 (15:11 +0100)]
Menu: fix Apply buttons not working if a button is pressed with the spacebar

2 years agoTransifex autosync
Rudolf Polzer [Tue, 28 Dec 2021 06:23:22 +0000 (07:23 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 27 Dec 2021 06:23:17 +0000 (07:23 +0100)]
Transifex autosync

2 years agoSmall cleanup
terencehill [Fri, 24 Dec 2021 13:47:01 +0000 (14:47 +0100)]
Small cleanup

2 years agoMenu Server list: partially fix server row next to the heading slightly smaller than...
terencehill [Fri, 24 Dec 2021 13:25:20 +0000 (14:25 +0100)]
Menu Server list: partially fix server row next to the heading slightly smaller than others if (autocvar_menu_slist_categories <= 0) (now it's less noticeable)

2 years agoTransifex autosync
Rudolf Polzer [Thu, 23 Dec 2021 06:23:19 +0000 (07:23 +0100)]
Transifex autosync

2 years agoAdd support for LMS with items
bones_was_here [Fri, 17 Dec 2021 08:41:43 +0000 (18:41 +1000)]
Add support for LMS with items

2 years agoTransifex autosync
Rudolf Polzer [Mon, 13 Dec 2021 06:23:17 +0000 (07:23 +0100)]
Transifex autosync

2 years agoMake vcall restart do a resetmatch instead
z411 [Mon, 13 Dec 2021 06:04:17 +0000 (03:04 -0300)]
Make vcall restart do a resetmatch instead

2 years agoUpdating outdated comment
z411 [Sun, 12 Dec 2021 18:05:25 +0000 (15:05 -0300)]
Updating outdated comment

2 years agoMaking boolean name more descriptive
z411 [Sun, 12 Dec 2021 18:02:40 +0000 (15:02 -0300)]
Making boolean name more descriptive

2 years agoChange command name from reset to resetmatch
z411 [Sun, 12 Dec 2021 17:58:54 +0000 (14:58 -0300)]
Change command name from reset to resetmatch

2 years agoProperly reset weapon accuracy on player respawn if sv_ready_restart_after_countdown...
terencehill [Sat, 11 Dec 2021 15:56:46 +0000 (16:56 +0100)]
Properly reset weapon accuracy on player respawn if sv_ready_restart_after_countdown is 1, thanks z411 for pointing out this bug

z411: "I think it seems to work as you expect because you are resetting the accuracies before the match starts, but once the players respawn accuracy_resend() which actually sends the stats is called in PutPlayerInServer() when they respawn. So the server is actually resetting the stats before it should, but sends them when they respawn."

2 years agoFix compilation units
terencehill [Sat, 11 Dec 2021 00:27:18 +0000 (01:27 +0100)]
Fix compilation units

2 years agoReset weapon accuracy on readyrestart
terencehill [Fri, 10 Dec 2021 15:39:28 +0000 (16:39 +0100)]
Reset weapon accuracy on readyrestart

2 years agoUse https for xonstat submissions
bones_was_here [Thu, 9 Dec 2021 15:22:58 +0000 (01:22 +1000)]
Use https for xonstat submissions

2 years agoRemove an outdated comment and a redundant division by 1
terencehill [Thu, 9 Dec 2021 12:26:15 +0000 (13:26 +0100)]
Remove an outdated comment and a redundant division by 1

2 years agoMerge branch 'z411/round_countdown_fix' into 'master'
terencehill [Thu, 9 Dec 2021 12:04:52 +0000 (12:04 +0000)]
Merge branch 'z411/round_countdown_fix' into 'master'

Fix countdown centerprint for round-based modes

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

2 years agoMerge branch 'Mario/lms_pickup_items' into 'master'
Mario [Thu, 9 Dec 2021 05:47:55 +0000 (05:47 +0000)]
Merge branch 'Mario/lms_pickup_items' into 'master'

Merge branch Mario/lms_pickup_items (XXS merge request)

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

2 years agoFixed issue where round countdown would start one second too late
z411 [Wed, 8 Dec 2021 05:18:12 +0000 (02:18 -0300)]
Fixed issue where round countdown would start one second too late

Due to flooring and not rounding the countdown time, the round timer
would ocassionally start counting one second too late (ie at 9, not 10).

2 years agoAdd another master server.
Rudolf Polzer [Mon, 6 Dec 2021 01:15:26 +0000 (20:15 -0500)]
Add another master server.

Thanks, gazby!

2 years agoFix countdown centerprint for round-based modes
z411 [Sun, 5 Dec 2021 00:09:50 +0000 (21:09 -0300)]
Fix countdown centerprint for round-based modes

2 years agoMerge branch 'z411/powerups_dropondeath' into 'master'
terencehill [Sat, 4 Dec 2021 22:45:51 +0000 (22:45 +0000)]
Merge branch 'z411/powerups_dropondeath' into 'master'

Merge branch z411/powerups_dropondeath (improves on Mario's implementation)

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

2 years agoAlso point master4.xonotic.org at bones.
Rudolf Polzer [Sat, 4 Dec 2021 00:44:20 +0000 (01:44 +0100)]
Also point master4.xonotic.org at bones.

now playing: bonetrousle

2 years agoDP master does not have sv_masterextra3 anymore, so let's use sv_master4 for a 3rd...
Rudolf Polzer [Sat, 4 Dec 2021 00:35:28 +0000 (01:35 +0100)]
DP master does not have sv_masterextra3 anymore, so let's use sv_master4 for a 3rd master.

This keeps sv_master1 to sv_master3 usable for users.

2 years agoUse our own master server DNS records.
Rudolf Polzer [Fri, 3 Dec 2021 20:33:51 +0000 (12:33 -0800)]
Use our own master server DNS records.

This allows us to update server addresses without a new engine binary release.

2 years agoTransifex autosync
Rudolf Polzer [Fri, 3 Dec 2021 06:23:28 +0000 (07:23 +0100)]
Transifex autosync

2 years agoMake allready not votable if in a match
z411 [Fri, 3 Dec 2021 03:09:16 +0000 (00:09 -0300)]
Make allready not votable if in a match

2 years agoChanged description of the reset server command
z411 [Fri, 3 Dec 2021 02:58:24 +0000 (23:58 -0300)]
Changed description of the reset server command

2 years agoRemove sv_ready_restart as this command superseedes it
z411 [Fri, 3 Dec 2021 02:56:46 +0000 (23:56 -0300)]
Remove sv_ready_restart as this command superseedes it

2 years agoAdded cvar for default loot lifetime and using it for dropped powerups
z411 [Thu, 2 Dec 2021 20:45:56 +0000 (17:45 -0300)]
Added cvar for default loot lifetime and using it for dropped powerups

2 years agoPowerup drops: Changed cvar names
z411 [Thu, 2 Dec 2021 18:42:04 +0000 (15:42 -0300)]
Powerup drops: Changed cvar names

2 years agoTransifex autosync
Rudolf Polzer [Thu, 2 Dec 2021 06:25:11 +0000 (07:25 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Wed, 1 Dec 2021 06:23:42 +0000 (07:23 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Tue, 30 Nov 2021 06:23:30 +0000 (07:23 +0100)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 29 Nov 2021 06:23:30 +0000 (07:23 +0100)]
Transifex autosync

2 years agoAdd proper names to the Swedish translation
terencehill [Sun, 28 Nov 2021 14:02:27 +0000 (15:02 +0100)]
Add proper names to the Swedish translation

2 years agoTransifex autosync
Rudolf Polzer [Sun, 28 Nov 2021 06:24:05 +0000 (07:24 +0100)]
Transifex autosync

2 years agoImplemented TTL as a timer and waypoint that shows the time left
z411 [Sat, 27 Nov 2021 02:55:06 +0000 (23:55 -0300)]
Implemented TTL as a timer and waypoint that shows the time left

2 years agoRevert "powerups_dropondeath: Added dropped waypoint"
z411 [Sat, 27 Nov 2021 00:58:23 +0000 (21:58 -0300)]
Revert "powerups_dropondeath: Added dropped waypoint"

This reverts commit 473dc5f95b6b40df65fc2ae5d841fde806063d29.

2 years agoTransifex autosync
Rudolf Polzer [Fri, 26 Nov 2021 06:23:37 +0000 (07:23 +0100)]
Transifex autosync

2 years agopowerups_dropondeath: Fix reverse health bar
z411 [Thu, 25 Nov 2021 18:25:37 +0000 (15:25 -0300)]
powerups_dropondeath: Fix reverse health bar

2 years agoTransifex autosync
Rudolf Polzer [Thu, 25 Nov 2021 06:23:32 +0000 (07:23 +0100)]
Transifex autosync

2 years agopowerups_dropondeath: Added dropped waypoint
z411 [Wed, 24 Nov 2021 21:44:50 +0000 (18:44 -0300)]
powerups_dropondeath: Added dropped waypoint

2 years agopowerups_dropondeath: Make time to live configurable
z411 [Wed, 24 Nov 2021 17:21:07 +0000 (14:21 -0300)]
powerups_dropondeath: Make time to live configurable

2 years agoAdd "Bold font scale" slider to the Centerprint panel's menu
terencehill [Sun, 21 Nov 2021 22:19:45 +0000 (23:19 +0100)]
Add "Bold font scale" slider to the Centerprint panel's menu

2 years agoSmall serverlist's code cleanup
terencehill [Sun, 21 Nov 2021 22:16:42 +0000 (23:16 +0100)]
Small serverlist's code cleanup

2 years agoMerge branch 'terencehill/health_armor_icons' into 'master'
terencehill [Sun, 21 Nov 2021 21:57:43 +0000 (21:57 +0000)]
Merge branch 'terencehill/health_armor_icons' into 'master'

Add proper health / armor icons (used by the ItemStats and ItemsTime panels)

Closes #2561

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

2 years agoTransifex autosync
Rudolf Polzer [Sat, 20 Nov 2021 06:23:31 +0000 (07:23 +0100)]
Transifex autosync

2 years agoSoft reset: Fix warmup limit and repeatable restart
z411 [Thu, 18 Nov 2021 15:40:12 +0000 (12:40 -0300)]
Soft reset: Fix warmup limit and repeatable restart

2 years agoMerge branch 'drjaska/electrostickylifetime' into 'master'
terencehill [Thu, 18 Nov 2021 11:18:47 +0000 (11:18 +0000)]
Merge branch 'drjaska/electrostickylifetime' into 'master'

New cvar for electro balls to get their lifetime from after sticking

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

2 years agoNew cvar for electro balls to get their lifetime from after sticking
Dr. Jaska [Thu, 18 Nov 2021 11:18:47 +0000 (11:18 +0000)]
New cvar for electro balls to get their lifetime from after sticking

2 years agoMerge branch 'drjaska/fixSetStartItemsInitialization' into 'master'
terencehill [Wed, 17 Nov 2021 18:36:04 +0000 (18:36 +0000)]
Merge branch 'drjaska/fixSetStartItemsInitialization' into 'master'

update to CA/FT SetStartItems hookfunction

Closes #2652

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

2 years agoupdate to CA/FT SetStartItems hookfunction
Dr. Jaska [Wed, 17 Nov 2021 18:36:03 +0000 (18:36 +0000)]
update to CA/FT SetStartItems hookfunction

2 years agoMerge branch 'bones_was_here/ft_start_armor' into 'master'
terencehill [Wed, 17 Nov 2021 13:54:52 +0000 (13:54 +0000)]
Merge branch 'bones_was_here/ft_start_armor' into 'master'

Increase freezetag starting armor from 0 to 100

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

2 years agoMerge branch 'bones_was_here/strafehud_jumpheight' into 'master'
terencehill [Wed, 17 Nov 2021 13:43:52 +0000 (13:43 +0000)]
Merge branch 'bones_was_here/strafehud_jumpheight' into 'master'

strafehud: fix and refactor jumpheight feature

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

2 years agoAdd missing supercells icons in old hud themes (copy of ammo_cells.tga)
terencehill [Wed, 17 Nov 2021 11:53:03 +0000 (12:53 +0100)]
Add missing supercells icons in old hud themes (copy of ammo_cells.tga)

2 years agoMerge branch 'z411/ca_useammunition' into 'master'
terencehill [Wed, 17 Nov 2021 09:27:59 +0000 (09:27 +0000)]
Merge branch 'z411/ca_useammunition' into 'master'

Make CA/FT/LMS respect g_use_ammunition

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

2 years agoUpdate .gitignore
terencehill [Tue, 16 Nov 2021 16:52:37 +0000 (17:52 +0100)]
Update .gitignore

2 years agoShow full fuel bar with a low alpha, fade it in until fuel reaches the middle of...
terencehill [Tue, 16 Nov 2021 16:51:20 +0000 (17:51 +0100)]
Show full fuel bar with a low alpha, fade it in until fuel reaches the middle of the bar (like the oxygen bar)

2 years agoRemove a wrong comment, IT_UNLIMITED_AMMO gives unlimited fuel too
terencehill [Tue, 16 Nov 2021 16:46:15 +0000 (17:46 +0100)]
Remove a wrong comment, IT_UNLIMITED_AMMO gives unlimited fuel too

3 years agoTransifex autosync
Rudolf Polzer [Tue, 16 Nov 2021 06:23:27 +0000 (07:23 +0100)]
Transifex autosync

3 years agoMake CA/FT/LMS respect g_use_ammunition
z411 [Mon, 15 Nov 2021 03:23:49 +0000 (00:23 -0300)]
Make CA/FT/LMS respect g_use_ammunition

Makes it possible to play CA/FT/LMS with unlimited ammo.

3 years agoTransifex autosync
Rudolf Polzer [Thu, 11 Nov 2021 06:23:41 +0000 (07:23 +0100)]
Transifex autosync

3 years agoAdd health / armor icons to other hud themes
terencehill [Wed, 10 Nov 2021 18:01:54 +0000 (19:01 +0100)]
Add health / armor icons to other hud themes

3 years agoTransifex autosync
Rudolf Polzer [Wed, 10 Nov 2021 06:23:35 +0000 (07:23 +0100)]
Transifex autosync

3 years agoTransifex autosync
Rudolf Polzer [Tue, 9 Nov 2021 06:23:39 +0000 (07:23 +0100)]
Transifex autosync

3 years agoTransifex autosync
Rudolf Polzer [Mon, 8 Nov 2021 06:23:28 +0000 (07:23 +0100)]
Transifex autosync

3 years agoTransifex autosync
Rudolf Polzer [Sun, 7 Nov 2021 06:24:02 +0000 (07:24 +0100)]
Transifex autosync

3 years agopowerups_dropondeath: Use weapon despawn time for setting 2
z411 [Sat, 6 Nov 2021 21:27:43 +0000 (18:27 -0300)]
powerups_dropondeath: Use weapon despawn time for setting 2

3 years agoTransifex autosync
Rudolf Polzer [Sat, 6 Nov 2021 06:23:37 +0000 (07:23 +0100)]
Transifex autosync

3 years agoImproved powerups_dropondeath setting
z411 [Fri, 5 Nov 2021 17:44:24 +0000 (14:44 -0300)]
Improved powerups_dropondeath setting

3 years agoAdd proper health / armor icons (used by the ItemStats and ItemsTime panels)
terencehill [Mon, 1 Nov 2021 23:48:18 +0000 (00:48 +0100)]
Add proper health / armor icons (used by the ItemStats and ItemsTime panels)

3 years agoTransifex autosync
Rudolf Polzer [Tue, 2 Nov 2021 06:23:34 +0000 (07:23 +0100)]
Transifex autosync

3 years agoFix compilation units
terencehill [Sun, 31 Oct 2021 09:20:34 +0000 (10:20 +0100)]
Fix compilation units

3 years agoTransifex autosync
Rudolf Polzer [Sun, 31 Oct 2021 06:23:58 +0000 (07:23 +0100)]
Transifex autosync

3 years agomoveplayer: add # to player number
terencehill [Sat, 30 Oct 2021 20:45:11 +0000 (22:45 +0200)]
moveplayer: add # to player number