xonotic/xonotic-data.pk3dir.git
11 years agoan "easier" physics config, but not really convinced of it
Rudolf Polzer [Tue, 13 Jul 2010 20:35:04 +0000 (22:35 +0200)]
an "easier" physics config, but not really convinced of it

11 years agopreliminary new credits file - note: it sure has many mistakes, please correct or...
Rudolf Polzer [Mon, 12 Jul 2010 07:21:31 +0000 (09:21 +0200)]
preliminary new credits file - note: it sure has many mistakes, please correct or notify me about them. Also please tell me whether you want to appear with real name or just nickname.

11 years agoCopyBody: also copy glowmod
Rudolf Polzer [Sun, 11 Jul 2010 14:13:58 +0000 (16:13 +0200)]
CopyBody: also copy glowmod

11 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/bots_update'
Rudolf Polzer [Sat, 10 Jul 2010 20:17:32 +0000 (22:17 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/bots_update'

11 years agoSeraphina, not Stephania :P Should be ready to merge again.
Mircea Kitsune [Sat, 10 Jul 2010 00:39:11 +0000 (03:39 +0300)]
Seraphina, not Stephania :P Should be ready to merge again.

11 years agomake the shooting star death available outside of debug
MrBougo [Fri, 9 Jul 2010 18:27:51 +0000 (20:27 +0200)]
make the shooting star death available outside of debug

new cvar: g_maxspeed, 0 default (no limits), any player who goes faster gets killed

11 years agoUpdate models in bots.txt to use all available player models. I tried matching them...
Mircea Kitsune [Mon, 5 Jul 2010 11:21:03 +0000 (14:21 +0300)]
Update models in bots.txt to use all available player models. I tried matching them to the Nexuiz bots.txt (match Xonotic's models to the most similar models there) so their names colors and skills would still fit who they are.

11 years agouse fall.ogg name
Rudolf Polzer [Mon, 5 Jul 2010 06:14:11 +0000 (08:14 +0200)]
use fall.ogg name

11 years agoundo some buggy bugfixes - these need to be redone in a more working way:
Rudolf Polzer [Mon, 5 Jul 2010 06:08:26 +0000 (08:08 +0200)]
undo some buggy bugfixes - these need to be redone in a more working way:
- extendmatchtime: it should check for >= 0, not > 0
- QC code should not know about these aliases, as they are just that - aliases
- instead, maybe an alias-provided way should be provided for checking if a votable alias can be executed
- also fix a newly introduced spelling error

11 years agoMerge remote branch 'origin/terencehill/misc_bugfixes'
Rudolf Polzer [Mon, 5 Jul 2010 06:07:14 +0000 (08:07 +0200)]
Merge remote branch 'origin/terencehill/misc_bugfixes'

11 years agoremove and fix broken symlinks
Rudolf Polzer [Mon, 5 Jul 2010 06:05:11 +0000 (08:05 +0200)]
remove and fix broken symlinks

11 years agoCorrected typo in ignis description
PlasmaSheep [Mon, 5 Jul 2010 01:18:03 +0000 (18:18 -0700)]
Corrected typo in ignis description

11 years agoUmbra now uses radio woman voice
PlasmaSheep [Mon, 5 Jul 2010 01:08:55 +0000 (18:08 -0700)]
Umbra now uses radio woman voice

11 years agoNyx now uses radio woman voice
PlasmaSheep [Mon, 5 Jul 2010 01:08:38 +0000 (18:08 -0700)]
Nyx now uses radio woman voice

11 years agoSeraphina masked now uses radio woman voice
PlasmaSheep [Mon, 5 Jul 2010 01:07:08 +0000 (18:07 -0700)]
Seraphina masked now uses radio woman voice

11 years agoDrinking and developing don't mix, kids.
PlasmaSheep [Mon, 5 Jul 2010 01:06:14 +0000 (18:06 -0700)]
Drinking and developing don't mix, kids.

11 years agoignis masked is now using good voices that sound like he has a mask
PlasmaSheep [Mon, 5 Jul 2010 00:53:43 +0000 (17:53 -0700)]
ignis masked is now using good voices that sound like he has a mask

11 years agoWTF is with these improperly named files
PlasmaSheep [Mon, 5 Jul 2010 00:52:17 +0000 (17:52 -0700)]
WTF is with these improperly named files

11 years agotypo on ignis voices
PlasmaSheep [Mon, 5 Jul 2010 00:47:38 +0000 (17:47 -0700)]
typo on ignis voices

11 years agoAdded ignis halfmasked voices
PlasmaSheep [Mon, 5 Jul 2010 00:44:36 +0000 (17:44 -0700)]
Added ignis halfmasked voices

11 years agoAdded ignis voices - had to be old man voice for lack of an option, and because Fruti...
PlasmaSheep [Mon, 5 Jul 2010 00:41:13 +0000 (17:41 -0700)]
Added ignis voices - had to be old man voice for lack of an option, and because FrutieX said so :P

11 years agoOnly one fall...
PlasmaSheep [Mon, 5 Jul 2010 00:32:35 +0000 (17:32 -0700)]
Only one fall...

11 years agoAdded gak sounds for variations of gak (linked files)
PlasmaSheep [Sun, 4 Jul 2010 23:58:52 +0000 (16:58 -0700)]
Added gak sounds for variations of gak (linked files)

11 years agoAdded gak sounds
PlasmaSheep [Sun, 4 Jul 2010 23:49:32 +0000 (16:49 -0700)]
Added gak sounds

11 years agoOnly one fall
PlasmaSheep [Sun, 4 Jul 2010 23:48:03 +0000 (16:48 -0700)]
Only one fall

11 years agoFixed typo
PlasmaSheep [Sun, 4 Jul 2010 23:42:05 +0000 (16:42 -0700)]
Fixed typo

11 years agoAdded sounds for erebus
PlasmaSheep [Sun, 4 Jul 2010 23:35:45 +0000 (16:35 -0700)]
Added sounds for erebus

11 years agoagain, only one fall
PlasmaSheep [Sun, 4 Jul 2010 23:31:59 +0000 (16:31 -0700)]
again, only one fall

11 years agoMoved two files from ideas to coms, as they are actually being used
PlasmaSheep [Sun, 4 Jul 2010 23:26:59 +0000 (16:26 -0700)]
Moved two files from ideas to coms, as they are actually being used

11 years agoMerge branch 'master' into terencehill/misc_bugfixes
terencehill [Sun, 4 Jul 2010 23:08:29 +0000 (01:08 +0200)]
Merge branch 'master' into terencehill/misc_bugfixes

11 years agoIt's seenflag, not flagseen
PlasmaSheep [Sun, 4 Jul 2010 22:52:37 +0000 (15:52 -0700)]
It's seenflag, not flagseen

11 years agoorganized torus sounds dir
PlasmaSheep [Sun, 4 Jul 2010 22:47:58 +0000 (15:47 -0700)]
organized torus sounds dir

11 years agoAdded sounds for seraphina (copy of pyria)
PlasmaSheep [Sun, 4 Jul 2010 22:32:36 +0000 (15:32 -0700)]
Added sounds for seraphina (copy of pyria)

11 years agoOnly one fall sound, should not have a number
PlasmaSheep [Sun, 4 Jul 2010 22:22:10 +0000 (15:22 -0700)]
Only one fall sound, should not have a number

11 years agoPyria sounds uncommented
PlasmaSheep [Sun, 4 Jul 2010 22:20:22 +0000 (15:20 -0700)]
Pyria sounds uncommented

11 years agoMerge remote branch 'refs/remotes/origin/diabolik/lodplayers'
Rudolf Polzer [Sun, 4 Jul 2010 19:11:10 +0000 (21:11 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/lodplayers'

11 years agoremove g_spawnpoints_autodrop as it breaks maps, and should not be needed any more...
Rudolf Polzer [Sun, 4 Jul 2010 16:51:32 +0000 (18:51 +0200)]
remove g_spawnpoints_autodrop as it breaks maps, and should not be needed any more (was 0 by default for ages)

11 years agoFramegroups for the lods and remove pyria lods(to be replaced later).
Sahil Singhal [Fri, 2 Jul 2010 18:52:11 +0000 (14:52 -0400)]
Framegroups for the lods and remove pyria lods(to be replaced later).

11 years agoErebus, Ignis, IgnisMasked, Seraphina, SeraphinaMasked
Sahil Singhal [Fri, 2 Jul 2010 18:23:24 +0000 (14:23 -0400)]
Erebus, Ignis, IgnisMasked, Seraphina, SeraphinaMasked

11 years agothis is only used if the matching config file is loaded
Stephan Stahl [Fri, 2 Jul 2010 13:31:09 +0000 (15:31 +0200)]
this is only used if the matching config file is loaded

11 years agowhen calling hooks, use a final \n and not ;
Rudolf Polzer [Fri, 2 Jul 2010 11:50:56 +0000 (13:50 +0200)]
when calling hooks, use a final \n and not ;

11 years agofix issue with having no weapon currently selected
Rudolf Polzer [Fri, 2 Jul 2010 11:48:44 +0000 (13:48 +0200)]
fix issue with having no weapon currently selected

11 years agofix dummy weapon info
Rudolf Polzer [Fri, 2 Jul 2010 11:46:31 +0000 (13:46 +0200)]
fix dummy weapon info

11 years agorename to hook-firing_swap.cfg; document how to add it together with other scripts...
Rudolf Polzer [Fri, 2 Jul 2010 11:46:03 +0000 (13:46 +0200)]
rename to hook-firing_swap.cfg; document how to add it together with other scripts (like fov)

11 years agoMove cvars to the script file too
Mircea Kitsune [Fri, 2 Jul 2010 11:31:04 +0000 (14:31 +0300)]
Move cvars to the script file too

11 years agoFix an issue introduced with separating the script
Mircea Kitsune [Fri, 2 Jul 2010 11:28:31 +0000 (14:28 +0300)]
Fix an issue introduced with separating the script

11 years agoMove the script to its own config file, as suggested by divVerent
Mircea Kitsune [Fri, 2 Jul 2010 11:22:18 +0000 (14:22 +0300)]
Move the script to its own config file, as suggested by divVerent

11 years agopreattack -> fire
Mircea Kitsune [Fri, 2 Jul 2010 11:14:07 +0000 (14:14 +0300)]
preattack -> fire

11 years agoMerge branch 'master' into mirceakitsune/reverse_firing_buttons
Mircea Kitsune [Fri, 2 Jul 2010 10:45:58 +0000 (13:45 +0300)]
Merge branch 'master' into mirceakitsune/reverse_firing_buttons

11 years agoFix a bug in the address field of the Servers dialog:
terencehill [Fri, 2 Jul 2010 09:14:48 +0000 (11:14 +0200)]
Fix a bug in the address field of the Servers dialog:
After the info dialog of a server has been opened by right click (not by space), the address field cannot be edited anymore.

listbox believed mouse key was still pressed after the dialog spawned.

11 years agomove reticle from textures/ to gfx/
Rudolf Polzer [Fri, 2 Jul 2010 08:22:14 +0000 (10:22 +0200)]
move reticle from textures/ to gfx/

11 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/nex_reticle'
Rudolf Polzer [Fri, 2 Jul 2010 08:19:20 +0000 (10:19 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/nex_reticle'

11 years agoActually fix rifle and electro.
Sahil Singhal [Thu, 1 Jul 2010 15:05:33 +0000 (11:05 -0400)]
Actually fix rifle and electro.

11 years agocvar leadlimit_and_fraglimit: if set, both leadlimit and fraglimit must be reached...
Rudolf Polzer [Fri, 2 Jul 2010 07:45:51 +0000 (09:45 +0200)]
cvar leadlimit_and_fraglimit: if set, both leadlimit and fraglimit must be reached to the end the game (or, of course, timelimit), like in table tennis

11 years agoIn case timelimit is 0 (infinite) do not allow extendmatchtime to increase timelimit...
terencehill [Thu, 1 Jul 2010 22:52:20 +0000 (00:52 +0200)]
In case timelimit is 0 (infinite) do not allow extendmatchtime to increase timelimit, therefore making it finite.
Still in this case, do not allow to call a vote for extendmatchtime or reducematchtime, as they don't do anything anyway.

11 years agoUse numpad enter key and add other 2 instances of numpad keys in the menu.
terencehill [Thu, 1 Jul 2010 22:41:46 +0000 (00:41 +0200)]
Use numpad enter key and add other 2 instances of numpad keys in the menu.

11 years agoDon't check for changes when un-firing, since that's completely useless and unneeded...
Mircea Kitsune [Thu, 1 Jul 2010 20:51:18 +0000 (23:51 +0300)]
Don't check for changes when un-firing, since that's completely useless and unneeded. Also change a name to something better.

11 years agoMore cosmetic changes to the script
Mircea Kitsune [Thu, 1 Jul 2010 12:12:04 +0000 (15:12 +0300)]
More cosmetic changes to the script

11 years agoMake some comments sound better
Mircea Kitsune [Thu, 1 Jul 2010 11:59:31 +0000 (14:59 +0300)]
Make some comments sound better

11 years agoFix final comments. Afaik this should now be ready for testing and committing
Mircea Kitsune [Thu, 1 Jul 2010 00:44:23 +0000 (03:44 +0300)]
Fix final comments. Afaik this should now be ready for testing and committing

11 years agoMake the button swap update when refiring the weapon too, so we won't have to switch...
Mircea Kitsune [Thu, 1 Jul 2010 00:26:25 +0000 (03:26 +0300)]
Make the button swap update when refiring the weapon too, so we won't have to switch to another weapon and back to see the change. This fixes all known issues with the script :)

11 years agoFix issues with weapon switching while keeping the fire button pressed, when switchin...
Mircea Kitsune [Thu, 1 Jul 2010 00:06:21 +0000 (03:06 +0300)]
Fix issues with weapon switching while keeping the fire button pressed, when switching between a weapon with reverse enabled and one without.

11 years agoFix comments, alignment and names. The script still has some small issues though.
Mircea Kitsune [Wed, 30 Jun 2010 20:42:57 +0000 (23:42 +0300)]
Fix comments, alignment and names. The script still has some small issues though.

11 years agoScript now finished and working. Still not ready but it's usable and testable now.
Mircea Kitsune [Wed, 30 Jun 2010 20:16:42 +0000 (23:16 +0300)]
Script now finished and working. Still not ready but it's usable and testable now.

11 years agoMore progress with the script, but still not ready / working
Mircea Kitsune [Wed, 30 Jun 2010 20:06:00 +0000 (23:06 +0300)]
More progress with the script, but still not ready / working

11 years agoUpdate the (still not finished) script. Trying to figure out what's wrong decision_...
Mircea Kitsune [Wed, 30 Jun 2010 17:08:33 +0000 (20:08 +0300)]
Update the (still not finished) script. Trying to figure out what's wrong decision_ and why it doesn't work

11 years agoPart of the script, not yet ready nor working
Mircea Kitsune [Wed, 30 Jun 2010 15:25:00 +0000 (18:25 +0300)]
Part of the script, not yet ready nor working

11 years agoHook so the currently active weapon can be reported in the console. see cl_hook_activ...
Mircea Kitsune [Wed, 30 Jun 2010 13:40:26 +0000 (16:40 +0300)]
Hook so the currently active weapon can be reported in the console. see cl_hook_activeweapon. Still not ready, need to do the firing type script too

11 years agoThis branch will include a weapon code hook to be used with cvars, together with...
Mircea Kitsune [Wed, 30 Jun 2010 13:14:34 +0000 (16:14 +0300)]
This branch will include a weapon code hook to be used with cvars, together with a script which will allow swapping the weapon firing buttons. eg. Want the Mortar to shoot bouncy grenades with primary and explosive grenades with secondary? Set cl_reversefirebuttons_grenadelauncher 1. Committing the cvars for now...

11 years agoMerge branch 'master' into mirceakitsune/nex_reticle
Mircea Kitsune [Tue, 29 Jun 2010 10:53:07 +0000 (13:53 +0300)]
Merge branch 'master' into mirceakitsune/nex_reticle

11 years agoFix this bug: playing Arena the field score is never updated in the scoreboard. The...
terencehill [Sat, 26 Jun 2010 00:11:50 +0000 (02:11 +0200)]
Fix this bug: playing Arena the field score is never updated in the scoreboard. The cause is a typo, it was used player_cnt (count of CA players) instead of player_count (count of players in every game mode). That's why I've also renamed player_cnt in ca_players.

While I was at it I've made a small clean up to arena.qc, trimming some trailing space and converting some
FOR_EACH_CLIENT(self) if (self.classname == "player")
into
FOR_EACH_PLAYER(self).

11 years ago- fix misuse of && in a check
terencehill [Fri, 25 Jun 2010 23:47:15 +0000 (01:47 +0200)]
- fix misuse of && in a check
- fix (by putting braces) an else being wrongly the else of the if within the macro FOR_EACH_CLIENT

11 years agoFix the K_KP_* constants, they have different values from the corresponding ones...
terencehill [Fri, 25 Jun 2010 23:28:04 +0000 (01:28 +0200)]
Fix the K_KP_* constants, they have different values from the corresponding ones in the engine file keys.h (where the assignments are implicit).
Now that they are correct, allow the use of numpad keys in the menu.

11 years agoremove an outdated comment
terencehill [Fri, 25 Jun 2010 22:49:47 +0000 (00:49 +0200)]
remove an outdated comment

11 years agoadd *.iqm to .gitattributes
terencehill [Fri, 25 Jun 2010 22:47:50 +0000 (00:47 +0200)]
add *.iqm to .gitattributes

11 years agofix endless loops in Nex shots through recursive warpzones
Rudolf Polzer [Fri, 25 Jun 2010 11:00:57 +0000 (13:00 +0200)]
fix endless loops in Nex shots through recursive warpzones

11 years agomake trigger_warpzone_reconnect work, and give it the alias target_warpzone_reconnect
Rudolf Polzer [Fri, 25 Jun 2010 10:36:26 +0000 (12:36 +0200)]
make trigger_warpzone_reconnect work, and give it the alias target_warpzone_reconnect

11 years agofix a warpzone connection bug when using random warpzone arrangement
Rudolf Polzer [Fri, 25 Jun 2010 10:11:59 +0000 (12:11 +0200)]
fix a warpzone connection bug when using random warpzone arrangement

11 years agoAnother tiny alignment I missed
Mircea Kitsune [Thu, 24 Jun 2010 17:52:16 +0000 (20:52 +0300)]
Another tiny alignment I missed

11 years agoComment alignment and a small texture improvement
Mircea Kitsune [Thu, 24 Jun 2010 17:42:54 +0000 (20:42 +0300)]
Comment alignment and a small texture improvement

11 years agoFix a comment
Mircea Kitsune [Thu, 24 Jun 2010 17:11:27 +0000 (20:11 +0300)]
Fix a comment

11 years agoCvar whether or not we want reticles to fit the screen at the price of stretching...
Mircea Kitsune [Thu, 24 Jun 2010 17:08:26 +0000 (20:08 +0300)]
Cvar whether or not we want reticles to fit the screen at the price of stretching the image (disabled by default)

11 years agoSlightly better normal zoom reticle
Mircea Kitsune [Thu, 24 Jun 2010 16:45:50 +0000 (19:45 +0300)]
Slightly better normal zoom reticle

11 years agoMake 0 the disabled reticle. Should be safer.
Mircea Kitsune [Thu, 24 Jun 2010 16:15:39 +0000 (19:15 +0300)]
Make 0 the disabled reticle. Should be safer.

11 years agoPrevent reticle from showing during the respawn zoom effect or for spectators
Mircea Kitsune [Thu, 24 Jun 2010 16:10:44 +0000 (19:10 +0300)]
Prevent reticle from showing during the respawn zoom effect or for spectators

11 years agoAdd normal zoom reticle (when zooming with the zoom button). Still working on the...
Mircea Kitsune [Thu, 24 Jun 2010 16:01:22 +0000 (19:01 +0300)]
Add normal zoom reticle (when zooming with the zoom button). Still working on the texture.

11 years agomove shaderlist.txt into the individual dirs again now that we can
Rudolf Polzer [Thu, 24 Jun 2010 15:42:29 +0000 (17:42 +0200)]
move shaderlist.txt into the individual dirs again now that we can

11 years agoAdd zoomfraction check back, to avoid drawpic at 0 alpha.
Mircea Kitsune [Thu, 24 Jun 2010 15:25:10 +0000 (18:25 +0300)]
Add zoomfraction check back, to avoid drawpic at 0 alpha.

11 years agoMake a comment even more clear
Mircea Kitsune [Thu, 24 Jun 2010 15:16:38 +0000 (18:16 +0300)]
Make a comment even more clear

11 years agoComments
Mircea Kitsune [Thu, 24 Jun 2010 15:12:58 +0000 (18:12 +0300)]
Comments

11 years agoCall it reticle_type instead, in case the system might be used for other weapons...
Mircea Kitsune [Thu, 24 Jun 2010 15:00:55 +0000 (18:00 +0300)]
Call it reticle_type instead, in case the system might be used for other weapons that aren't based on zoom.

11 years agoPrecache the texture only if the cvar is enabled.
Mircea Kitsune [Thu, 24 Jun 2010 14:56:31 +0000 (17:56 +0300)]
Precache the texture only if the cvar is enabled.

11 years agoMust be persisted in order to work, of course :)
Mircea Kitsune [Thu, 24 Jun 2010 14:54:41 +0000 (17:54 +0300)]
Must be persisted in order to work, of course :)

11 years agoAdd code to separate between zoom types (currently between normal zoom and Nex zoom).
Mircea Kitsune [Thu, 24 Jun 2010 14:51:28 +0000 (17:51 +0300)]
Add code to separate between zoom types (currently between normal zoom and Nex zoom).

11 years agoSadly, we need to filter via button_attack2 too. If we don't the reticle also shows...
Mircea Kitsune [Thu, 24 Jun 2010 14:32:50 +0000 (17:32 +0300)]
Sadly, we need to filter via button_attack2 too. If we don't the reticle also shows when zooming with the zoom button other than the Nex alt fire. We need a different way to fade out I think.

11 years agoMerge branch 'mirceakitsune/nex_reticle' of ssh://git.xonotic.org/xonotic-data.pk3dir...
Mircea Kitsune [Thu, 24 Jun 2010 14:20:50 +0000 (17:20 +0300)]
Merge branch 'mirceakitsune/nex_reticle' of ssh://git.xonotic.org/xonotic-data.pk3dir into mirceakitsune/nex_reticle

11 years agoMerge branch 'master' into mirceakitsune/nex_reticle
Mircea Kitsune [Thu, 24 Jun 2010 14:18:33 +0000 (17:18 +0300)]
Merge branch 'master' into mirceakitsune/nex_reticle

11 years agowe no longer need loadfonts.cfg, just forgot to remove it from quake.rc too
Rudolf Polzer [Thu, 24 Jun 2010 12:43:26 +0000 (14:43 +0200)]
we no longer need loadfonts.cfg, just forgot to remove it from quake.rc too

11 years agoforce 1:1 aspect on reticle pic, also precache it
FruitieX [Thu, 24 Jun 2010 12:11:58 +0000 (15:11 +0300)]
force 1:1 aspect on reticle pic, also precache it

11 years agoMerge branch 'master' into mirceakitsune/nex_reticle
FruitieX [Thu, 24 Jun 2010 12:00:24 +0000 (15:00 +0300)]
Merge branch 'master' into mirceakitsune/nex_reticle