]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
drjaska [Fri, 31 May 2024 00:15:23 +0000 (03:15 +0300)]
Merge branch 'master' into drjaska/g_cts_cptimes_onlyself
Dr. Jaska [Thu, 30 May 2024 20:46:47 +0000 (20:46 +0000)]
Merge branch 'drjaska/print-race-splits' into 'master'
Show racetimer's Race/CTS checkpoint splits in console
See merge request xonotic/xonotic-data.pk3dir!1286
Dr. Jaska [Thu, 30 May 2024 20:46:47 +0000 (20:46 +0000)]
Show racetimer's Race/CTS checkpoint splits in console
Rudolf Polzer [Thu, 30 May 2024 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Wed, 29 May 2024 22:04:49 +0000 (22:04 +0000)]
Merge branch 'drjaska/fix-race-spectating' into 'master'
Fix spectators not seeing race timer if they start to spectate someone during their lap
See merge request xonotic/xonotic-data.pk3dir!1285
Dr. Jaska [Wed, 29 May 2024 22:04:48 +0000 (22:04 +0000)]
Fix spectators not seeing race timer if they start to spectate someone during their lap
Rudolf Polzer [Wed, 29 May 2024 05:23:13 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 28 May 2024 23:06:20 +0000 (01:06 +0200)]
When scoreboard is shown in UI or team selection mode darken the background so that it's easier to tell these modes from the normal scoreboard.
Unfortunately it's not possible to darken chat and console notifications too because they are drawn by the engine after the CSQC HUD
terencehill [Tue, 28 May 2024 23:03:42 +0000 (23:03 +0000)]
Merge branch 'terencehill/scoreboard_team_selection' into 'master'
Make scoreboard team selection default even in pre-0.8.6 configs
See merge request xonotic/xonotic-data.pk3dir!1276
Rudolf Polzer [Tue, 28 May 2024 05:23:10 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Mon, 27 May 2024 17:05:56 +0000 (17:05 +0000)]
Merge branch 'drjaska/g_warmup_allguns' into 'master'
Fix g_warmup_allguns to work as its description says
Closes #2743
See merge request xonotic/xonotic-data.pk3dir!1280
Dr. Jaska [Mon, 27 May 2024 17:05:56 +0000 (17:05 +0000)]
Fix g_warmup_allguns to work as its description says
drjaska [Mon, 27 May 2024 13:16:45 +0000 (16:16 +0300)]
Merge branch 'master' into drjaska/g_cts_cptimes_onlyself
bones_was_here [Sat, 18 May 2024 11:38:05 +0000 (21:38 +1000)]
Fix GetField_fullspawndata sometimes taking the wrong code path
When the optional parameter wasn't passed, uninitialised data was read,
which caused door linking to fail on some Q3 maps.
Signed-off-by: bones_was_here <bones_was_here@xonotic.au>
Dr. Jaska [Mon, 27 May 2024 09:19:46 +0000 (09:19 +0000)]
Merge branch 'drjaska/cl_race_cptimes_onlyself' into 'master'
Fix own checkpoint improvements not being displayed while there is a better time by someone else
Closes #2891
See merge request xonotic/xonotic-data.pk3dir!1279
Dr. Jaska [Mon, 27 May 2024 09:19:46 +0000 (09:19 +0000)]
Fix own checkpoint improvements not being displayed while there is a better time by someone else
drjaska [Mon, 27 May 2024 09:08:11 +0000 (12:08 +0300)]
rename g_cts_cptimes_onlyself -> g_race_cptimes_onlyself
drjaska [Mon, 27 May 2024 08:32:49 +0000 (11:32 +0300)]
Fix Morosophos' code
source: https://gitlab.com/xonotic/xonotic-data.pk3dir/-/commit/
f6a061a6b48a605ff5c11058b4b1cc2462c5f607
Rudolf Polzer [Mon, 27 May 2024 05:23:13 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 26 May 2024 23:35:28 +0000 (01:35 +0200)]
Fix color code in a new message
Rudolf Polzer [Sun, 26 May 2024 05:23:13 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Sat, 25 May 2024 11:10:20 +0000 (11:10 +0000)]
Merge branch 'bones_was_here/monsterstuff' into 'master'
Improve monster behaviour
Closes #1657, #2645, and #2705
See merge request xonotic/xonotic-data.pk3dir!1266
bones_was_here [Sat, 25 May 2024 11:09:54 +0000 (11:09 +0000)]
Merge branch 'z411/team_queue' into 'master'
Create queue system to prevent team imbalance in teamplay
See merge request xonotic/xonotic-data.pk3dir!1093
z411 [Sat, 25 May 2024 11:09:54 +0000 (11:09 +0000)]
Create queue system to prevent team imbalance in teamplay
terencehill [Sat, 25 May 2024 09:11:22 +0000 (09:11 +0000)]
Merge branch 'terencehill/drawstring_aspect_fix' into 'master'
Fix sometimes wrong horizontal alignment of some messages in the HUD
See merge request xonotic/xonotic-data.pk3dir!1274
terencehill [Fri, 24 May 2024 20:05:02 +0000 (20:05 +0000)]
Merge branch 'terencehill/match_end_restore_status' into 'master'
Survival and CA: when the game ends restore previous player status
See merge request xonotic/xonotic-data.pk3dir!1272
terencehill [Fri, 24 May 2024 20:05:02 +0000 (20:05 +0000)]
Survival and CA: when the game ends put players who joined after last round start back to spectators. CA: when the game ends put players who switched team during the last round back to previous team.
Forced team switch works even if player would be moved to a larger team and if g_balance_teams and g_balance_teams_prevent_imbalance are enabled
terencehill [Fri, 24 May 2024 19:44:03 +0000 (19:44 +0000)]
Merge branch 'terencehill/autoscreenshot_improvements' into 'master'
Make autoscreenshot more reliable
See merge request xonotic/xonotic-data.pk3dir!1265
terencehill [Fri, 24 May 2024 18:12:51 +0000 (18:12 +0000)]
Merge branch 'terencehill/damagetext_stuff' into 'master'
Fix damagetext not stopping damage accumulation after enemy's death and optimize damagetext code when player is hit by multiple projectiles at the same time
See merge request xonotic/xonotic-data.pk3dir!1277
terencehill [Fri, 24 May 2024 17:18:44 +0000 (19:18 +0200)]
Autoscreenshot: allow screenshots to be taken for old clients connected to new servers too (screenshots are taken in the old way, without hiding other UI parts but with 0.1s delay instead of 0.8s)
terencehill [Wed, 22 May 2024 22:20:26 +0000 (00:20 +0200)]
Autoscreenshot: write the actual match ID in the screenshot name so that it's possible to find the match in Xonstats too
terencehill [Wed, 22 May 2024 21:55:25 +0000 (23:55 +0200)]
Make autoscreenshot more reliable by making sure scoreboard is not obstructed by anything else (menu, console, etc...).
Screenshot is taken 0.2 seconds after game ends instead of 0.8 (server-side 0.1s delay + client-side 0.1s delay)
terencehill [Tue, 21 May 2024 21:39:28 +0000 (21:39 +0000)]
Merge branch 'terencehill/minigame_flood_control' into 'master'
Minigames: apply flood control only to common minigame commands
Closes #2846
See merge request xonotic/xonotic-data.pk3dir!1229
Dr. Jaska [Tue, 21 May 2024 18:50:21 +0000 (18:50 +0000)]
Merge branch 'drjaska/falloffcvars' into 'master'
Add damage and force falloff to shotgun, machinegun, rifle, vaporizer, okmachinegun and okshotgun
Closes #2625
See merge request xonotic/xonotic-data.pk3dir!929
Dr. Jaska [Tue, 21 May 2024 18:50:21 +0000 (18:50 +0000)]
Add damage and force falloff to shotgun, machinegun, rifle, vaporizer, okmachinegun and okshotgun
Rudolf Polzer [Tue, 21 May 2024 05:23:08 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Mon, 20 May 2024 05:23:06 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Sun, 19 May 2024 05:23:06 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Fri, 17 May 2024 09:03:34 +0000 (09:03 +0000)]
Merge branch 'bones_was_here/q1bsp_hitbox' into 'master'
Q1BSP: use compatible collision detection
Closes #2895
See merge request xonotic/xonotic-data.pk3dir!1224
bones_was_here [Thu, 21 Mar 2024 03:44:32 +0000 (13:44 +1000)]
Q1BSP: use cliphulls for collision detection
Implements #2895
Fixes various collision problems on Q1 maps.
bones_was_here [Tue, 18 Jul 2023 06:42:46 +0000 (16:42 +1000)]
Q1BSP: make the player's bbox fit the player's cliphull
This is necessary for correct collision behaviour (otherwise the
player's "head" can poke into ceilings).
Also sets the correct bbox on Q2BSP and disables crouching on Q1BSP.
Signed-off-by: bones_was_here <bones_was_here@xonotic.au>
drjaska [Sun, 12 May 2024 07:20:57 +0000 (10:20 +0300)]
Improve cl_gunalign cvar description
Rudolf Polzer [Sun, 12 May 2024 05:23:08 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Sat, 11 May 2024 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Fri, 10 May 2024 08:17:01 +0000 (08:17 +0000)]
Merge branch 'bones_was_here/obj_model_orientation' into 'master'
Remove .obj entity model orientation hack
Closes darkplaces#81, darkplaces#169, darkplaces#388, and #2243
See merge request xonotic/xonotic-data.pk3dir!1264
bones_was_here [Fri, 10 May 2024 08:14:52 +0000 (08:14 +0000)]
Merge branch 'bones_was_here/mapinfo' into 'master'
More consistent and visible map metadata
See merge request xonotic/xonotic-data.pk3dir!1271
terencehill [Tue, 23 Apr 2024 15:23:49 +0000 (17:23 +0200)]
Fix damagetext not stopping damage accumulation after enemy's death
Rudolf Polzer [Tue, 30 Apr 2024 05:23:07 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 29 Apr 2024 23:33:44 +0000 (01:33 +0200)]
Scoreboard: fix field titles sometimes getting compressed to the min width even if not needed (with bloated layouts)
This commit fixes
ec5ad288
terencehill [Mon, 29 Apr 2024 23:20:57 +0000 (01:20 +0200)]
phisics.qc: fix indentation; sv_onslaught.qc: move clientcamera_send next to cam setup code
Rudolf Polzer [Sat, 27 Apr 2024 05:23:25 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 23 Apr 2024 15:00:10 +0000 (17:00 +0200)]
Optimize damagetext code by spawning only one damagetext entity when player is hit by multiple projectiles at the same time, e.g. shotgun. It reduces CPU usage, networked data and precision errors
bones_was_here [Sun, 21 Apr 2024 14:28:00 +0000 (00:28 +1000)]
Update default video settings
vid_resizable was fixed and defaults to enabled in DP, vid_bitsperpixel
isn't configurable and setting it currently causes a warn (almost all
hardware supports only 24bpp).
terencehill [Sat, 20 Apr 2024 18:08:29 +0000 (20:08 +0200)]
Make scoreboard team selection default even in pre-0.8.6 configs. Allow enabling menu team selection with team_selection_type 0
terencehill [Thu, 18 Apr 2024 13:43:34 +0000 (15:43 +0200)]
Fix FL_WEAPON flag overlapping FL_JUMPRELEASED. This unintentional change was introduced in
aae27b54
bones_was_here [Wed, 17 Apr 2024 14:57:33 +0000 (14:57 +0000)]
Merge MR 'Various Q3 and QL map entity features and fixes'
See merge request xonotic/xonotic-data.pk3dir!1268
bones_was_here [Sat, 13 Apr 2024 09:53:51 +0000 (19:53 +1000)]
Clean up droptofloor() macro hacks and clarify naming
It wasn't clear at call sites that this had been changed to a delayed
function (in SVQC only), and that the return value was no longer
available. We can just use different names for the QC implementation,
with different names for delayed and direct calls, and leave the
original name for calling the builtin if required. The builtin's wrapper
macro for changing the self global to a parameter is retained and it now
works the same in SVQC and CSQC.
Removes another case of
cc83c39c27ea0757cf169562428e443c5ab60fdc
bones_was_here [Thu, 21 Mar 2024 07:16:34 +0000 (17:16 +1000)]
target_speaker: silence legacy spawnflag warning on Q3 maps
bones_was_here [Thu, 21 Mar 2024 07:10:40 +0000 (17:10 +1000)]
Add engine extension check: fullspawndata
This one isn't supported by checkextension().
bones_was_here [Thu, 21 Mar 2024 06:40:45 +0000 (16:40 +1000)]
q3compat: reduce entity field allocation
These fields are only read during worldspawn on Q3 maps, we don't need
them on every entity.
I retained .gametype and .not_gametype as I expect we'll want to
implement these for Xonotic mappers, and we're already using the
.gametype field elsewhere.
Will now support edge cases where the mapper used \ as the .music path
separator instead of the canonical /
bones_was_here [Thu, 21 Mar 2024 00:43:18 +0000 (10:43 +1000)]
Support Domination control points on QL maps
bones_was_here [Wed, 20 Mar 2024 18:41:15 +0000 (04:41 +1000)]
Support gametype and not_gametype fields on QL maps
Documents all Q3A and QL gametypes including the inconsistencies between
entity fields and .arena files.
Includes minor corrections.
bones_was_here [Wed, 20 Mar 2024 08:51:30 +0000 (18:51 +1000)]
Support Mine Layer on Q3TA/QL maps
In !849 I changed weapon_prox_launcher to spawn the Mortar, in hindsight
this was a mistake. Some maps have both weapons, and although the
Mortar is more popular, some players really like the Mine Layer, so
let's just go with what the mapper chose. Server admins can easily
change items with .ent files if they want.
bones_was_here [Tue, 19 Mar 2024 03:42:31 +0000 (13:42 +1000)]
target_push: implement Q3 wind tunnel and angles+speed modes
bones_was_here [Sat, 16 Mar 2024 06:58:42 +0000 (16:58 +1000)]
Reset door locking when the match is reset
bones_was_here [Sat, 13 Apr 2024 06:24:10 +0000 (16:24 +1000)]
Refactor default key model selection
bones_was_here [Sat, 16 Mar 2024 06:42:37 +0000 (16:42 +1000)]
Remove key-specific BIT macro
bones_was_here [Sat, 16 Mar 2024 06:36:03 +0000 (16:36 +1000)]
Support door keys on QL maps
Also adds a MASTER key for Xonotic mapping (useful for secrets...)
Removes blind nudging of keys as was done for normal items in
cc83c39c27ea0757cf169562428e443c5ab60fdc
bones_was_here [Sat, 16 Mar 2024 01:44:59 +0000 (11:44 +1000)]
Support custom door sounds on QL maps
terencehill [Thu, 11 Apr 2024 13:30:28 +0000 (15:30 +0200)]
Nades code: don't use booleans as array indexes for m_projectile, optimize spawn_held_nade by reducing REGISTRY_GET calls, optimize Nade_FromProjectile by removing a for loop
terencehill [Thu, 11 Apr 2024 12:17:16 +0000 (12:17 +0000)]
Merge branch 'terencehill/nades_stuff' into 'master'
Minor improvements and optimizations to the Darkness nade effect
See merge request xonotic/xonotic-data.pk3dir!1236
terencehill [Wed, 10 Apr 2024 23:07:17 +0000 (23:07 +0000)]
Merge branch 'master' into 'terencehill/nades_stuff'
# Conflicts:
# qcsrc/common/mutators/mutator/nades/nades.qc
Rudolf Polzer [Wed, 10 Apr 2024 05:23:13 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Tue, 9 Apr 2024 05:23:14 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Mon, 8 Apr 2024 05:23:20 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Sun, 7 Apr 2024 23:47:11 +0000 (23:47 +0000)]
Merge branch 'drjaska/silent-respawn' into 'master'
server side option for both (old) or individually silent or particleless (re)spawning
See merge request xonotic/xonotic-data.pk3dir!1218
Dr. Jaska [Sun, 7 Apr 2024 23:47:10 +0000 (23:47 +0000)]
server side option for both (old) or individually silent or particleless (re)spawning
terencehill [Sun, 7 Apr 2024 14:50:06 +0000 (16:50 +0200)]
drawstring_aspect: fix wrong horizontal string alignment sometimes due to r_font_size_snapping 4; document macro helper. Also don't display timer subtext bold to mitigate drawstring_aspect bug
While at it I wrapped a couple very long lines in timer panel code
bones_was_here [Sun, 7 Apr 2024 16:34:09 +0000 (02:34 +1000)]
Save cvar sv_autopause to config.cfg for listen/singleplayer convenience
Closes #2901
terencehill [Sun, 7 Apr 2024 16:28:15 +0000 (16:28 +0000)]
Merge branch 'terencehill/scoreboard_compressed_field_titles' into 'master'
Scoreboard: limit width of field titles and show too long titles compressed
See merge request xonotic/xonotic-data.pk3dir!1273
terencehill [Wed, 3 Apr 2024 18:20:14 +0000 (20:20 +0200)]
Use correct titles for a few scoreboard fields (now scoreboard can better handle longer titles); use proper field and score names for destroyed generators (Onslaught)
bones_was_here [Thu, 4 Apr 2024 11:17:48 +0000 (21:17 +1000)]
Update dpdefs
terencehill [Wed, 3 Apr 2024 17:44:23 +0000 (19:44 +0200)]
Scoreboard: if all fields can't fit in the scoreboard try to make them smaller by compressing field title
terencehill [Mon, 1 Apr 2024 16:36:02 +0000 (18:36 +0200)]
Scoreboard: limit width of field titles and show too long titles compressed. Max width can be configured via hud_panel_scoreboard_table_fieldtitle_maxwidth
Rudolf Polzer [Wed, 3 Apr 2024 05:23:09 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 1 Apr 2024 10:21:10 +0000 (10:21 +0000)]
Merge branch 'terencehill/custom_gametype_stuff' into 'master'
Fix / improve custom gametype handling
See merge request xonotic/xonotic-data.pk3dir!1269
Rudolf Polzer [Mon, 1 Apr 2024 05:23:09 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 31 Mar 2024 18:09:40 +0000 (20:09 +0200)]
Remove a redundant LOG_TRACE (previous bprint message is printed to server console too thanks to sv_echobprint 1)
terencehill [Sat, 30 Mar 2024 22:17:28 +0000 (23:17 +0100)]
Optimize WinningConditionHelper: avoid calling strcpy if strings are the same, reduce number of strcat calls. Also remove redundant ^7 in 3 messages of GameCommand_moveplayer
bones_was_here [Tue, 26 Mar 2024 04:24:28 +0000 (14:24 +1000)]
Display map author in Welcome message, add more author fallback paths
Fixes "<AUTHOR>" sometimes appearing in the Create menu.
bones_was_here [Mon, 25 Mar 2024 18:28:50 +0000 (04:28 +1000)]
Display mapinfo titlestring in Welcome message, handle title the same in all code paths
Moves the world.message fallback into the mapinfo system.
bones_was_here [Fri, 29 Mar 2024 08:46:29 +0000 (18:46 +1000)]
Welcome message: combine bool networking into a bitfield
bones_was_here [Mon, 25 Mar 2024 04:24:10 +0000 (14:24 +1000)]
Add g_mapinfo_q3compat 3, support maps with .arena AND .defi files
Fixes lack of CTS support on q3df maps that also have an invalid .arena
file.
Clarifies description and INFO logging.
bones_was_here [Wed, 20 Mar 2024 23:58:48 +0000 (09:58 +1000)]
mapinfo: minor fixes: q3compat and CSQC warning removal
Fixes Q3/QL maps that support 2v2 and duel also getting CA enabled.
The "tournament" string never matched, it's "tourney" in Q3 and "duel"
in QL, "tournament" is only used in the Q3 .gametype entity field.
bones_was_here [Fri, 29 Mar 2024 09:15:36 +0000 (19:15 +1000)]
Remove redundant strcat1()
The reason for strcat1() is now fixed properly by darkplaces@
b0abeba2 and
a986d478
See also
bae3de16e76ed9b25933db14b165ec86aa8f1608
bones_was_here [Sat, 23 Mar 2024 07:37:40 +0000 (17:37 +1000)]
target_speed: fix macro mistake
Rudolf Polzer [Tue, 26 Mar 2024 06:23:13 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Mon, 25 Mar 2024 14:07:30 +0000 (15:07 +0100)]
Implement REPLICATE_vector for the automatic cvar networking system
Rudolf Polzer [Mon, 25 Mar 2024 06:23:13 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Sun, 24 Mar 2024 21:50:44 +0000 (22:50 +0100)]
Use the correct function to get the active gametype in a LOG_FATALF call
MapInfo_Type_ToString(MapInfo_CurrentGametype()) returns the current gametype that can be changed during the game by the gametype command; GetGametype() returns the active gametype