]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
12 years agoStop centerprint countdown messages when an arena/CA/freezetag game ends
terencehill [Wed, 11 Jan 2012 17:47:22 +0000 (18:47 +0100)]
Stop centerprint countdown messages when an arena/CA/freezetag game ends

12 years agoMerge branch 'master' into terencehill/arena_and_ca_fixes
terencehill [Wed, 11 Jan 2012 12:34:08 +0000 (13:34 +0100)]
Merge branch 'master' into terencehill/arena_and_ca_fixes

12 years agoSome extra comments to chat code
Samual [Tue, 10 Jan 2012 22:15:35 +0000 (17:15 -0500)]
Some extra comments to chat code

12 years agoFix bots added after round start will never join the game
terencehill [Tue, 10 Jan 2012 21:45:36 +0000 (22:45 +0100)]
Fix bots added after round start will never join the game

12 years agoif intermission is active, spectators should be able to talk even if g_chat_nospectat...
Samual [Tue, 10 Jan 2012 21:34:03 +0000 (16:34 -0500)]
if intermission is active, spectators should be able to talk even if g_chat_nospectators is active -- the game is over, teams/spectating should not matter anymore.

12 years agoMerge remote branch 'origin/master'
Samual [Tue, 10 Jan 2012 17:48:45 +0000 (12:48 -0500)]
Merge remote branch 'origin/master'

12 years agoMake showname tags fade out when a player is dead (according to csqcplayers)
Samual [Tue, 10 Jan 2012 17:47:24 +0000 (12:47 -0500)]
Make showname tags fade out when a player is dead (according to csqcplayers)

12 years agofix the colormod fix
Rudolf Polzer [Tue, 10 Jan 2012 11:05:33 +0000 (12:05 +0100)]
fix the colormod fix

12 years agoAdd extra check to make sure that a client has called ClientConnect, this way it...
Samual [Tue, 10 Jan 2012 04:42:26 +0000 (23:42 -0500)]
Add extra check to make sure that a client has called ClientConnect, this way it only sends the centerprints if the client is initialized

12 years agoMerge remote-tracking branch 'origin/divVerent/allow-override-item-model'
Rudolf Polzer [Mon, 9 Jan 2012 20:54:32 +0000 (21:54 +0100)]
Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'

Conflicts:
qcsrc/server/t_items.qc

12 years agoMerge remote-tracking branch 'origin/divVerent/waypointeditor-auto'
Rudolf Polzer [Mon, 9 Jan 2012 20:19:08 +0000 (21:19 +0100)]
Merge remote-tracking branch 'origin/divVerent/waypointeditor-auto'

12 years agofunc_plat: do not crash if broken
Rudolf Polzer [Mon, 9 Jan 2012 20:08:18 +0000 (21:08 +0100)]
func_plat: do not crash if broken

12 years agocopybody: also copy dphitcontentsmask
Rudolf Polzer [Mon, 9 Jan 2012 19:36:41 +0000 (20:36 +0100)]
copybody: also copy dphitcontentsmask

12 years agobring death glow back, fix issues with respawning
Rudolf Polzer [Mon, 9 Jan 2012 18:44:18 +0000 (19:44 +0100)]
bring death glow back, fix issues with respawning

12 years agoget rid of CSQCMODEL_EF_INVISIBLE
Rudolf Polzer [Mon, 9 Jan 2012 18:18:18 +0000 (19:18 +0100)]
get rid of CSQCMODEL_EF_INVISIBLE

12 years agorespawn ghosts: don't munge colormap
Rudolf Polzer [Mon, 9 Jan 2012 18:16:54 +0000 (19:16 +0100)]
respawn ghosts: don't munge colormap

12 years agoRevert "Fix colormap with copybody (so now, ghost bodies of dead players retain the...
Rudolf Polzer [Mon, 9 Jan 2012 18:13:33 +0000 (19:13 +0100)]
Revert "Fix colormap with copybody (so now, ghost bodies of dead players retain the player color instead of going white)"

This reverts commit a939674ad9b0e6b62ad9c3eb44ebc8b1d91b6792.

12 years agocsqcplayers: network death_time
Rudolf Polzer [Mon, 9 Jan 2012 18:08:26 +0000 (19:08 +0100)]
csqcplayers: network death_time

12 years agoLet spectators understand when an arena/ca/freezetag round is starting and who's...
terencehill [Mon, 9 Jan 2012 16:41:11 +0000 (17:41 +0100)]
Let spectators understand when an arena/ca/freezetag round is starting and who's the winner

