]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Nick S [Fri, 12 May 2023 07:14:27 +0000 (10:14 +0300)]
Merge remote-tracking branch 'origin/morosophos/server-experimental' into morosophos/server-experimental
Nick S [Fri, 12 May 2023 07:13:51 +0000 (10:13 +0300)]
Merge remote-tracking branch 'origin/drjaska/weapon-force-configs' into morosophos/server-experimental
Nick S [Fri, 12 May 2023 07:13:25 +0000 (10:13 +0300)]
Merge branch 'morosophos/server-current4' into morosophos/server-experimental
drjaska [Fri, 12 May 2023 02:33:34 +0000 (05:33 +0300)]
maybe usable mortar
drjaska [Fri, 12 May 2023 02:33:34 +0000 (05:33 +0300)]
maybe usable mortar
drjaska [Fri, 12 May 2023 02:21:27 +0000 (05:21 +0300)]
include g_balance_crylink_swap_attacks in bal-wep-legacyxdf.cfg
Nick S [Thu, 11 May 2023 20:55:30 +0000 (23:55 +0300)]
Merge remote-tracking branch 'origin/Juhu/link_after_solid' into morosophos/server-current4
Juhu [Thu, 11 May 2023 20:17:55 +0000 (22:17 +0200)]
link after setting the .solid field in g_model_init() to ensure that the entity is linked to the area grid
Nick S [Thu, 11 May 2023 12:15:07 +0000 (15:15 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Nick S [Thu, 11 May 2023 12:14:39 +0000 (15:14 +0300)]
Merge remote-tracking branch 'origin/drjaska/chat-format' into morosophos/server-current4
Nick S [Thu, 11 May 2023 12:14:21 +0000 (15:14 +0300)]
Merge remote-tracking branch 'origin/bones_was_here/func_door' into morosophos/server-current4
bones_was_here [Wed, 10 May 2023 18:25:50 +0000 (04:25 +1000)]
Merge 'add %o and %O to chat formatting for own origin' into 'master'
See merge request https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1166
bones_was_here [Wed, 10 May 2023 17:21:08 +0000 (17:21 +0000)]
Merge branch 'drjaska/monster-loot-offswitch' into 'master'
Monster loot off-switch
See merge request xonotic/xonotic-data.pk3dir!1162
Dr. Jaska [Wed, 10 May 2023 17:21:08 +0000 (17:21 +0000)]
Monster loot off-switch
bones_was_here [Wed, 10 May 2023 16:55:32 +0000 (16:55 +0000)]
Merge branch 'terencehill/scores_per_round' into 'master'
Scoreboard: allow showing average scores per round
See merge request xonotic/xonotic-data.pk3dir!975
terencehill [Wed, 10 May 2023 16:55:31 +0000 (16:55 +0000)]
Scoreboard: allow showing average scores per round
bones_was_here [Wed, 10 May 2023 16:44:18 +0000 (16:44 +0000)]
Merge branch 'drjaska/maplist-remove' into 'master'
fix g_maplist_remove completely breaking due to argv override
Closes #2719
See merge request xonotic/xonotic-data.pk3dir!1156
Dr. Jaska [Wed, 10 May 2023 16:44:18 +0000 (16:44 +0000)]
fix g_maplist_remove completely breaking due to argv override
bones_was_here [Wed, 10 May 2023 08:10:26 +0000 (08:10 +0000)]
Merge branch 'terencehill/instagib_item_fix' into 'master'
Instagib and LMS: fix a few issues with instagib items and in particular extralife
See merge request xonotic/xonotic-data.pk3dir!1164
drjaska [Wed, 10 May 2023 03:06:23 +0000 (06:06 +0300)]
add %o and %O to chat formatting for origin
%O is just for more decimals as an opt-in if %o isn't accurate enough.
terencehill [Tue, 9 May 2023 22:30:22 +0000 (00:30 +0200)]
Merge the instagib_replace_with_* functions into a single function
terencehill [Sun, 7 May 2023 13:28:22 +0000 (15:28 +0200)]
LMS and Instagib: fix extralife not counted in the Itemstats panel and wrongly displayed in the Pickup panel
bones_was_here [Tue, 9 May 2023 09:09:10 +0000 (09:09 +0000)]
Merge branch 'bones_was_here/autopause_dedicated' into 'master'
Autopause for dedicated servers, better autopause for singleplayer/listen
Closes #2670
See merge request xonotic/xonotic-data.pk3dir!1144
bones_was_here [Tue, 9 May 2023 09:04:05 +0000 (09:04 +0000)]
Merge branch 'drjaska/whitelist_weaponarena' into 'master'
whitelist g_*_weaponarena "most" and "most_available"
See merge request xonotic/xonotic-data.pk3dir!1103
Dr. Jaska [Tue, 9 May 2023 09:04:05 +0000 (09:04 +0000)]
whitelist g_*_weaponarena "most" and "most_available"
Rudolf Polzer [Sun, 7 May 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sat, 6 May 2023 21:53:34 +0000 (23:53 +0200)]
LMS: if normal items are enabled don't convert megahealth to extralife
terencehill [Sat, 6 May 2023 15:06:20 +0000 (17:06 +0200)]
LMS: fix megahealths from other games not getting replaced by extralife
terencehill [Sat, 6 May 2023 13:22:44 +0000 (15:22 +0200)]
Instagib: fix ammo from other games not getting replaced by vaporizer cells (if enabled by the g_instagib_ammo_convert_<ammotype> cvars, disabled by default)
terencehill [Fri, 5 May 2023 16:34:47 +0000 (18:34 +0200)]
Instagib: fix items from other games not getting replaced by instagib powerups
Nick S [Thu, 4 May 2023 21:46:00 +0000 (00:46 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
terencehill [Thu, 4 May 2023 17:08:19 +0000 (19:08 +0200)]
Allow bots to be teleported while dead and with their body exploded (invisible) just like other players. This commit basically reverts
b0df2001
terencehill [Thu, 4 May 2023 15:26:22 +0000 (17:26 +0200)]
Damage effects can't be applied on pure entities, ignore them for a small performance gain. In particular 2 pure entities attached to each player are now always ignored: shownames_tag and ENT_CLIENT_ENTCS
terencehill [Thu, 4 May 2023 15:02:09 +0000 (17:02 +0200)]
Properly network negative radius in the damage effects code, it fixes a bug where negative force was applied to gibs and casings as a random positive value
terencehill [Thu, 4 May 2023 13:28:24 +0000 (15:28 +0200)]
Fix wrong bot check in a FOREACH_CLIENT loop
terencehill [Wed, 3 May 2023 22:41:35 +0000 (22:41 +0000)]
Merge branch 'Juhu/q3df_teleporter_flags' into 'master'
q3df teleporter flags
Closes #2574
See merge request xonotic/xonotic-data.pk3dir!1135
Juhu [Wed, 3 May 2023 22:41:34 +0000 (22:41 +0000)]
q3df teleporter flags
terencehill [Tue, 2 May 2023 17:02:48 +0000 (17:02 +0000)]
Merge branch 'terencehill/hud_editor_centerline' into 'master'
Hud editor center line
See merge request xonotic/xonotic-data.pk3dir!1157
terencehill [Tue, 2 May 2023 16:58:01 +0000 (16:58 +0000)]
Merge branch 'LegendaryGuard/electricity_effect' into 'master'
New electricity effect
Closes #2717
See merge request xonotic/xonotic-data.pk3dir!1062
LegendaryGuard [Tue, 2 May 2023 16:58:00 +0000 (16:58 +0000)]
New electricity effect
Rudolf Polzer [Sun, 30 Apr 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Fri, 28 Apr 2023 19:44:14 +0000 (19:44 +0000)]
Merge branch 'bones_was_here/areagrid_link_SOLID_NOT' into 'master'
Don't link pure and SOLID_NOT entities to the area grid in DP master
Closes darkplaces#381
See merge request xonotic/xonotic-data.pk3dir!1154
Nick S [Thu, 27 Apr 2023 20:39:18 +0000 (23:39 +0300)]
Merge branch 'morosophos/server-current4' into morosophos/server-experimental
Nick S [Thu, 27 Apr 2023 20:38:48 +0000 (23:38 +0300)]
Merge remote-tracking branch 'origin/drjaska/weapon-force-configs' into morosophos/server-experimental
Nick S [Thu, 27 Apr 2023 19:40:37 +0000 (22:40 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
drjaska [Wed, 26 Apr 2023 14:37:32 +0000 (17:37 +0300)]
copy q3 quad selfforce to xdf
terencehill [Tue, 25 Apr 2023 09:34:21 +0000 (11:34 +0200)]
Remove colors from fireball_glow.tga to avoid applying wrong player's glow color on the fireball
terencehill [Tue, 25 Apr 2023 08:57:13 +0000 (08:57 +0000)]
Merge branch 'LegendaryGuard/fix_fireball_UVs' into 'master'
Optimize g_fireball and fix g_fireball and v_fireball UVs and enhance sight details in the fireball textures
See merge request xonotic/xonotic-data.pk3dir!1123
LegendaryGuard [Tue, 25 Apr 2023 08:57:13 +0000 (08:57 +0000)]
Optimize g_fireball and fix g_fireball and v_fireball UVs and enhance sight details in the fireball textures
drjaska [Mon, 24 Apr 2023 22:37:40 +0000 (01:37 +0300)]
45 hagar primary force, q3-ish but more noob friendly
terencehill [Mon, 24 Apr 2023 12:56:33 +0000 (12:56 +0000)]
Merge branch 'LegendaryGuard/optimize_weapon_models' into 'master'
Optimize h_ok_grenade, h_ok_hmg, h_ok_mg, h_ok_rl and h_ok_sniper models
See merge request xonotic/xonotic-data.pk3dir!1106
LegendaryGuard [Mon, 24 Apr 2023 12:56:33 +0000 (12:56 +0000)]
Optimize h_ok_grenade, h_ok_hmg, h_ok_mg, h_ok_rl and h_ok_sniper models
Nick S [Wed, 19 Apr 2023 15:51:51 +0000 (18:51 +0300)]
Merge remote-tracking branch 'origin/drjaska/weapon-force-configs' into morosophos/server-experimental
Nick S [Mon, 17 Apr 2023 19:19:48 +0000 (22:19 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
terencehill [Wed, 12 Apr 2023 12:16:47 +0000 (14:16 +0200)]
Hud editor: show a "Center line" checkbox in the hud editor menu
Rudolf Polzer [Sun, 16 Apr 2023 05:25:12 +0000 (07:25 +0200)]
Transifex autosync
terencehill [Mon, 10 Apr 2023 21:49:20 +0000 (23:49 +0200)]
Hud editor: allow displaying more than one vertical line at the desired position
LegendaryGuard [Mon, 10 Apr 2023 21:05:38 +0000 (21:05 +0000)]
Merge branch 'bones_was_here/ok_blaster_keepforce' into 'master'
Add overkill blaster keepforce and keepdamage cvars
See merge request xonotic/xonotic-data.pk3dir!1158
LegendaryGuard [Mon, 10 Apr 2023 20:59:08 +0000 (20:59 +0000)]
Merge branch 'drjaska/dos2unix' into 'master'
Delete 4 unused model files
See merge request xonotic/xonotic-data.pk3dir!1149
Dr. Jaska [Mon, 10 Apr 2023 20:59:08 +0000 (20:59 +0000)]
Delete 4 unused model files
terencehill [Thu, 6 Apr 2023 12:49:20 +0000 (14:49 +0200)]
Hud editor: while moving/resizing a panel, make clearly visible with a line whether the panel is perfectly horizontally centered or not
Rudolf Polzer [Sun, 9 Apr 2023 05:23:08 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Sat, 8 Apr 2023 19:01:08 +0000 (05:01 +1000)]
Fix area grid linking/unlinking of triggers and gametype ents in DP master
terencehill [Sat, 8 Apr 2023 14:35:32 +0000 (16:35 +0200)]
Optimize IL_REMOVE_RAW. It fixes #2827 (a map with a huge amount of entities crashes on start)
bones_was_here [Fri, 7 Apr 2023 16:55:26 +0000 (16:55 +0000)]
Merge branch 'drjaska/2779-flagrespawnbacktrace' into 'master'
Resolve "Flag respawn called twice quickly"
Closes #2779
See merge request xonotic/xonotic-data.pk3dir!1155
Dr. Jaska [Fri, 7 Apr 2023 16:55:26 +0000 (16:55 +0000)]
Resolve "Flag respawn called twice quickly"
bones_was_here [Fri, 7 Apr 2023 07:53:57 +0000 (17:53 +1000)]
Add overkill blaster keepforce and keepdamage cvars
Equivalent to the instagib blaster cvars.
bones_was_here [Thu, 6 Apr 2023 17:02:46 +0000 (03:02 +1000)]
Don't link pure entities to the area grid in DP master
This is important for performance.
Nick S [Wed, 5 Apr 2023 17:16:58 +0000 (20:16 +0300)]
Merge remote-tracking branch 'origin/Juhu/strafehud-next_cvarsave' into morosophos/server-current4
Nick S [Wed, 5 Apr 2023 17:16:50 +0000 (20:16 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Juhu [Tue, 4 Apr 2023 18:53:56 +0000 (20:53 +0200)]
use AUTOCVAR_SAVE() to let users store strafehud cvars permanently on clients which don't have the strafehud by themself
Juhu [Sat, 4 Feb 2023 00:25:40 +0000 (01:25 +0100)]
strafehud: simplify sonar string handling code
Juhu [Wed, 25 Jan 2023 19:33:19 +0000 (20:33 +0100)]
strafehud: fix switch indicator positioning when using projection
Juhu [Fri, 20 Jan 2023 21:46:10 +0000 (22:46 +0100)]
strafehud: fix small mistakes of previous projection code commit
Juhu [Fri, 20 Jan 2023 21:31:24 +0000 (22:31 +0100)]
strafehud: add exponent cvar for sonar ranges
Juhu [Fri, 20 Jan 2023 20:58:50 +0000 (21:58 +0100)]
strafehud: implement different projection modes and allow the range to be set to the current fov
Juhu [Wed, 18 Jan 2023 15:08:01 +0000 (16:08 +0100)]
strafehud: add vertical angle indicator
Juhu [Wed, 18 Jan 2023 12:07:42 +0000 (13:07 +0100)]
strafehud: make sonar sound interval dynamic too
Juhu [Sun, 15 Jan 2023 11:32:01 +0000 (12:32 +0100)]
strafehud: add audible feedback to strafehud (strafe sonar)
terencehill [Tue, 4 Apr 2023 12:24:41 +0000 (12:24 +0000)]
Merge branch 'Juhu/strafehud-fixes' into 'master'
Improved StrafeHUD
See merge request xonotic/xonotic-data.pk3dir!1066
drjaska [Mon, 3 Apr 2023 15:04:18 +0000 (18:04 +0300)]
rename legacy XDF physics to be legacy
drjaska [Mon, 3 Apr 2023 14:59:29 +0000 (17:59 +0300)]
restore crylink alt fire to be similiar to vanilla
drjaska [Mon, 3 Apr 2023 14:44:05 +0000 (17:44 +0300)]
make crylink primary fire equal to bfg by copying alt fire to it
drjaska [Mon, 3 Apr 2023 02:05:02 +0000 (05:05 +0300)]
and copy lg fire rate 30 -> 20
drjaska [Mon, 3 Apr 2023 02:02:10 +0000 (05:02 +0300)]
some more copying
bones_was_here [Sun, 2 Apr 2023 20:09:33 +0000 (06:09 +1000)]
Decide if an item will spawn before precaching its assets
May help with #2799
bones_was_here [Sun, 2 Apr 2023 20:25:35 +0000 (06:25 +1000)]
Fix null ptr deref when starting map dfwc2017-6
Caused by
9b8502fe368052b4b81985084542548e6992cf72
which was needed for
b95beb262077d8f733bbee7cb0d5f4c05b7b3e2f
Nick S [Sun, 2 Apr 2023 17:35:54 +0000 (20:35 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Rudolf Polzer [Sun, 2 Apr 2023 05:23:09 +0000 (07:23 +0200)]
Transifex autosync
Nick S [Sat, 1 Apr 2023 16:31:04 +0000 (19:31 +0300)]
Merge remote-tracking branch 'origin/drjaska/q3df-rl-h-force' into morosophos/server-current4
drjaska [Sat, 1 Apr 2023 00:29:00 +0000 (03:29 +0300)]
move defi check first to micro-optimize
drjaska [Fri, 31 Mar 2023 23:43:16 +0000 (02:43 +0300)]
whitespace OCD
drjaska [Fri, 31 Mar 2023 23:42:09 +0000 (02:42 +0300)]
q3df rl 1.2x horizontal force in specific context
Nick S [Thu, 30 Mar 2023 18:46:58 +0000 (21:46 +0300)]
Merge remote-tracking branch 'origin/Juhu/scoreboard-strafe' into morosophos/server-current4
Nick S [Thu, 30 Mar 2023 18:45:43 +0000 (21:45 +0300)]
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server-current4
Nick S [Thu, 30 Mar 2023 18:43:13 +0000 (21:43 +0300)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Nick S [Thu, 30 Mar 2023 18:42:20 +0000 (21:42 +0300)]
Merge remote-tracking branch 'origin/Juhu/q3df_teleporter_flags' into morosophos/server-current4
Nick S [Thu, 30 Mar 2023 18:42:11 +0000 (21:42 +0300)]
Merge remote-tracking branch 'origin/Juhu/q3df_fragsfilter_flags' into morosophos/server-current4
Juhu [Tue, 28 Mar 2023 21:11:37 +0000 (23:11 +0200)]
Merge branch 'master' into Juhu/strafehud-server
Fixed merge conflict caused by the new speed unit cvar
Juhu [Tue, 28 Mar 2023 20:58:25 +0000 (22:58 +0200)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: connect the arrow to the line when drawing the angle indicator"