]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
11 years agoMerge branch 'master' into terencehill/ca_arena_mutators
terencehill [Tue, 12 Feb 2013 14:29:25 +0000 (15:29 +0100)]
Merge branch 'master' into terencehill/ca_arena_mutators

11 years agoMerge branch 'terencehill/ca_arena_mutators' of git://git.xonotic.org/xonotic/xonotic...
terencehill [Tue, 12 Feb 2013 14:28:11 +0000 (15:28 +0100)]
Merge branch 'terencehill/ca_arena_mutators' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir into terencehill/ca_arena_mutators

11 years agosupport up to 4 aim bones
Rudolf Polzer [Tue, 12 Feb 2013 11:18:05 +0000 (12:18 +0100)]
support up to 4 aim bones

11 years agosupport up to 2 aim bones
Rudolf Polzer [Tue, 12 Feb 2013 10:36:05 +0000 (11:36 +0100)]
support up to 2 aim bones

11 years agoenable animation blending; do up/down aiming with it well now
Rudolf Polzer [Tue, 12 Feb 2013 10:29:35 +0000 (11:29 +0100)]
enable animation blending; do up/down aiming with it well now

11 years agomove up/down aiming clientside
Rudolf Polzer [Tue, 12 Feb 2013 09:33:57 +0000 (10:33 +0100)]
move up/down aiming clientside

11 years agoload animblending info from txt file
Rudolf Polzer [Tue, 12 Feb 2013 09:15:31 +0000 (10:15 +0100)]
load animblending info from txt file

11 years agofixbone: simplify, and keep only one method
Rudolf Polzer [Tue, 12 Feb 2013 08:29:51 +0000 (09:29 +0100)]
fixbone: simplify, and keep only one method

11 years agoThese g_freezetag* cvars shouldn't be saved, like most of the g_<game_mode>* cvars
terencehill [Mon, 11 Feb 2013 23:39:13 +0000 (00:39 +0100)]
These g_freezetag* cvars shouldn't be saved, like most of the g_<game_mode>* cvars

11 years agog_freezetag_frozen_timeout 60 "frozen players will be automatically unfrozen after...
terencehill [Mon, 11 Feb 2013 23:29:51 +0000 (00:29 +0100)]
g_freezetag_frozen_timeout 60 "frozen players will be automatically unfrozen after this time in seconds"

11 years agoForbid toggling ready state if countdown to game start is in progress
terencehill [Mon, 11 Feb 2013 23:18:54 +0000 (00:18 +0100)]
Forbid toggling ready state if countdown to game start is in progress

11 years agoadd _animblend_fixbone 3
Rudolf Polzer [Mon, 11 Feb 2013 15:37:16 +0000 (16:37 +0100)]
add _animblend_fixbone 3

11 years agoFix CA scoring: it was added a point to the team for every kill
terencehill [Sun, 10 Feb 2013 19:42:03 +0000 (20:42 +0100)]
Fix CA scoring: it was added a point to the team for every kill

11 years agoFix fo bug #1390: "If sv_ready_restart_after_countdown 1 is set, the scoreboard point...
terencehill [Sun, 10 Feb 2013 17:50:16 +0000 (18:50 +0100)]
Fix fo bug #1390: "If sv_ready_restart_after_countdown 1 is set, the scoreboard points are not reset to 0, when map is restarted via F4. - needs g_warmup 1 set as well". This also fixes sv_ready_restart_repeatable not working if sv_ready_restart_after_countdown 1 is set (when everyone is ready console shows "Server is restarting" but nothing happens).

Note that this issue doesn't exist in Arena as map is restarted via the console command "restart", and warmup stage isn't allowed.

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators
Samual Lenks [Sun, 10 Feb 2013 01:01:32 +0000 (20:01 -0500)]
Merge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators

11 years agoMerge remote-tracking branch 'origin/terencehill/misc_hud_fixes'
Samual Lenks [Sun, 10 Feb 2013 00:51:38 +0000 (19:51 -0500)]
Merge remote-tracking branch 'origin/terencehill/misc_hud_fixes'

11 years agoMerge remote-tracking branch 'origin/divVerent/csad'
Samual Lenks [Sun, 10 Feb 2013 00:45:24 +0000 (19:45 -0500)]
Merge remote-tracking branch 'origin/divVerent/csad'

11 years agoMerge remote-tracking branch 'origin/master' into divVerent/csad
Samual Lenks [Sat, 9 Feb 2013 02:20:02 +0000 (21:20 -0500)]
Merge remote-tracking branch 'origin/master' into divVerent/csad

