]>
de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Thu, 31 Aug 2023 07:04:13 +0000 (07:04 +0000)]
Merge branch 'bones_was_here/csqc_bmodels' into 'master'
triggers: set bmodel correctly in CSQC
See merge request xonotic/xonotic-data.pk3dir!1237
Rudolf Polzer [Mon, 28 Aug 2023 05:23:19 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 27 Aug 2023 09:08:40 +0000 (11:08 +0200)]
Minigames: apply panel alpha to highlights too
bones_was_here [Sat, 26 Aug 2023 11:54:18 +0000 (21:54 +1000)]
triggers: set bmodel correctly in CSQC
Previously the .model field would be (for example) "*2" in SVQC but ""
in CSQC. This change makes it "*2" in both.
Rudolf Polzer [Sat, 26 Aug 2023 05:23:17 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Tue, 22 Aug 2023 03:20:20 +0000 (03:20 +0000)]
Merge branch 'Mario/mehrdad08_spectatorlist' into 'master'
Implement C4 and TTT minigame spectator list by mehrdad dowlatabadi
See merge request xonotic/xonotic-data.pk3dir!1099
Mario [Tue, 22 Aug 2023 03:20:20 +0000 (03:20 +0000)]
Implement C4 and TTT minigame spectator list by mehrdad dowlatabadi
terencehill [Fri, 18 Aug 2023 22:31:25 +0000 (22:31 +0000)]
Merge branch 'drjaska/rounds_pl' into 'master'
Fix "rounds played" scoreboard column showing up in DM in the layout with all columns
See merge request xonotic/xonotic-data.pk3dir!1206
Dr. Jaska [Fri, 18 Aug 2023 22:31:25 +0000 (22:31 +0000)]
Fix "rounds played" scoreboard column showing up in DM in the layout with all columns
bones_was_here [Sun, 13 Aug 2023 11:41:15 +0000 (21:41 +1000)]
Small optimisation in WarpZone_Touch()
Cheap early-out checks should be performed before expensive checks to
avoid wasting CPU.
terencehill [Sun, 13 Aug 2023 09:02:53 +0000 (11:02 +0200)]
Small optimization to the damage code
Hash changed due to extremely small difference in the final amount of damage dealt in the bot match (max difference < 0.0012)
Rudolf Polzer [Sun, 13 Aug 2023 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sat, 12 Aug 2023 22:15:59 +0000 (00:15 +0200)]
Update hash
terencehill [Sat, 12 Aug 2023 21:42:19 +0000 (23:42 +0200)]
Fix #2859 "Explosions do not go through warpzones"
Rudolf Polzer [Thu, 10 Aug 2023 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Wed, 9 Aug 2023 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 8 Aug 2023 16:36:27 +0000 (18:36 +0200)]
Revert "Don't enable status effects that would end one frame after their creation, e.g. spawnshield if g_spawnshieldtime is 0"
This reverts commit
3c645bcaa1b862088ce7a2b20ed5d1e90fdc7a3f .
terencehill [Tue, 8 Aug 2023 13:01:51 +0000 (15:01 +0200)]
Don't enable status effects that would end one frame after their creation, e.g. spawnshield if g_spawnshieldtime is 0
terencehill [Tue, 8 Aug 2023 12:11:46 +0000 (14:11 +0200)]
Further improve onspawn nade refiring
Rudolf Polzer [Tue, 8 Aug 2023 05:23:13 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 7 Aug 2023 20:22:56 +0000 (20:22 +0000)]
Merge branch 'darkblue/nades_onspawn_fix' into 'master'
Nades: Improved onspawn nade refiring
See merge request xonotic/xonotic-data.pk3dir!1227
Dark Blue [Mon, 7 Aug 2023 16:46:01 +0000 (19:46 +0300)]
Nades: Improved onspawn nade refiring
LegendaryGuard [Sat, 5 Aug 2023 09:46:58 +0000 (11:46 +0200)]
Wrap all status and bitflag checks with parentesis to avoid possible obscure bugs
Rudolf Polzer [Sat, 5 Aug 2023 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
LegendaryGuard [Fri, 4 Aug 2023 23:07:08 +0000 (01:07 +0200)]
Wrap some statuses with parentesis to avoid possible obscure bugs
LegendaryGuard [Fri, 4 Aug 2023 18:12:54 +0000 (18:12 +0000)]
Merge branch 'bones_was_here/r_font_compress' into 'master'
Compress font textures to save VRAM at low graphics settings
See merge request xonotic/xonotic-data.pk3dir!1226
LegendaryGuard [Fri, 4 Aug 2023 18:06:31 +0000 (18:06 +0000)]
Merge branch 'bones_was_here/func_door' into 'master'
func_door and func_plat fixes and Q3 compatibility
Closes #2744
See merge request xonotic/xonotic-data.pk3dir!1083
bones_was_here [Fri, 4 Aug 2023 18:06:31 +0000 (18:06 +0000)]
func_door and func_plat fixes and Q3 compatibility
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
bones_was_here [Mon, 31 Jul 2023 11:02:52 +0000 (21:02 +1000)]
Compress font textures to save VRAM at low graphics settings
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