]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Fri, 15 Dec 2023 23:58:25 +0000 (00:58 +0100)]
Apply voted game type on map switch, not on game type vote end so that the "restart" command, if called, properly restarts the map applying the current game type
Rudolf Polzer [Mon, 11 Dec 2023 06:23:30 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 9 Dec 2023 06:23:32 +0000 (07:23 +0100)]
Transifex autosync
Dr. Jaska [Wed, 6 Dec 2023 11:19:23 +0000 (11:19 +0000)]
Merge branch 'drjaska/shotorigincleanup' into 'master'
Allow for negative z offsets for shot origin
See merge request xonotic/xonotic-data.pk3dir!1253
Rudolf Polzer [Mon, 4 Dec 2023 06:24:04 +0000 (07:24 +0100)]
Transifex autosync
drjaska [Mon, 27 Nov 2023 23:04:12 +0000 (01:04 +0200)]
cleanup and a few comments
Rudolf Polzer [Fri, 1 Dec 2023 06:23:25 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Tue, 21 Nov 2023 06:23:28 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sun, 19 Nov 2023 06:23:24 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 18 Nov 2023 06:23:52 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sun, 12 Nov 2023 06:23:26 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Sat, 11 Nov 2023 17:11:51 +0000 (18:11 +0100)]
Don't allow negative values for the y component of the shot origin offset because the gun can't be aligned to the left by default. Thanks to this change it's possible to restore precision of the y and z components back to 0.25
terencehill [Fri, 10 Nov 2023 17:59:58 +0000 (18:59 +0100)]
Allow negative values for the shot origin offset vector. This change reduces precision of the y and z components from 0.25 to 0.5
bones_was_here [Thu, 9 Nov 2023 05:44:23 +0000 (05:44 +0000)]
Merge branch 'Juhu/velocity_pads_cleanup2' into 'master'
Move trigger_push_velocity last_pushed code out of StartFrame()
See merge request xonotic/xonotic-data.pk3dir!1251
Juhu [Wed, 8 Nov 2023 18:22:52 +0000 (19:22 +0100)]
move trigger_push_velocity's last_pushed check, StartFrame() should not run jump pad physics code
Dr. Jaska [Wed, 8 Nov 2023 01:19:29 +0000 (01:19 +0000)]
Merge branch 'Juhu/target_print' into 'master'
q3compat: add support for the target_print entity
See merge request xonotic/xonotic-data.pk3dir!1141
Dr. Jaska [Wed, 8 Nov 2023 01:17:09 +0000 (01:17 +0000)]
Merge branch 'drjaska/damage-center-player-origin' into 'master'
Added an inactive gameplay cvar for using the own shot origin or centers of other players' bboxes for force direction calculations
See merge request xonotic/xonotic-data.pk3dir!1215
Dr. Jaska [Wed, 8 Nov 2023 01:17:09 +0000 (01:17 +0000)]
Added an inactive gameplay cvar for using the own shot origin or centers of other players' bboxes for force direction calculations
Dr. Jaska [Sun, 5 Nov 2023 17:50:33 +0000 (17:50 +0000)]
Merge branch 'drjaska/damagetext' into 'master'
Refactor damagetext to use a new linked list instead of proximity search and fix 2D and 3D damagetexts not accumulating
Closes #2861
See merge request xonotic/xonotic-data.pk3dir!1235
Dr. Jaska [Sun, 5 Nov 2023 17:50:33 +0000 (17:50 +0000)]
Refactor damagetext to use a new linked list instead of proximity search and fix 2D and 3D damagetexts not accumulating
terencehill [Sun, 29 Oct 2023 19:14:05 +0000 (19:14 +0000)]
Merge branch 'Juhu/velocity_pads_cleanup' into 'master'
Move trigger_push_velocity last_pushed code out of execute_next_frame()
See merge request xonotic/xonotic-data.pk3dir!1217
Juhu [Sun, 29 Oct 2023 19:14:05 +0000 (19:14 +0000)]
Move trigger_push_velocity last_pushed code out of execute_next_frame()
terencehill [Fri, 27 Oct 2023 08:38:20 +0000 (08:38 +0000)]
Merge branch 'bones_was_here/sv_autopause_intermission' into 'master'
sv_autopause: don't pause during intermission, unpause on endmatch command
Closes #2880
See merge request xonotic/xonotic-data.pk3dir!1246
Rudolf Polzer [Mon, 23 Oct 2023 05:24:36 +0000 (07:24 +0200)]
Transifex autosync
Rudolf Polzer [Tue, 17 Oct 2023 05:23:28 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Thu, 5 Oct 2023 15:16:46 +0000 (01:16 +1000)]
sv_autopause: don't pause during intermission, unpause on endmatch command
Rudolf Polzer [Sun, 1 Oct 2023 05:25:05 +0000 (07:25 +0200)]
Transifex autosync
bones_was_here [Fri, 29 Sep 2023 05:13:49 +0000 (15:13 +1000)]
g_maxplayers -1: when rounding to a team multiple, go down at the midpoint
It seems a 5 players max DM map is more likely to suit 2v2 TDM/FT than 3v3.
It will still round up to 6 if there's 3 teams.
Also catches misconfigurations with g_maxplayers -1 and no teams.
Changes to more meaningful var names.
bones_was_here [Thu, 21 Sep 2023 21:52:15 +0000 (07:52 +1000)]
Explicitly enable sv_gameplayfix_unstickplayers
Xonotic's QC physics still depend on this cvar, but the feature is
deprecated in current DP.
bones_was_here [Mon, 18 Sep 2023 00:29:45 +0000 (00:29 +0000)]
Merge branch 'terencehill/load_fonts_once' into 'master'
Fix #2878 "Client startup executes font-xolonium.cfg twice"
Closes #2878
See merge request xonotic/xonotic-data.pk3dir!1243
terencehill [Sat, 16 Sep 2023 13:44:48 +0000 (15:44 +0200)]
Fix #2878 "Client startup executes font-xolonium.cfg twice"
bones_was_here [Fri, 15 Sep 2023 17:15:12 +0000 (03:15 +1000)]
Fix sticky electro orbs and mines being unhittable on DP master
The moving projectiles are configured correctly but when they touch a
surface they're deleted and replaced with a sticky projectile.
Those weren't configured to be hittable directly, and weren't linked to
the area grid so findradius couldn't find them for splash damage.
bones_was_here [Fri, 15 Sep 2023 05:45:26 +0000 (15:45 +1000)]
Cleanups following
ff0befb7d2c673b926cbc9bf0bbf8a1e07f2aff6 and
9d63bcaed353f093ad6297774e08c979a0135776
Some of those changes were superfluous (not required by CONTRIBUTING.md)
or didn't fix existing issues.
bones_was_here [Fri, 15 Sep 2023 06:56:02 +0000 (16:56 +1000)]
Revert "Merge branch 'bones_was_here/func_door' into 'master'"
This reverts commit
8195181f4a0c5384bbb58d3029b86333c8f39dde , reversing
changes made to
39fafd26f46f8050cfe82aaa1ef76b3a5c9dbb3f .
IE reverts https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1083
which was squash merged so the bad commit can't be reverted separately,
instead a new MR will replace it.
Fixes #2876
Rudolf Polzer [Fri, 15 Sep 2023 05:26:30 +0000 (07:26 +0200)]
Transifex autosync
Rudolf Polzer [Wed, 6 Sep 2023 05:23:10 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 3 Sep 2023 16:35:15 +0000 (16:35 +0000)]
Merge branch 'drjaska/menu-music' into 'master'
re-allow main menu to play music when coming back to it
Closes #2866
See merge request xonotic/xonotic-data.pk3dir!1240
Dr. Jaska [Sun, 3 Sep 2023 16:35:14 +0000 (16:35 +0000)]
re-allow main menu to play music when coming back to it
bones_was_here [Fri, 1 Sep 2023 10:32:35 +0000 (20:32 +1000)]
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