11 years agoMerge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/ca_arena_mutators
terencehill [Fri, 8 Feb 2013 13:48:56 +0000 (14:48 +0100)]
Merge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/ca_arena_mutators

11 years agoMerge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
terencehill [Fri, 8 Feb 2013 13:48:10 +0000 (14:48 +0100)]
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes

11 years agoLet CSQC handle countdown to round start by integrating it with the countdown to...
terencehill [Thu, 7 Feb 2013 17:25:01 +0000 (18:25 +0100)]
Let CSQC handle countdown to round start by integrating it with the countdown to game start

11 years agoMerge remote-tracking branch 'origin/samual/respawn_improvements'
Samual Lenks [Fri, 8 Feb 2013 01:44:41 +0000 (20:44 -0500)]
Merge remote-tracking branch 'origin/samual/respawn_improvements'

11 years agoCvar updates
Samual Lenks [Fri, 8 Feb 2013 01:42:44 +0000 (20:42 -0500)]
Cvar updates

11 years agoStuff and things
Samual Lenks [Fri, 8 Feb 2013 01:03:10 +0000 (20:03 -0500)]
Stuff and things

11 years agoRemove this setmodel stuff here
Samual Lenks [Fri, 8 Feb 2013 00:58:01 +0000 (19:58 -0500)]
Remove this setmodel stuff here

11 years agoMerge remote-tracking branch 'origin/master' into samual/respawn_improvements
Samual Lenks [Thu, 7 Feb 2013 22:44:28 +0000 (17:44 -0500)]
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

11 years agoCTS is not a mod, it is a game mode.
Samual Lenks [Thu, 7 Feb 2013 20:51:23 +0000 (15:51 -0500)]
CTS is not a mod, it is a game mode.

11 years agoAh, so this is where to mess with to improve spawnpoints... mwahaha.
Samual Lenks [Thu, 7 Feb 2013 05:38:26 +0000 (00:38 -0500)]
Ah, so this is where to mess with to improve spawnpoints... mwahaha.

11 years agoCode far better handling of zoom upon spawn
Samual Lenks [Thu, 7 Feb 2013 05:19:54 +0000 (00:19 -0500)]
Code far better handling of zoom upon spawn

11 years agoAllow hud_damage with eventchase camera (this was irrelevant to old bug)
Samual Lenks [Thu, 7 Feb 2013 04:34:51 +0000 (23:34 -0500)]
Allow hud_damage with eventchase camera (this was irrelevant to old bug)

11 years agoMake Arena and CA MUTATOR_ONREMOVE consistent with latest changes
terencehill [Tue, 5 Feb 2013 23:40:52 +0000 (00:40 +0100)]
Make Arena and CA MUTATOR_ONREMOVE consistent with latest changes

11 years agoReapply commit 5c9da9cf4 "fix Arena spectator status" that got lost in the merge...
terencehill [Tue, 5 Feb 2013 23:19:56 +0000 (00:19 +0100)]
Reapply commit 5c9da9cf4 "fix Arena spectator status" that got lost in the merge commit

11 years agoRemove compiler warnings
terencehill [Tue, 5 Feb 2013 23:12:20 +0000 (00:12 +0100)]
Remove compiler warnings

11 years agoMerge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/arena_gamemode
terencehill [Tue, 5 Feb 2013 22:55:07 +0000 (23:55 +0100)]
Merge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/arena_gamemode

Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/scores.qc

11 years agoRemove compiler warning
terencehill [Tue, 5 Feb 2013 22:31:45 +0000 (23:31 +0100)]
Remove compiler warning

11 years agoMerge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
terencehill [Tue, 5 Feb 2013 21:41:41 +0000 (22:41 +0100)]
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes

11 years agoMerge remote-tracking branch 'origin/samual/eventchase_boxlike_tracing'
Samual Lenks [Tue, 5 Feb 2013 17:02:44 +0000 (12:02 -0500)]
Merge remote-tracking branch 'origin/samual/eventchase_boxlike_tracing'

11 years agoAdd cvars to defaultXonotic.org
Samual Lenks [Tue, 5 Feb 2013 16:59:06 +0000 (11:59 -0500)]
Add cvars to defaultXonotic.org

11 years agoRe-do handling of cvars for mins/maxs with eventchase and spectating
Samual Lenks [Tue, 5 Feb 2013 16:56:00 +0000 (11:56 -0500)]
Re-do handling of cvars for mins/maxs with eventchase and spectating

11 years agoAdd fallback for if tracebox starts in solid
Samual Lenks [Tue, 5 Feb 2013 16:48:26 +0000 (11:48 -0500)]
Add fallback for if tracebox starts in solid