12 years agoadd utility fields to detect player death
Rudolf Polzer [Mon, 9 Jan 2012 15:16:11 +0000 (16:16 +0100)]
add utility fields to detect player death

12 years agoremove the hack again, fixed the engine
Rudolf Polzer [Mon, 9 Jan 2012 15:07:57 +0000 (16:07 +0100)]
remove the hack again, fixed the engine

12 years agosave/restore velocity, don't ask why
Rudolf Polzer [Mon, 9 Jan 2012 12:27:30 +0000 (13:27 +0100)]
save/restore velocity, don't ask why

12 years agoproperly input velocity to V_CalcRefdef
Rudolf Polzer [Mon, 9 Jan 2012 12:23:01 +0000 (13:23 +0100)]
properly input velocity to V_CalcRefdef

12 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Mon, 9 Jan 2012 12:15:04 +0000 (13:15 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

12 years agochange hceck back to WIP1, it's harmless
Rudolf Polzer [Mon, 9 Jan 2012 12:13:49 +0000 (13:13 +0100)]
change hceck back to WIP1, it's harmless

12 years agouse DP_CSQC_V_CALCREFDEF_WIP2
Rudolf Polzer [Mon, 9 Jan 2012 12:09:31 +0000 (13:09 +0100)]
use DP_CSQC_V_CALCREFDEF_WIP2

12 years agoFix colormap with copybody (so now, ghost bodies of dead players retain the player...
Samual [Mon, 9 Jan 2012 04:33:57 +0000 (23:33 -0500)]
Fix colormap with copybody (so now, ghost bodies of dead players retain the player color instead of going white)

12 years agoIf (g_ca && !allowed_to_spawn) is true self.classname is set as "observer" just befor...
terencehill [Sun, 8 Jan 2012 21:45:13 +0000 (22:45 +0100)]
If (g_ca && !allowed_to_spawn) is true self.classname is set as "observer" just before, so remove this unneeded check

12 years agoBring back jump_interval to handle refire, this way primary and secondary are separat...
Samual [Sun, 8 Jan 2012 21:32:08 +0000 (16:32 -0500)]
Bring back jump_interval to handle refire, this way primary and secondary are separate with ATTACK_FINISHED, but secondary still has the benefits of prepare_attack.

12 years agoFirst round in CA: detect when the first player joins the game and try to start the...
terencehill [Sun, 8 Jan 2012 21:14:11 +0000 (22:14 +0100)]
First round in CA: detect when the first player joins the game and try to start the countdown.
It fixes bots never joining the game if added right at map start (bot_number already set when starting the server).

12 years agoThe ca code doesn't use the field spawned so don't check it
terencehill [Sat, 7 Jan 2012 21:29:29 +0000 (22:29 +0100)]
The ca code doesn't use the field spawned so don't check it
Also fix a typo in a comment

12 years agoMake tell work with magicear like previously
Samual [Sat, 7 Jan 2012 21:41:34 +0000 (16:41 -0500)]
Make tell work with magicear like previously

12 years agoMerge remote branch 'origin/mirceakitsune/preview_images'
Samual [Sat, 7 Jan 2012 19:39:16 +0000 (14:39 -0500)]
Merge remote branch 'origin/mirceakitsune/preview_images'

12 years agoMerge remote branch 'origin/master' into mirceakitsune/preview_images
Samual [Sat, 7 Jan 2012 19:38:23 +0000 (14:38 -0500)]
Merge remote branch 'origin/master' into mirceakitsune/preview_images

12 years agocsqcplayers: fix wrong input_buttons in a case that shouldn't ever happen
Rudolf Polzer [Sat, 7 Jan 2012 18:34:10 +0000 (19:34 +0100)]
csqcplayers: fix wrong input_buttons in a case that shouldn't ever happen

12 years agoMerge remote branch 'origin/master' into mirceakitsune/preview_images
Samual [Sat, 7 Jan 2012 18:18:00 +0000 (13:18 -0500)]
Merge remote branch 'origin/master' into mirceakitsune/preview_images

Conflicts:
qcsrc/common/util.qh

12 years agosimplify forcemodels code a bit
Rudolf Polzer [Sat, 7 Jan 2012 17:14:29 +0000 (18:14 +0100)]
simplify forcemodels code a bit

12 years agoFix autoscreenshot system - don't use an alias anymore, but instead use the already...
Samual [Fri, 6 Jan 2012 23:34:04 +0000 (18:34 -0500)]
Fix autoscreenshot system - don't use an alias anymore, but instead use the already added "cl_autoscreenshot" cvar to allow/disallow automatic screenshots. (helps prevent cheating)

12 years agoMerge branch 'master' into terencehill/arena_and_ca_fixes
terencehill [Fri, 6 Jan 2012 23:32:48 +0000 (00:32 +0100)]
Merge branch 'master' into terencehill/arena_and_ca_fixes

12 years agoUpdate voting aliases for client/server specific functions
Samual [Fri, 6 Jan 2012 22:38:09 +0000 (17:38 -0500)]
Update voting aliases for client/server specific functions

12 years agoAdd bad cvar
Samual [Fri, 6 Jan 2012 21:49:17 +0000 (16:49 -0500)]
Add bad cvar

12 years agoGlobal cvar for all sv_fraginfo stuff, plus make the entire thing support between...
Samual [Fri, 6 Jan 2012 21:47:51 +0000 (16:47 -0500)]
Global cvar for all sv_fraginfo stuff, plus make the entire thing support between warmup and normal mode

12 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 6 Jan 2012 17:14:38 +0000 (18:14 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

12 years agoforcemodels: handle missing model better
Rudolf Polzer [Fri, 6 Jan 2012 16:42:27 +0000 (17:42 +0100)]
forcemodels: handle missing model better

12 years agoAlso add alias to commands.cfg
Samual [Fri, 6 Jan 2012 16:09:32 +0000 (11:09 -0500)]
Also add alias to commands.cfg

12 years agoAdd another hard coded alias for compatibility (will be removed after 0.6 release)
Samual [Fri, 6 Jan 2012 16:06:39 +0000 (11:06 -0500)]
Add another hard coded alias for compatibility (will be removed after 0.6 release)

12 years agot
Rudolf Polzer [Fri, 6 Jan 2012 15:17:38 +0000 (16:17 +0100)]
t

12 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 6 Jan 2012 14:57:51 +0000 (15:57 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

12 years ago2 more crosshairs for asyyy
Rudolf Polzer [Fri, 6 Jan 2012 14:57:22 +0000 (15:57 +0100)]
2 more crosshairs for asyyy

12 years agoCA: stop the countdown immediately if one team is empty, old behaviour wasn't good...
terencehill [Thu, 5 Jan 2012 22:41:58 +0000 (23:41 +0100)]
CA: stop the countdown immediately if one team is empty, old behaviour wasn't good as teams were checked in a weird way after the round already started. This change further improves CA code logic.

12 years agoMerge branch 'master' into terencehill/arena_and_ca_fixes
terencehill [Thu, 5 Jan 2012 20:15:34 +0000 (21:15 +0100)]
Merge branch 'master' into terencehill/arena_and_ca_fixes

12 years ago2 new features: Don't switch away from a weapon if one of its modes can still fire...
Samual [Thu, 5 Jan 2012 21:33:20 +0000 (16:33 -0500)]
2 new features: Don't switch away from a weapon if one of its modes can still fire (excluding rocketlauncher detonation and nexgun zoom, those aren't real fire modes), and a feature for electro combo to ONLY allow firing of the secondary if the primary still has enough ammo after that.

12 years agoAllow master to actually do normal vote commands too (should've been like this before...
Samual [Thu, 5 Jan 2012 19:51:25 +0000 (14:51 -0500)]
Allow master to actually do normal vote commands too (should've been like this before, accidentally was broken)

12 years agoFix some aliases and add compatibility with older servers (though, it does throw...
Samual [Thu, 5 Jan 2012 19:46:24 +0000 (14:46 -0500)]
Fix some aliases and add compatibility with older servers (though, it does throw an error of invalid command, it is on purpose for compatibility)

12 years agoPut spectators at origin plus player view offset, this way they don't spawn on the...
Samual [Thu, 5 Jan 2012 19:38:49 +0000 (14:38 -0500)]
Put spectators at origin plus player view offset, this way they don't spawn on the ground but at normal view height.

12 years agoThese are entirely unrelated to minstagib, place them outside of the conditional...
Samual [Thu, 5 Jan 2012 19:18:25 +0000 (14:18 -0500)]
These are entirely unrelated to minstagib, place them outside of the conditional here

12 years agoFix bug with minstagib not using prepare attack
Samual [Thu, 5 Jan 2012 19:14:22 +0000 (14:14 -0500)]
Fix bug with minstagib not using prepare attack

12 years agoFix division by zero
Samual [Thu, 5 Jan 2012 18:32:54 +0000 (13:32 -0500)]
Fix division by zero

12 years agorename to check-cvars
Rudolf Polzer [Thu, 5 Jan 2012 09:41:50 +0000 (10:41 +0100)]
rename to check-cvars

12 years agoremove 4 unused cvars
Rudolf Polzer [Thu, 5 Jan 2012 09:41:19 +0000 (10:41 +0100)]
remove 4 unused cvars

12 years agoMerge remote-tracking branch 'origin/terencehill/hud_skin_files_sync'
Rudolf Polzer [Thu, 5 Jan 2012 09:36:36 +0000 (10:36 +0100)]
Merge remote-tracking branch 'origin/terencehill/hud_skin_files_sync'

12 years agoMerge remote-tracking branch 'origin/nifrek/duckanims'
Rudolf Polzer [Thu, 5 Jan 2012 09:30:26 +0000 (10:30 +0100)]
Merge remote-tracking branch 'origin/nifrek/duckanims'

12 years agoRemove some trash
terencehill [Wed, 4 Jan 2012 20:59:06 +0000 (21:59 +0100)]
Remove some trash

12 years agoMake CA code a bit more intuitive by playing with the var next_round rather than...
terencehill [Wed, 4 Jan 2012 20:54:03 +0000 (21:54 +0100)]
Make CA code a bit more intuitive by playing with the var next_round rather than using the var stopalivecheck.

12 years agoMerge remote branch 'origin/samual/updatecommands'
Samual [Wed, 4 Jan 2012 17:12:06 +0000 (12:12 -0500)]
Merge remote branch 'origin/samual/updatecommands'

12 years agoFinal preparations/cleanup/fixes before merge
Samual [Wed, 4 Jan 2012 17:10:08 +0000 (12:10 -0500)]
Final preparations/cleanup/fixes before merge

12 years agoMerge remote branch 'origin/master' into samual/updatecommands
Samual [Wed, 4 Jan 2012 16:47:52 +0000 (11:47 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands

12 years agodon't overemphasize direct hits
Rudolf Polzer [Wed, 4 Jan 2012 12:48:26 +0000 (13:48 +0100)]
don't overemphasize direct hits

12 years agoMerge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 4 Jan 2012 12:44:30 +0000 (13:44 +0100)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

12 years agodamageextraradius for svqc too
Rudolf Polzer [Wed, 4 Jan 2012 12:41:49 +0000 (13:41 +0100)]
damageextraradius for svqc too

12 years agoadd a field .damageextraradius to DamageInfo entities to be able to tune how much...
Rudolf Polzer [Wed, 4 Jan 2012 12:34:09 +0000 (13:34 +0100)]
add a field .damageextraradius to DamageInfo entities to be able to tune how much an entity "attracts" damage

12 years agoMerge remote-tracking branch 'origin/master' into samual/updatecommands
Samual [Wed, 4 Jan 2012 03:56:42 +0000 (22:56 -0500)]
Merge remote-tracking branch 'origin/master' into samual/updatecommands

12 years agoFixes for sv_fraginfo
Samual [Tue, 3 Jan 2012 19:18:26 +0000 (14:18 -0500)]
Fixes for sv_fraginfo

12 years agoMerge branch 'mirceakitsune/preview_images' of git://de.git.xonotic.org/xonotic/xonot...
Mircea Kitsune [Tue, 3 Jan 2012 16:56:41 +0000 (18:56 +0200)]
Merge branch 'mirceakitsune/preview_images' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into mirceakitsune/preview_images

12 years agoUse draw_PictureSize == '0 0 0' instead of draw_PreloadPicture == "", since preloadin...
Mircea Kitsune [Tue, 3 Jan 2012 16:55:47 +0000 (18:55 +0200)]
Use draw_PictureSize == '0 0 0' instead of draw_PreloadPicture == "", since preloading causes a memory leak. Requires latest engine to work properly.

12 years agoMerge remote branch 'origin/master' into mirceakitsune/preview_images
Samual [Tue, 3 Jan 2012 16:44:59 +0000 (11:44 -0500)]
Merge remote branch 'origin/master' into mirceakitsune/preview_images

12 years agoMerge branch 'master' into mirceakitsune/preview_images
Mircea Kitsune [Tue, 3 Jan 2012 16:43:59 +0000 (18:43 +0200)]
Merge branch 'master' into mirceakitsune/preview_images

12 years agoAdd red error text in image
Samual [Tue, 3 Jan 2012 16:39:20 +0000 (11:39 -0500)]
Add red error text in image

12 years agocl_forcemyplayer*
Rudolf Polzer [Tue, 3 Jan 2012 15:19:59 +0000 (16:19 +0100)]
cl_forcemyplayer*

12 years agoput the colors in rainbow order on the menu
Rudolf Polzer [Tue, 3 Jan 2012 14:20:42 +0000 (15:20 +0100)]
put the colors in rainbow order on the menu

12 years agomake white whiter
Rudolf Polzer [Tue, 3 Jan 2012 13:49:44 +0000 (14:49 +0100)]
make white whiter

12 years agofix palette lump file
Rudolf Polzer [Tue, 3 Jan 2012 13:32:46 +0000 (14:32 +0100)]
fix palette lump file

12 years agotry to fix some camouflagish colors
Rudolf Polzer [Tue, 3 Jan 2012 13:21:36 +0000 (14:21 +0100)]
try to fix some camouflagish colors

12 years agoMerge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 3 Jan 2012 12:02:44 +0000 (13:02 +0100)]
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir

12 years agoincrease the default curl speed a little again
Rudolf Polzer [Tue, 3 Jan 2012 12:02:28 +0000 (13:02 +0100)]
increase the default curl speed a little again

12 years agoAdd a check
terencehill [Mon, 2 Jan 2012 20:27:37 +0000 (21:27 +0100)]
Add a check

12 years agoReplace the terrible "missing preview" images with some better but still slightly...
Samual [Mon, 2 Jan 2012 17:53:32 +0000 (12:53 -0500)]
Replace the terrible "missing preview" images with some better but still slightly terrible images

12 years agoMerge remote branch 'origin/master' into mirceakitsune/preview_images
Samual [Mon, 2 Jan 2012 05:52:58 +0000 (00:52 -0500)]
Merge remote branch 'origin/master' into mirceakitsune/preview_images

Conflicts:
qcsrc/client/mapvoting.qc

12 years agoAvoid counting another time players of each CA team when detecting if teams are ok...
terencehill [Sun, 1 Jan 2012 23:05:30 +0000 (00:05 +0100)]
Avoid counting another time players of each CA team when detecting if teams are ok (thanks to the previous commit we can call the code to count players before Arena_Warmup)

12 years agoFix blocked bots in arena games by calling Arena_Warmup in StartFrame rather than...
terencehill [Sun, 1 Jan 2012 21:57:57 +0000 (22:57 +0100)]
Fix blocked bots in arena games by calling Arena_Warmup in StartFrame rather than in PlayerPostThink (reading its code it's cleaner to be executed there anyway)

12 years agoMerge remote branch 'origin/master' into samual/updatecommands
Samual [Sun, 1 Jan 2012 20:21:47 +0000 (15:21 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands

12 years agomore tooltip friendly description
Rudolf Polzer [Sun, 1 Jan 2012 20:20:22 +0000 (21:20 +0100)]
more tooltip friendly description

12 years agoMerge remote branch 'origin/master' into samual/updatecommands
Samual [Sun, 1 Jan 2012 20:19:01 +0000 (15:19 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands

12 years agoto the menu
Rudolf Polzer [Sun, 1 Jan 2012 20:14:39 +0000 (21:14 +0100)]
to the menu

12 years agoMerge remote branch 'origin/master' into samual/updatecommands
Samual [Sun, 1 Jan 2012 20:11:16 +0000 (15:11 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands

12 years agodocument the cvar
Rudolf Polzer [Sun, 1 Jan 2012 20:09:58 +0000 (21:09 +0100)]
document the cvar

12 years agosv_forceplayercolors
Rudolf Polzer [Sun, 1 Jan 2012 20:09:04 +0000 (21:09 +0100)]
sv_forceplayercolors

12 years agoDo not send the centerprint countdown message when an arena game ends (and there...
terencehill [Sun, 1 Jan 2012 18:35:10 +0000 (19:35 +0100)]
Do not send the centerprint countdown message when an arena game ends (and there are at least 3 clients in the server)

12 years agorenumber notification types to annoy mi..., I mean, to prevent clashes with future...
Rudolf Polzer [Sun, 1 Jan 2012 16:17:39 +0000 (17:17 +0100)]
renumber notification types to annoy mi..., I mean, to prevent clashes with future death type additions

12 years agocleanup headshot handling
Rudolf Polzer [Sun, 1 Jan 2012 16:14:08 +0000 (17:14 +0100)]
cleanup headshot handling