xonotic/xonotic-data.pk3dir.git
9 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

9 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'

9 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)

9 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).

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

9 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

9 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 ;

9 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

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

9 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)

9 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

9 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

9 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

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

9 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

9 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.

9 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/

9 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'

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

9 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

9 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.

9 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.

9 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.

9 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

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

9 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

9 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 :)

9 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.

9 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.

9 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.

9 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

9 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

9 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

9 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

9 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...

9 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

9 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).

9 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

9 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.

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

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

9 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

9 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

9 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

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

9 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

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

9 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)

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

9 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.

9 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

9 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.

9 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

9 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.

9 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

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

9 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.

9 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.

9 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 :)

9 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).

9 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.

9 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

9 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

9 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

9 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

9 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

9 years agoattempt at a camera fix
Rudolf Polzer [Thu, 24 Jun 2010 11:23:02 +0000 (13:23 +0200)]
attempt at a camera fix

9 years agoMerge remote branch 'refs/remotes/origin/diabolik/nexmodel'
Rudolf Polzer [Thu, 24 Jun 2010 08:10:12 +0000 (10:10 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/nexmodel'

9 years agonow PROPERLY apply draw_fontscale in TextWidth
Rudolf Polzer [Thu, 24 Jun 2010 08:04:33 +0000 (10:04 +0200)]
now PROPERLY apply draw_fontscale in TextWidth

9 years agoMerge commit 'origin/master' into diabolik/nexmodel
Sahil Singhal [Thu, 24 Jun 2010 03:54:55 +0000 (23:54 -0400)]
Merge commit 'origin/master' into diabolik/nexmodel

9 years agofix unban via rcon_restricted
Stephan Stahl [Wed, 23 Jun 2010 19:06:43 +0000 (21:06 +0200)]
fix unban via rcon_restricted

9 years agofix weapon count when sorting
Rudolf Polzer [Wed, 23 Jun 2010 13:07:02 +0000 (15:07 +0200)]
fix weapon count when sorting

9 years agomenu: fix lots of issues with font rendering
Rudolf Polzer [Wed, 23 Jun 2010 13:01:42 +0000 (15:01 +0200)]
menu: fix lots of issues with font rendering

9 years agoMerge branch 'master' into mirceakitsune/nex_reticle
Mircea Kitsune [Wed, 23 Jun 2010 11:22:00 +0000 (14:22 +0300)]
Merge branch 'master' into mirceakitsune/nex_reticle

9 years agolet's use a free font for now, even though it doesn't look totally good
Rudolf Polzer [Wed, 23 Jun 2010 10:57:35 +0000 (12:57 +0200)]
let's use a free font for now, even though it doesn't look totally good

9 years agoMerge remote branch 'refs/remotes/origin/terencehill/numbered_bots'
Rudolf Polzer [Wed, 23 Jun 2010 08:36:15 +0000 (10:36 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots'

9 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'
Rudolf Polzer [Wed, 23 Jun 2010 08:31:48 +0000 (10:31 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'

9 years agoMerge remote branch 'refs/remotes/origin/diabolik/iqmmodelfix'
Rudolf Polzer [Wed, 23 Jun 2010 08:21:59 +0000 (10:21 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/iqmmodelfix'

9 years agoget rid of md5sum dependency
Rudolf Polzer [Tue, 22 Jun 2010 15:04:14 +0000 (17:04 +0200)]
get rid of md5sum dependency

9 years agoRevert most of the balance changes vs nexuiz 2.5 balance. Feel free to revert parts...
Rudolf Polzer [Tue, 22 Jun 2010 15:00:00 +0000 (17:00 +0200)]
Revert most of the balance changes vs nexuiz 2.5 balance. Feel free to revert parts of this commit, or to improve balance based on this - this is just to get rid of the worst problems.

9 years agofix text overlap issue in menu key binder
magorian [Tue, 22 Jun 2010 14:53:02 +0000 (16:53 +0200)]
fix text overlap issue in menu key binder

9 years agoadd autocvars.qh
Rudolf Polzer [Tue, 22 Jun 2010 13:28:31 +0000 (15:28 +0200)]
add autocvars.qh

9 years agotry to reduce calls to ArrayGet*weaponorder
Rudolf Polzer [Tue, 22 Jun 2010 12:34:28 +0000 (14:34 +0200)]
try to reduce calls to ArrayGet*weaponorder

9 years agoFix conflict with Panel HUD: Add the code back in proper position.
Mircea Kitsune [Sat, 19 Jun 2010 23:03:41 +0000 (02:03 +0300)]
Fix conflict with Panel HUD: Add the code back in proper position.

9 years agoMerge branch 'master' into mirceakitsune/nex_reticle
Mircea Kitsune [Sat, 19 Jun 2010 22:59:33 +0000 (01:59 +0300)]
Merge branch 'master' into mirceakitsune/nex_reticle

9 years agoFix conflict with Panel HUD: Remove code from view.qc
Mircea Kitsune [Sat, 19 Jun 2010 22:59:22 +0000 (01:59 +0300)]
Fix conflict with Panel HUD: Remove code from view.qc

9 years agoMerge remote branch 'origin/fruitiex/newpanelhud_stable'
Rudolf Polzer [Sat, 19 Jun 2010 19:51:27 +0000 (21:51 +0200)]
Merge remote branch 'origin/fruitiex/newpanelhud_stable'

9 years agoupdate hudsetup map path in menu code
FruitieX [Sat, 19 Jun 2010 19:48:58 +0000 (22:48 +0300)]
update hudsetup map path in menu code

9 years agoMerge branch 'fruitiex/newpanelhud_stable'
Rudolf Polzer [Sat, 19 Jun 2010 19:08:41 +0000 (21:08 +0200)]
Merge branch 'fruitiex/newpanelhud_stable'

9 years agofix small typo, remove dead code
FruitieX [Sat, 19 Jun 2010 17:30:03 +0000 (20:30 +0300)]
fix small typo, remove dead code

9 years agoremove unneccessary resize check, not needed anymore when there are no more aspect...
FruitieX [Fri, 18 Jun 2010 21:35:43 +0000 (00:35 +0300)]
remove unneccessary resize check, not needed anymore when there are no more aspect forced panels

9 years agowoops fix silly bug with grid
FruitieX [Fri, 18 Jun 2010 21:32:50 +0000 (00:32 +0300)]
woops fix silly bug with grid

9 years agoaspect-independent pressedkeys panel
FruitieX [Fri, 18 Jun 2010 21:20:16 +0000 (00:20 +0300)]
aspect-independent pressedkeys panel

9 years agofix aspect on timer
FruitieX [Fri, 18 Jun 2010 20:41:18 +0000 (23:41 +0300)]
fix aspect on timer

9 years agoaspect fixing on engineinfo panel, broken_panel_cnt -= 1; :D
FruitieX [Fri, 18 Jun 2010 20:11:59 +0000 (23:11 +0300)]
aspect fixing on engineinfo panel, broken_panel_cnt -= 1; :D

9 years agodrawpic_aspect wrapper function to always keep aspect, use this in most mods on modic...
FruitieX [Fri, 18 Jun 2010 20:07:42 +0000 (23:07 +0300)]
drawpic_aspect wrapper function to always keep aspect, use this in most mods on modicon panel (race is still WIP, since it needs that kind of stuff for drawstring/drawstring_expanding etc)

9 years agonumbered bots FIX
terencehill [Thu, 17 Jun 2010 18:34:50 +0000 (20:34 +0200)]
numbered bots FIX
- Bots were created already numbered (1) when the previous map ended cause of expired time.
- In the algorithm that determines the priority of bot name creation, check the field 'cleanname' instead of 'prefix + name + suffix', as the latter changes when the bot name gets numbered.

---
(Sorry, I meant include this (old) fix too in the previous commit, but I didn't realize I didn't...)

9 years agono aspect ratio forcing on dock
FruitieX [Thu, 17 Jun 2010 16:23:17 +0000 (19:23 +0300)]
no aspect ratio forcing on dock

9 years agoremove all aspect ratio forcing stuff from the resizing code. next step is to make...
FruitieX [Thu, 17 Jun 2010 16:18:24 +0000 (19:18 +0300)]
remove all aspect ratio forcing stuff from the resizing code. next step is to make all panels work at any aspect

9 years agodrawpic_aspect wrapper for drawpic
FruitieX [Thu, 17 Jun 2010 16:10:09 +0000 (19:10 +0300)]
drawpic_aspect wrapper for drawpic