11 years agoStop manually adjusting the chase_* offset cvars, check origin normally
Samual Lenks [Tue, 5 Feb 2013 16:28:24 +0000 (11:28 -0500)]
Stop manually adjusting the chase_* offset cvars, check origin normally

11 years agoMerge remote-tracking branch 'origin/master' into samual/eventchase_boxlike_tracing
Samual Lenks [Tue, 5 Feb 2013 16:20:54 +0000 (11:20 -0500)]
Merge remote-tracking branch 'origin/master' into samual/eventchase_boxlike_tracing

11 years agoFix accuracy board always showing 0% average accuracy, long time bug present since...
terencehill [Tue, 5 Feb 2013 15:37:35 +0000 (16:37 +0100)]
Fix accuracy board always showing 0% average accuracy, long time bug present since Nov 22 2010 commit 0fbd36780

11 years agoBring back the possibility of showing plain white accuracy values in the scoreboard...
terencehill [Fri, 18 Jan 2013 22:33:30 +0000 (23:33 +0100)]
Bring back the possibility of showing plain white accuracy values in the scoreboard with the new cvar scoreboard_accuracy_nocolors (before it was possible by setting improperly accuracy_color_levels to "")

11 years agoPut accuracy colors code in external functions in miscfunctions.qc in order to avoid...
terencehill [Fri, 18 Jan 2013 22:29:13 +0000 (23:29 +0100)]
Put accuracy colors code in external functions in miscfunctions.qc in order to avoid duplicate code. Make so that color cvars are read only every 2 seconds, not every frame. Also fix 100% weapon accuracy color displayed black instead of green in the scoreboard

11 years agoDon't draw weapons panel content if it moved off the screen leaving visible only...
terencehill [Tue, 5 Feb 2013 10:09:39 +0000 (11:09 +0100)]
Don't draw weapons panel content if it moved off the screen leaving visible only the border

11 years agoFix condition to stop drawing weapons panel when it completely disappears
terencehill [Tue, 5 Feb 2013 09:51:52 +0000 (10:51 +0100)]
Fix condition to stop drawing weapons panel when it completely disappears

11 years agoFix blocked cursor if hud config is already active on map start
terencehill [Tue, 5 Feb 2013 09:16:35 +0000 (10:16 +0100)]
Fix blocked cursor if hud config is already active on map start

11 years agoKeep the same cvar order of the current skins when saving pressedkeys panel cvars
terencehill [Tue, 5 Feb 2013 08:28:01 +0000 (09:28 +0100)]
Keep the same cvar order of the current skins when saving pressedkeys panel cvars

11 years agoFix check for hud_skin change that was always true, causing initialization of hud_ski...
terencehill [Tue, 5 Feb 2013 08:23:16 +0000 (09:23 +0100)]
Fix check for hud_skin change that was always true, causing initialization of hud_skin_path every frame

11 years agoGet rid of a console warning joining a team game if there's a team mate already playi...
terencehill [Tue, 5 Feb 2013 08:17:10 +0000 (09:17 +0100)]
Get rid of a console warning joining a team game if there's a team mate already playing (hud_shownames code calls HUD_Panel_DrawProgressBar before hud_skin_path initialization)

11 years agoMerge remote-tracking branch 'origin/Mario/domination_mutator'
Samual Lenks [Mon, 4 Feb 2013 22:01:58 +0000 (17:01 -0500)]
Merge remote-tracking branch 'origin/Mario/domination_mutator'

11 years agoMerge remote-tracking branch 'origin/master' into Mario/domination_mutator
Samual Lenks [Mon, 4 Feb 2013 21:49:01 +0000 (16:49 -0500)]
Merge remote-tracking branch 'origin/master' into Mario/domination_mutator

