]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Nick S [Thu, 22 Jun 2023 21:06:06 +0000 (00:06 +0300)]
Merge remote-tracking branch 'origin/Juhu/scoreboard-strafe' into morosophos/server-current4
Nick S [Thu, 22 Jun 2023 19:07:14 +0000 (22:07 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Juhu [Thu, 22 Jun 2023 01:47:43 +0000 (03:47 +0200)]
Merge branch 'master' into Juhu/scoreboard-strafe
Fixed merge conflict caused by new SCO_LABEL macro
bones_was_here [Wed, 21 Jun 2023 10:44:21 +0000 (20:44 +1000)]
Update xonotic.org update nagger URLs
bones_was_here [Tue, 20 Jun 2023 12:20:37 +0000 (22:20 +1000)]
Merge branch 'bones_was_here/806' into 'master'
This was the 0.8.6 stable release branch which needs to be merged to get
the tagged commit into master.
bones_was_here [Mon, 19 Jun 2023 19:14:18 +0000 (05:14 +1000)]
Update the-big-keybench demo
bones_was_here [Mon, 19 Jun 2023 19:13:23 +0000 (05:13 +1000)]
Revert a change that shouldn't have been merged during release freeze
terencehill [Mon, 19 Jun 2023 09:23:21 +0000 (11:23 +0200)]
Undefine SCO_LABEL and remove redundant default case. Also document the inverted logic of BotShouldAttack
terencehill [Sun, 18 Jun 2023 15:36:12 +0000 (17:36 +0200)]
SCO_LABEL macro: remove redundant else and strcat
terencehill [Sun, 18 Jun 2023 13:40:52 +0000 (13:40 +0000)]
Merge branch 'LegendaryGuard/scolabel_macro' into 'master'
Improve readability by replacing label switch with SCO_LABEL macro in scoreboard code
See merge request xonotic/xonotic-data.pk3dir!1209
LegendaryGuard [Sun, 18 Jun 2023 13:40:52 +0000 (13:40 +0000)]
Improve readability by replacing label switch with SCO_LABEL macro in scoreboard code
LegendaryGuard [Sun, 18 Jun 2023 12:58:14 +0000 (12:58 +0000)]
Sort correctly Mayhem and Team Mayhem in the gametype menu list
Rudolf Polzer [Sun, 18 Jun 2023 05:23:07 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Sat, 17 Jun 2023 05:23:08 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Fri, 16 Jun 2023 16:30:12 +0000 (02:30 +1000)]
Disable recoil, the current implementation is unpopular
https://xonotic.org/balancevotes/5/
bones_was_here [Fri, 16 Jun 2023 12:38:50 +0000 (22:38 +1000)]
Fix resetmatch not deleting loot items
Accidentally changed the .reset function for loot in !1202
terencehill [Thu, 15 Jun 2023 21:56:43 +0000 (21:56 +0000)]
Merge branch 'bones_was_here/itemsdesync' into 'master'
Items overhaul
Closes #2824, #2059, and #1046
See merge request xonotic/xonotic-data.pk3dir!1202
bones_was_here [Thu, 15 Jun 2023 18:57:18 +0000 (04:57 +1000)]
items: temp kludge to reduce visibility of prediction errors
FIXME PROPERLY: needs moar sv_legacy_bbox_expand 0
bones_was_here [Thu, 15 Jun 2023 20:53:25 +0000 (06:53 +1000)]
items: apply 0.5s spawnshield to all loot drops by default
This prevents immediate pickup of the dropped item.
Previously powerups used this mechanism, whereas thrown weapons could be
picked up immediately by everyone except the person who threw them.
It will be consistent for most/all loot items now, and perhaps nicer because
players should see the items in the world before picking them up so it
might feel more deliberate and less random.
bones_was_here [Wed, 14 Jun 2023 13:53:57 +0000 (23:53 +1000)]
powerups: use Item_Think() for dropped powerups
Fixes lack of updates sent to CSQC ItemDraw() for position, velocity, etc.
bones_was_here [Wed, 14 Jun 2023 11:41:02 +0000 (21:41 +1000)]
items: remove override of Item_Think() in Item_InitializeLoot()
This was preventing any updates being sent to CSQC for items spawned via
this code path (except the final deletion when the item expired).
bones_was_here [Sun, 11 Jun 2023 18:18:54 +0000 (04:18 +1000)]
items: misc cleanup
bones_was_here [Sun, 11 Jun 2023 18:42:21 +0000 (04:42 +1000)]
items: move particle effects to CSQC for bandwidth and consistency
If some packets get delayed and/or resent, it should no longer be
possible see the item appear or disappear without the particles, or vice versa.
bones_was_here [Sun, 11 Jun 2023 17:53:44 +0000 (03:53 +1000)]
items: match SVQC .solid behaviour in CSQC
bones_was_here [Sun, 11 Jun 2023 17:09:52 +0000 (03:09 +1000)]
items: don't precache 3d models and textures when simple items are enabled
Precaching is done in CSQC. Doing it in SVQC _StartItem() was unreliable on dedicated servers because clients often connected well after the items spawned in SVQC.
Helps towards #2799
bones_was_here [Sun, 11 Jun 2023 20:37:16 +0000 (06:37 +1000)]
items: support toggling cl_simple_items at any time
bones_was_here [Sun, 11 Jun 2023 16:59:52 +0000 (02:59 +1000)]
items: add loot despawn effects
Closes #1046
bones_was_here [Sun, 11 Jun 2023 20:25:14 +0000 (06:25 +1000)]
items: use a different CSQC physics code path for smoother motion
Previously it ran physics in whole numbers of server frametimes, which
would cause "jumps" when the updates for a thrown item arrived.
bones_was_here [Sun, 11 Jun 2023 17:52:25 +0000 (03:52 +1000)]
items: fix animation interference with physics and reset animation properly if disabled
Spawns item at the sine wave midpoint instead of "fading in".
bones_was_here [Mon, 12 Jun 2023 18:38:36 +0000 (04:38 +1000)]
items: alpha calculation rework
- more efficient networking
- clients can now customise the range of the fade effect (as well as disable it)
- clients can no longer override server maxdist setting (was unfair)
- replaces vehicle ghost items with a weapon_stay-based effect
Fixes #2059
bones_was_here [Thu, 15 Jun 2023 20:36:11 +0000 (06:36 +1000)]
items: replace broken loot think implementation
Implements a slow update rate for loot items, just enough to correct occasional prediction errors.
Includes SVQC prerequisites for loot item despawn effects
terencehill [Thu, 15 Jun 2023 16:59:55 +0000 (16:59 +0000)]
Merge branch 'terencehill/campaign_message_fix' into 'master'
Allow showing translated campaign level descriptions in game and add Chinese translations of the campaign
See merge request xonotic/xonotic-data.pk3dir!1205
terencehill [Thu, 15 Jun 2023 16:59:55 +0000 (16:59 +0000)]
Allow showing translated campaign level descriptions in game and add Chinese translations of the campaign
bones_was_here [Wed, 14 Jun 2023 13:03:56 +0000 (23:03 +1000)]
trigger_viewloc: don't unset model field in spawnfunc
Fixes collision detection failure in WarpZoneLib_BoxTouchesBrush()
See: https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1207
terencehill [Wed, 14 Jun 2023 10:40:42 +0000 (12:40 +0200)]
Fix menu trying to open <campaign_file.txt>.en
terencehill [Mon, 12 Jun 2023 17:50:44 +0000 (19:50 +0200)]
Reset ready and eliminated status in the client as soon as a player disconnects, fixing players occasionally appearing as eliminated (grayed out) as soon as they join the server because they wrongly inherited status of disconnected players
terencehill [Mon, 12 Jun 2023 17:35:53 +0000 (17:35 +0000)]
Merge branch 'drjaska/terencehill/survival_scoreboard_colors_fix' into 'master'
Simpler implementation of !1200 and fixes to !1195
Closes #2844
See merge request xonotic/xonotic-data.pk3dir!1201
Dr. Jaska [Mon, 12 Jun 2023 17:35:53 +0000 (17:35 +0000)]
Simpler implementation of !1200 and fixes to !1195
terencehill [Mon, 12 Jun 2023 14:56:56 +0000 (16:56 +0200)]
bot_cmd: update usage example of the cc subcommand. Use the BOLD macro in 2 Survival notifications
LegendaryGuard [Mon, 12 Jun 2023 00:27:50 +0000 (00:27 +0000)]
Merge branch 'drjaska/new-defaults' into 'master'
Refined default values for mouse `sensitivity` (halved from 6 to 3) and `mastervolume` (9.0 to 7.0).
See merge request xonotic/xonotic-data.pk3dir!1192
Dr. Jaska [Mon, 12 Jun 2023 00:27:50 +0000 (00:27 +0000)]
Refined default values for mouse `sensitivity` (halved from 6 to 3) and `mastervolume` (9.0 to 7.0).
LegendaryGuard [Sun, 11 Jun 2023 12:16:52 +0000 (12:16 +0000)]
Merge branch 'terencehill/survival_scoreboard_colors_fix' into 'master'
Survival: show hunters to other hunters in the scoreboard. It fixes #2844
Closes #2844
See merge request xonotic/xonotic-data.pk3dir!1200
terencehill [Sun, 11 Jun 2023 12:16:52 +0000 (12:16 +0000)]
Survival: show hunters to other hunters in the scoreboard. It fixes #2844
Rudolf Polzer [Sun, 11 Jun 2023 05:23:08 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Sat, 10 Jun 2023 19:26:50 +0000 (19:26 +0000)]
Merge branch 'terencehill/survival_fixes' into 'master'
Survival: refactored code to prevent cheating and 2 minor fixes
See merge request xonotic/xonotic-data.pk3dir!1195
LegendaryGuard [Sat, 10 Jun 2023 17:44:50 +0000 (17:44 +0000)]
Merge branch 'Juhu/vehicle_ws_fix' into 'master'
Make primary fire work in vehicles if the player has no gun
See merge request xonotic/xonotic-data.pk3dir!1191
Juhu [Sat, 10 Jun 2023 17:44:50 +0000 (17:44 +0000)]
Make primary fire work in vehicles if the player has no gun
LegendaryGuard [Sat, 10 Jun 2023 08:16:28 +0000 (08:16 +0000)]
Merge branch 'LegendaryGuard/new_minigame_banning' into 'master'
Add new 'playban' cvar to disallow banned players (forced to spectate) from playing minigames
See merge request xonotic/xonotic-data.pk3dir!1194
LegendaryGuard [Sat, 10 Jun 2023 08:16:28 +0000 (08:16 +0000)]
Add new 'playban' cvar to disallow banned players (forced to spectate) from playing minigames
z411 [Sat, 10 Jun 2023 02:17:26 +0000 (02:17 +0000)]
Merge branch 'terencehill/vote_commands' into 'master'
Made moveto* votes always show player ID and name, 2 other minor voting related fixes
See merge request xonotic/xonotic-data.pk3dir!1198
terencehill [Fri, 9 Jun 2023 21:00:12 +0000 (23:00 +0200)]
Remove 2 redundant bounds
terencehill [Fri, 9 Jun 2023 15:16:43 +0000 (17:16 +0200)]
Merge branch 'terencehill/banning_stuff'
terencehill [Fri, 9 Jun 2023 15:03:16 +0000 (15:03 +0000)]
Merge branch 'drjaska/surv-columns' into 'master'
Fix default scoreboard columns for survival
See merge request xonotic/xonotic-data.pk3dir!1196
Dr. Jaska [Fri, 9 Jun 2023 15:03:16 +0000 (15:03 +0000)]
Fix default scoreboard columns for survival
terencehill [Fri, 9 Jun 2023 14:55:52 +0000 (16:55 +0200)]
Fix and improve many ban cvar descriptions
terencehill [Fri, 9 Jun 2023 14:53:59 +0000 (16:53 +0200)]
Banning system: prevent a bug where any redundant space in a ban list bans all players; also optimize PlayerInList
Rudolf Polzer [Fri, 9 Jun 2023 05:23:08 +0000 (07:23 +0200)]
Transifex autosync
z411 [Fri, 9 Jun 2023 00:04:48 +0000 (00:04 +0000)]
Merge branch 'drjaska/2839' into 'master'
tempfix 'Anonymous player' -> '???' until it's translatable
See merge request xonotic/xonotic-data.pk3dir!1197
Dr. Jaska [Fri, 9 Jun 2023 00:04:48 +0000 (00:04 +0000)]
tempfix 'Anonymous player' -> '???' until it's translatable
terencehill [Thu, 8 Jun 2023 16:07:18 +0000 (18:07 +0200)]
Survival: refactor survival status networking to avoid sending hunter statuses to survivors
terencehill [Thu, 8 Jun 2023 15:36:19 +0000 (17:36 +0200)]
Survival: don't show personal colors of players joining mid-round in the scoreboard
terencehill [Thu, 8 Jun 2023 15:28:35 +0000 (17:28 +0200)]
Survival, FT and CA: show eliminated players as soon as a player connects
LegendaryGuard [Wed, 7 Jun 2023 11:08:15 +0000 (11:08 +0000)]
Fix #2840, now Invisible and Speed 2d icon powerups are visible when aren't available to pick up
LegendaryGuard [Tue, 6 Jun 2023 19:44:56 +0000 (19:44 +0000)]
Merge branch 'drjaska/muteban-to-chatban' into 'master'
Rename muteban to chatban, left muteban aliases for chatban
See merge request xonotic/xonotic-data.pk3dir!1193
Dr. Jaska [Tue, 6 Jun 2023 19:44:56 +0000 (19:44 +0000)]
Rename muteban to chatban, left muteban aliases for chatban
terencehill [Tue, 6 Jun 2023 17:46:04 +0000 (17:46 +0000)]
Merge branch 'Juhu/bot_weapcomplain' into 'master'
Fix bots selecting invalid weapons
See merge request xonotic/xonotic-data.pk3dir!1186
Juhu [Sun, 4 Jun 2023 03:00:18 +0000 (05:00 +0200)]
try initial bot weapon selection only at join/reset instead of repeatedly in think, prevents spammed weapon switching attempts if the bot has no weapons
Juhu [Mon, 5 Jun 2023 19:47:24 +0000 (21:47 +0200)]
Revert "Give bots a weapon on map reset"
This reverts commit
4f7fbf82a607dbab329b793c527f59229acfd113 .
Juhu [Mon, 5 Jun 2023 19:47:15 +0000 (21:47 +0200)]
Revert "Campaign: give bots a weapon on map start"
This reverts commit
c2858527e0fd55a4a9b033af062aa505ee26e0f2 .
Juhu [Sun, 4 Jun 2023 00:45:24 +0000 (02:45 +0200)]
add missing bot check in weapon complain code
terencehill [Mon, 5 Jun 2023 17:09:40 +0000 (17:09 +0000)]
Merge branch 'drjaska/invalid-sv_vote_gametype_options' into 'master'
Fixed `sv_vote_gametype_options` so that it defaults to the current gametype if it has no valid gametypes.
See merge request xonotic/xonotic-data.pk3dir!1190
Dr. Jaska [Sun, 4 Jun 2023 19:30:42 +0000 (19:30 +0000)]
Merge branch 'terencehill/mapvote_fix' into 'master'
Fixed many crashes in map voting screen related to gametypes with low amount of supported maps.
See merge request xonotic/xonotic-data.pk3dir!1188
terencehill [Sun, 4 Jun 2023 19:30:40 +0000 (19:30 +0000)]
Fixed many crashes in map voting screen related to gametypes with low amount of supported maps.
drjaska [Sun, 4 Jun 2023 14:11:32 +0000 (17:11 +0300)]
if sv_vote_gametype_options has no valid gametypes, default to current one
terencehill [Sun, 4 Jun 2023 12:19:43 +0000 (14:19 +0200)]
Fix powerup waypoint stuck at '0 0 0' when a powerup is dropped inside a NODROP zone (e.g. the pit below the Shield of arcanecitadel)
bones_was_here [Sat, 3 Jun 2023 18:01:22 +0000 (04:01 +1000)]
Fix trigger_push and trigger_impulse prediction
It's a bit awkward that some triggers require the model field unset and
others require it unchanged, so rather than having duplicated code that
restores it after it was unset, an argument is added to control that
behaviour.
This should have been included in
2b46f62db61e8ca869fc591d9ebe4053c3e876d7
and/or
0f843f8c9e7891ba3029ac5a18c6ebebde3a30da
See also: https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2838
drjaska [Sat, 3 Jun 2023 12:11:28 +0000 (15:11 +0300)]
whitelist g_ca_prevent_stalemate based on unanimous council poll
bones_was_here [Sat, 3 Jun 2023 07:57:02 +0000 (17:57 +1000)]
Fix indenting in qcsrc/client/items/items.qc
Rudolf Polzer [Sat, 3 Jun 2023 05:23:08 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Fri, 2 Jun 2023 23:00:57 +0000 (01:00 +0200)]
Map vote screen: fix abstain vote shown over the winner map
terencehill [Fri, 2 Jun 2023 21:31:37 +0000 (23:31 +0200)]
Optimize maplist shuffle algorithm by reducing the number of strcats
Nick S [Fri, 2 Jun 2023 16:24:57 +0000 (19:24 +0300)]
Fix crylink merge
Nick S [Fri, 2 Jun 2023 16:19:56 +0000 (19:19 +0300)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Nick S [Fri, 2 Jun 2023 16:19:41 +0000 (19:19 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Juhu [Fri, 2 Jun 2023 13:43:25 +0000 (15:43 +0200)]
Merge branch 'master' into Juhu/velocity_pads
make trigger_push_velocity code compatible with the latest ExactTrigger changes
terencehill [Fri, 2 Jun 2023 07:40:48 +0000 (07:40 +0000)]
Merge branch 'Juhu/strafehud-centerline' into 'master'
Remove the center panel button in the strafehud hud editor dialog
See merge request xonotic/xonotic-data.pk3dir!1182
Nick S [Thu, 1 Jun 2023 19:08:54 +0000 (22:08 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Rudolf Polzer [Thu, 1 Jun 2023 05:23:10 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Thu, 1 Jun 2023 03:43:35 +0000 (03:43 +0000)]
Merge branch 'z411/double_announcer_fix' into 'master'
Fix "prepare for battle" playing twice on round-based modes
See merge request xonotic/xonotic-data.pk3dir!1185
z411 [Thu, 1 Jun 2023 03:43:34 +0000 (03:43 +0000)]
Fix "prepare for battle" playing twice on round-based modes
z411 [Wed, 31 May 2023 23:34:48 +0000 (23:34 +0000)]
Merge branch 'terencehill/misc_stuff' into 'master'
Useful tools for debugging
See merge request xonotic/xonotic-data.pk3dir!1152
terencehill [Wed, 31 May 2023 23:34:47 +0000 (23:34 +0000)]
Useful tools for debugging
Juhu [Wed, 31 May 2023 17:42:18 +0000 (19:42 +0200)]
strafehud: use makeXonoticCheckBox instead of makeXonoticCheckBoxString
drjaska [Wed, 31 May 2023 16:19:26 +0000 (19:19 +0300)]
make return values of int havocbot_checkdanger unique
Rudolf Polzer [Wed, 31 May 2023 05:23:14 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Wed, 31 May 2023 02:50:58 +0000 (02:50 +0000)]
Merge branch 'Juhu/onslaught_solidnot_fix' into 'master'
Area grid linking fixes for DP master
See merge request xonotic/xonotic-data.pk3dir!1183
Juhu [Wed, 31 May 2023 02:50:58 +0000 (02:50 +0000)]
Area grid linking fixes for DP master
bones_was_here [Wed, 31 May 2023 02:48:42 +0000 (02:48 +0000)]
Merge branch 'drjaska/sync-bal-wep-mario' into 'master'
sync 2 vanilla changes to Mario's balance as per their preference
See merge request xonotic/xonotic-data.pk3dir!1171
bones_was_here [Wed, 31 May 2023 02:46:56 +0000 (02:46 +0000)]
Merge branch 'bones_was_here/ladderfix' into 'master'
func_ladder: restore the model string unset in WarpZoneLib_ExactTrigger_Init()
Closes #2838
See merge request xonotic/xonotic-data.pk3dir!1184
bones_was_here [Wed, 31 May 2023 02:42:47 +0000 (12:42 +1000)]
pipeline: update hash, it was changed by
d6fe1d381e4530b5438c7bd49b41ce2151077901