]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Wed, 2 Aug 2023 16:33:13 +0000 (16:33 +0000)]
Merge branch 'AriosJentu/ItemsRespTimeSep' into 'master'
Separate health and armor item respawning timers
See merge request xonotic/xonotic-data.pk3dir!1125
Arios Jentu [Wed, 2 Aug 2023 16:33:13 +0000 (16:33 +0000)]
Separate health and armor item respawning timers
Rudolf Polzer [Wed, 2 Aug 2023 05:23:14 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Tue, 1 Aug 2023 05:23:15 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Fri, 28 Jul 2023 18:05:13 +0000 (20:05 +0200)]
Optimize a couple checks, sort notifications in all.inc
Rudolf Polzer [Fri, 28 Jul 2023 05:23:15 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Mon, 24 Jul 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 23 Jul 2023 08:17:47 +0000 (08:17 +0000)]
Merge branch 'bones_was_here/svqc_itemfixes' into 'master'
Items fixes and refactoring
Closes #2857
See merge request xonotic/xonotic-data.pk3dir!1222
Rudolf Polzer [Sun, 23 Jul 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sat, 22 Jul 2023 15:04:32 +0000 (17:04 +0200)]
Fix #2814 "trigger_push division by zero errors when starting map AMT-Freestyle6". Also fix a warning on the same map when a door squashes the player
bones_was_here [Sat, 22 Jul 2023 09:25:53 +0000 (19:25 +1000)]
Update dpdefs/upstream
bones_was_here [Fri, 21 Jul 2023 09:03:02 +0000 (09:03 +0000)]
Merge branch 'bones_was_here/removeitem' into 'master'
items: only draw the removal effect when appropriate
Closes #2849
See merge request xonotic/xonotic-data.pk3dir!1216
bones_was_here [Fri, 21 Jul 2023 08:57:27 +0000 (18:57 +1000)]
items: only draw the removal effect when appropriate
Sends an extra update that triggers the effect prior to removal.
Currently only used for loot items when picked up or touching void.
Fixes #2849
without reverting to the old way of sending the effect in SVQC which
caused every player to receive it even if they couldn't see the item,
and without the expense of additional culling.
Changes the pipeline hash because g_powerups_drop_ondeath is enabled by
default and bots remove an item from their goals immediately if it's
deleted, but if it still exists (for 1-2 frames in this case) they only
remove it if it's in their PVS.
bones_was_here [Fri, 21 Jul 2023 08:44:10 +0000 (18:44 +1000)]
Update dpdefs/upstream
Rudolf Polzer [Fri, 21 Jul 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Thu, 20 Jul 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Wed, 19 Jul 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Sun, 16 Jul 2023 14:29:12 +0000 (00:29 +1000)]
instagib: optimise item replacement
bones_was_here [Tue, 4 Jul 2023 12:26:24 +0000 (22:26 +1000)]
powerups: fix #2857 and move g_powerups cvar out of server/items/items.qc
This sets ITEM_FLAG_NORMAL initially and adds ITEM_FLAG_MUTATORBLOCKED
about as late as possible: must be done after mapinfo settemps are
applied, see
b95beb262077d8f733bbee7cb0d5f4c05b7b3e2f
and before StartItem() calls have_pickup_item().
Moves a little more powerup-specific code out of common code.
Removes some default powerup balance settings which don't need to be in QC.
Clarifies var naming inside powerup m_iteminit() funcs.
bones_was_here [Sun, 16 Jul 2023 09:10:14 +0000 (19:10 +1000)]
items: call FilterItem mutator hook earlier as it may change almost anything
such as the pickup sound (new toys).
Documents what FilterItem may and may not do.
Allows mutators to override the pickup model, consistent with being able
to override the sound.
Reduces code duplication.
bones_was_here [Tue, 4 Jul 2023 12:29:16 +0000 (22:29 +1000)]
items: clean up some more unnecessary locals in StartItem()
bones_was_here [Sun, 16 Jul 2023 07:30:37 +0000 (17:30 +1000)]
items: warn instead of crashing if spawned with no pickup sound set
Fixes null ptr deref when starting map dfwc2017-6, which was made easy
to trigger by
5606e7035655b105545cc7fbcbffa96e653b4e82
bones_was_here [Tue, 4 Jul 2023 12:28:00 +0000 (22:28 +1000)]
items: merge _StartItem() and StartItem(), warn instead of crashing if defaultrespawntime not set
Null ptr deref is a pain to debug.
LegendaryGuard [Sun, 16 Jul 2023 00:19:29 +0000 (02:19 +0200)]
Refine default value for bgmvolume (1 to 0.75) instead refining the mastervolume (triggers all mixers)
LegendaryGuard [Sat, 15 Jul 2023 23:25:46 +0000 (01:25 +0200)]
Fix #2858 (missing quote) and don't refine default value for master volume for personal customizations, customize this config yourself, not here, please
terencehill [Sat, 15 Jul 2023 15:24:05 +0000 (17:24 +0200)]
Allow customizing the amount of saturation of the color applied on top of waypoint icons
bones_was_here [Sat, 15 Jul 2023 12:11:29 +0000 (22:11 +1000)]
Update dpdefs/upstream
Rudolf Polzer [Wed, 12 Jul 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 11 Jul 2023 22:10:49 +0000 (22:10 +0000)]
Merge branch 'drjaska/balance-council' into 'master'
Implemented 3 Balance Council votes
See merge request xonotic/xonotic-data.pk3dir!1204
Dr. Jaska [Tue, 11 Jul 2023 22:10:49 +0000 (22:10 +0000)]
Implemented 3 Balance Council votes
Rudolf Polzer [Tue, 11 Jul 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync
LegendaryGuard [Mon, 10 Jul 2023 15:16:16 +0000 (17:16 +0200)]
Fix typo mistake on NADE_TYPE_DARKNESS, correct some indentations again and, in oknex.qc, replace comment lines into #if 0 block
LegendaryGuard [Mon, 10 Jul 2023 14:49:42 +0000 (16:49 +0200)]
Refactor registered NADE_TYPE_DARK into NADE_TYPE_DARKNESS and correct some indentations
LegendaryGuard [Mon, 10 Jul 2023 13:34:26 +0000 (15:34 +0200)]
Refactor Dark nade into Darkness nade and remove nade_green effects that could be used in the future
Rudolf Polzer [Mon, 10 Jul 2023 05:23:17 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 9 Jul 2023 23:22:04 +0000 (01:22 +0200)]
Fix cl_nade_type description; remove a dangling semicolon from a macro
LegendaryGuard [Sun, 9 Jul 2023 21:41:50 +0000 (21:41 +0000)]
Merge branch 'LegendaryGuard/armorizing_and_dark_nades' into 'master'
New features: Ammo and Darkness nades. Improve nades. Fix turrets target and when Tesla turret owner's friend attacks against owner
See merge request xonotic/xonotic-data.pk3dir!876
LegendaryGuard [Sun, 9 Jul 2023 21:41:50 +0000 (21:41 +0000)]
New features: Ammo and Darkness nades. Improve nades. Fix turrets target and when Tesla turret owner's friend attacks against owner
terencehill [Sun, 9 Jul 2023 08:39:26 +0000 (10:39 +0200)]
Fix #2850 "xonotic crashes when pressing restart level after match end in campaign"
Rudolf Polzer [Sun, 9 Jul 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
drjaska [Fri, 7 Jul 2023 08:16:04 +0000 (11:16 +0300)]
Fixed whitespace consistency (spaces -> tabs) in qcsrc/server/main.qc
Dr. Jaska [Mon, 3 Jul 2023 03:26:51 +0000 (03:26 +0000)]
Merge branch 'drjaska/balance/crylink' into 'master'
Crylink balance change as a bandaid fix to remove falloff from splash damage
See merge request xonotic/xonotic-data.pk3dir!883
Dr. Jaska [Mon, 3 Jul 2023 03:26:51 +0000 (03:26 +0000)]
Crylink balance change as a bandaid fix to remove falloff from splash damage
drjaska [Sat, 1 Jul 2023 15:27:30 +0000 (18:27 +0300)]
Revert "Revert a change that shouldn't have been merged during release freeze"
This reverts commit
47864db6f1d9b2aa84e9a3abf01f8b7fd46beb15 .
bones_was_here [Sat, 1 Jul 2023 09:33:56 +0000 (09:33 +0000)]
Merge branch 'bones_was_here/items_svqc' into 'master'
Add a more optimised and generic function to initialise items (loot or permanent)
See merge request xonotic/xonotic-data.pk3dir!1211
Rudolf Polzer [Sat, 1 Jul 2023 05:23:13 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Fri, 30 Jun 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Wed, 28 Jun 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Tue, 27 Jun 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync
z411 [Tue, 27 Jun 2023 03:56:32 +0000 (03:56 +0000)]
Merge branch 'Juhu/velocity_pads' into 'master'
velocity pads
Closes #2105
See merge request xonotic/xonotic-data.pk3dir!1137
Juhu [Tue, 27 Jun 2023 03:56:31 +0000 (03:56 +0000)]
Velocity pads
terencehill [Mon, 26 Jun 2023 18:03:46 +0000 (18:03 +0000)]
Merge branch 'darkblue/monsters_team_cvar_default' into 'master'
Monsters: enable g_monsters_teams by default, preventing monsters from targeting teammates
See merge request xonotic/xonotic-data.pk3dir!1214
Rudolf Polzer [Sun, 25 Jun 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Sat, 24 Jun 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
darkblue0 [Thu, 22 Jun 2023 16:53:55 +0000 (19:53 +0300)]
Added g_monsters_teams cvar to monsters.cfg
z411 [Fri, 23 Jun 2023 01:29:33 +0000 (01:29 +0000)]
Merge branch 'Spike29/rulesetxpm' into 'master'
Small cleanups to the XPM ruleset config
See merge request xonotic/xonotic-data.pk3dir!1213
SpiKe [Fri, 23 Jun 2023 01:29:33 +0000 (01:29 +0000)]
Small cleanups to the XPM ruleset config
LegendaryGuard [Thu, 22 Jun 2023 11:13:41 +0000 (11:13 +0000)]
Merge branch 'LegendaryGuard/fix_playban_notif' into 'master'
Remove unnecessary details in playban notification
See merge request xonotic/xonotic-data.pk3dir!1199
LegendaryGuard [Thu, 22 Jun 2023 11:13:40 +0000 (11:13 +0000)]
Remove unnecessary details in playban notification
Rudolf Polzer [Thu, 22 Jun 2023 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Sun, 18 Jun 2023 22:54:03 +0000 (08:54 +1000)]
Convert 5 trivial Item_* functions to macros
bones_was_here [Mon, 19 Jun 2023 01:50:18 +0000 (11:50 +1000)]
Remove redundant Item_* functions
bones_was_here [Sun, 18 Jun 2023 22:18:23 +0000 (08:18 +1000)]
overkill: optimise replacement of powerups with superweapons
We can use the itemdefs to skip the classname search.
bones_was_here [Sun, 18 Jun 2023 22:17:42 +0000 (08:17 +1000)]
RandomItems mutator: simplify item initialisation using new function
bones_was_here [Mon, 19 Jun 2023 01:46:38 +0000 (11:46 +1000)]
powerups: optimise loot item spawning
We can use the itemdef to skip the classname search, and we don't need
the netname search either since we already have a jump table.
bones_was_here [Sun, 18 Jun 2023 22:13:58 +0000 (08:13 +1000)]
overkill: optimise loot item mutator hooks
No need to delete an item then spawn it again, and we can use the
itemdef to skip the classname search.
bones_was_here [Sun, 18 Jun 2023 22:12:43 +0000 (08:12 +1000)]
monsters: use generic item initialisation when dropping loot
Fixes monster loot sending no updates to CSQC and lacking despawn
effects.
bones_was_here [Mon, 19 Jun 2023 01:04:31 +0000 (11:04 +1000)]
Add a more optimised and generic function to initialise items (loot or permanent)
It's faster when an itemdef is provided, which avoids a classname search.
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