11 years agoSwitch to pmove_org (doesn't work)
Samual Lenks [Mon, 4 Feb 2013 21:42:32 +0000 (16:42 -0500)]
Switch to pmove_org (doesn't work)

11 years agoMore logical cvar names...
Samual Lenks [Mon, 4 Feb 2013 03:37:55 +0000 (22:37 -0500)]
More logical cvar names...

11 years agoMuch better handling of eventchase camera
Samual Lenks [Mon, 4 Feb 2013 03:32:03 +0000 (22:32 -0500)]
Much better handling of eventchase camera

11 years agofix typos
Rudolf Polzer [Fri, 1 Feb 2013 14:01:56 +0000 (15:01 +0100)]
fix typos

11 years agooops, fix warmup
Rudolf Polzer [Fri, 1 Feb 2013 13:39:28 +0000 (14:39 +0100)]
oops, fix warmup

11 years agodon't count alivetime in warmup
Rudolf Polzer [Fri, 1 Feb 2013 13:38:00 +0000 (14:38 +0100)]
don't count alivetime in warmup

11 years agoclear alivetime on ready-restart
Rudolf Polzer [Fri, 1 Feb 2013 13:35:19 +0000 (14:35 +0100)]
clear alivetime on ready-restart

11 years agoMerge branch 'divVerent/rank-change', fixes #1391, fixes #1388
Rudolf Polzer [Fri, 1 Feb 2013 13:14:14 +0000 (14:14 +0100)]
Merge branch 'divVerent/rank-change', fixes #1391, fixes #1388

11 years agoMerge branch 'master' into divVerent/rank-change
Rudolf Polzer [Fri, 1 Feb 2013 11:57:54 +0000 (12:57 +0100)]
Merge branch 'master' into divVerent/rank-change

11 years agoMerge branch 'master' into mario/domination_mutator
Mario [Thu, 31 Jan 2013 10:40:55 +0000 (21:40 +1100)]
Merge branch 'master' into mario/domination_mutator

11 years agofix the CA dead-player bug
Rudolf Polzer [Thu, 31 Jan 2013 09:18:45 +0000 (10:18 +0100)]
fix the CA dead-player bug

11 years agoAdd a #message for when stuffto is enabled
Samual Lenks [Thu, 31 Jan 2013 08:03:31 +0000 (03:03 -0500)]
Add a #message for when stuffto is enabled

11 years agovarious mutator system fixes; add proper rollback of failed add, fixes #1145
Rudolf Polzer [Wed, 30 Jan 2013 13:22:46 +0000 (14:22 +0100)]
various mutator system fixes; add proper rollback of failed add, fixes #1145

11 years agoMerge remote-tracking branch 'origin/mirceakitsune/physical_entities'
Rudolf Polzer [Wed, 30 Jan 2013 13:03:25 +0000 (14:03 +0100)]
Merge remote-tracking branch 'origin/mirceakitsune/physical_entities'

11 years agoFix minstanex impressive announcement
Samual Lenks [Wed, 30 Jan 2013 05:40:35 +0000 (00:40 -0500)]
Fix minstanex impressive announcement

11 years agoMerge remote-tracking branch 'origin/terencehill/reload_binds', closes #1360
Rudolf Polzer [Tue, 29 Jan 2013 19:30:22 +0000 (20:30 +0100)]
Merge remote-tracking branch 'origin/terencehill/reload_binds', closes #1360

11 years agomake other weapon cycle impulses also change spectating speed
ItsMe [Tue, 29 Jan 2013 19:27:23 +0000 (20:27 +0100)]
make other weapon cycle impulses also change spectating speed

11 years agoMoving Domination into the mutator API
Mario [Tue, 29 Jan 2013 12:31:43 +0000 (23:31 +1100)]
Moving Domination into the mutator API

11 years agoremove misleading comments
Rudolf Polzer [Tue, 29 Jan 2013 12:26:12 +0000 (13:26 +0100)]
remove misleading comments

11 years agoadd some useless file ;)
Rudolf Polzer [Tue, 29 Jan 2013 12:21:15 +0000 (13:21 +0100)]
add some useless file ;)

11 years agofix typos
Rudolf Polzer [Tue, 29 Jan 2013 09:47:30 +0000 (10:47 +0100)]
fix typos

11 years agofix Arena spectator status
Rudolf Polzer [Tue, 29 Jan 2013 09:02:06 +0000 (10:02 +0100)]
fix Arena spectator status

11 years agoRace/CTS: if you have a fastest lap, you should show up in the scoreboard any time
Rudolf Polzer [Tue, 29 Jan 2013 08:55:09 +0000 (09:55 +0100)]
Race/CTS: if you have a fastest lap, you should show up in the scoreboard any time

11 years agoadd latency to ALL players!
Rudolf Polzer [Tue, 29 Jan 2013 08:50:47 +0000 (09:50 +0100)]
add latency to ALL players!

11 years agoadd a nospectator flag to rank sorting
Rudolf Polzer [Tue, 29 Jan 2013 08:46:02 +0000 (09:46 +0100)]
add a nospectator flag to rank sorting

11 years agoMerge branch 'master' into divVerent/rank-change
Rudolf Polzer [Tue, 29 Jan 2013 08:43:46 +0000 (09:43 +0100)]
Merge branch 'master' into divVerent/rank-change

Conflicts:
qcsrc/server/playerstats.qc

11 years agoundo accidental commit of these files
Rudolf Polzer [Tue, 29 Jan 2013 08:33:24 +0000 (09:33 +0100)]
undo accidental commit of these files

11 years agobump version
Rudolf Polzer [Tue, 29 Jan 2013 08:32:41 +0000 (09:32 +0100)]
bump version

11 years agofix some bad uses of "var"
Rudolf Polzer [Fri, 25 Jan 2013 09:38:48 +0000 (10:38 +0100)]
fix some bad uses of "var"

11 years agoUSE GMQCC
Rudolf Polzer [Fri, 25 Jan 2013 08:57:30 +0000 (09:57 +0100)]
USE GMQCC

11 years agofix crouching :)
Rudolf Polzer [Fri, 25 Jan 2013 08:56:19 +0000 (09:56 +0100)]
fix crouching :)

11 years agomake crouch handling serverside again, for g_bloodloss
Rudolf Polzer [Fri, 25 Jan 2013 08:50:39 +0000 (09:50 +0100)]
make crouch handling serverside again, for g_bloodloss

11 years agofix a waypoint loading issue
Rudolf Polzer [Wed, 23 Jan 2013 13:38:19 +0000 (14:38 +0100)]
fix a waypoint loading issue

11 years agosimplify spectating detection logic, fixes #1383 again too
Rudolf Polzer [Wed, 23 Jan 2013 13:18:24 +0000 (14:18 +0100)]
simplify spectating detection logic, fixes #1383 again too

11 years agofix how alivetime is queried, fixes #1383 again
Rudolf Polzer [Wed, 23 Jan 2013 13:11:10 +0000 (14:11 +0100)]
fix how alivetime is queried, fixes #1383 again

11 years agoArena, LMS, CA: fix real vs spectator detection in player stats, fixes #1383
Rudolf Polzer [Wed, 23 Jan 2013 13:07:26 +0000 (14:07 +0100)]
Arena, LMS, CA: fix real vs spectator detection in player stats, fixes #1383

11 years ago_lerpanim_fixbone 2: only affect yaw
Rudolf Polzer [Wed, 23 Jan 2013 12:19:05 +0000 (13:19 +0100)]
_lerpanim_fixbone 2: only affect yaw

11 years agoundo debug print
Rudolf Polzer [Wed, 23 Jan 2013 12:11:08 +0000 (13:11 +0100)]
undo debug print

11 years agoanimdecide: don't reload model info every frame, only reload when modelindex changed
Rudolf Polzer [Wed, 23 Jan 2013 12:10:31 +0000 (13:10 +0100)]
animdecide: don't reload model info every frame, only reload when modelindex changed

11 years ago_animblend_fixbone: try fixing the animations when blending animations
Rudolf Polzer [Wed, 23 Jan 2013 12:06:59 +0000 (13:06 +0100)]
_animblend_fixbone: try fixing the animations when blending animations

This will ensure the aiming direction is always forward, at the cost of
possibly screwing up the anims.

11 years agoMerge branch 'master' into divVerent/csad
Rudolf Polzer [Wed, 23 Jan 2013 10:32:27 +0000 (11:32 +0100)]
Merge branch 'master' into divVerent/csad

Conflicts:
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh

11 years agoremove outdated comment
Rudolf Polzer [Tue, 22 Jan 2013 15:11:58 +0000 (16:11 +0100)]
remove outdated comment

11 years agoMerge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
terencehill [Sat, 19 Jan 2013 14:24:12 +0000 (15:24 +0100)]
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes

11 years agoRevert "add also a teamrank field (non strict order of teams)"
Rudolf Polzer [Wed, 16 Jan 2013 09:56:50 +0000 (10:56 +0100)]
Revert "add also a teamrank field (non strict order of teams)"

This reverts commit 41a232f236f88bd1c409d00bc3228df2899b93b0.

11 years agoadd also a teamrank field (non strict order of teams)
Rudolf Polzer [Tue, 15 Jan 2013 14:38:18 +0000 (15:38 +0100)]
add also a teamrank field (non strict order of teams)

11 years ago-1 in non-teamgames shall mean 0
Rudolf Polzer [Tue, 15 Jan 2013 14:26:21 +0000 (15:26 +0100)]
-1 in non-teamgames shall mean 0

11 years agoxonstat rank field: make this an actual player-only rank, ignoring teams
Rudolf Polzer [Tue, 15 Jan 2013 14:20:59 +0000 (15:20 +0100)]
xonstat rank field: make this an actual player-only rank, ignoring teams