]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agodraw queue for panels, a panel is automatically adjusted to the top of the stack...
FruitieX [Sat, 3 Jul 2010 13:02:49 +0000 (16:02 +0300)]
draw queue for panels, a panel is automatically adjusted to the top of the stack if it gets clicked

13 years agofix default paths, add much cooler border highlight and update it immediately
FruitieX [Sat, 3 Jul 2010 01:50:20 +0000 (04:50 +0300)]
fix default paths, add much cooler border highlight and update it immediately

13 years agofix some warnings about missing semicolons
Rudolf Polzer [Fri, 2 Jul 2010 21:13:38 +0000 (23:13 +0200)]
fix some warnings about missing semicolons

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

13 years agocreate a default skin, and try to fallback to this if an image isn't available
FruitieX [Fri, 2 Jul 2010 18:24:48 +0000 (21:24 +0300)]
create a default skin, and try to fallback to this if an image isn't available

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

13 years agoremove debug print that i accidentally left in
FruitieX [Fri, 2 Jul 2010 17:26:38 +0000 (20:26 +0300)]
remove debug print that i accidentally left in

13 years ago(new cvar) show bind on weapon instead of number
FruitieX [Fri, 2 Jul 2010 17:26:00 +0000 (20:26 +0300)]
(new cvar) show bind on weapon instead of number

13 years agobigfont for health/armor and powerups
FruitieX [Fri, 2 Jul 2010 17:13:27 +0000 (20:13 +0300)]
bigfont for health/armor and powerups

13 years agofix grid by renaming cvar...
FruitieX [Fri, 2 Jul 2010 17:12:22 +0000 (20:12 +0300)]
fix grid by renaming cvar...

13 years agofix colors
FruitieX [Fri, 2 Jul 2010 16:55:03 +0000 (19:55 +0300)]
fix colors

13 years agosetpos/size fixes, branch should now work as good as _stable
FruitieX [Fri, 2 Jul 2010 16:43:53 +0000 (19:43 +0300)]
setpos/size fixes, branch should now work as good as _stable

13 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

13 years agodrawpic_aspect => macro, make it compile
FruitieX [Fri, 2 Jul 2010 12:33:30 +0000 (15:33 +0300)]
drawpic_aspect => macro, make it compile

13 years agocorrect argument usage on DrawBg calls...
FruitieX [Fri, 2 Jul 2010 12:00:14 +0000 (15:00 +0300)]
correct argument usage on DrawBg calls...

13 years agomacro for drawpic_aspect
FruitieX [Fri, 2 Jul 2010 11:57:08 +0000 (14:57 +0300)]
macro for drawpic_aspect

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

13 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

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

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

13 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

13 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

13 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

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

13 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

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

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

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

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

13 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

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

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

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

13 years agofix coloring on dock
FruitieX [Thu, 1 Jul 2010 20:19:52 +0000 (23:19 +0300)]
fix coloring on dock

13 years agooptimization noch einmal :)
FruitieX [Thu, 1 Jul 2010 20:12:30 +0000 (23:12 +0300)]
optimization noch einmal :)

13 years agomake menu code compile
FruitieX [Thu, 1 Jul 2010 18:49:28 +0000 (21:49 +0300)]
make menu code compile

13 years agoresizing works again
FruitieX [Thu, 1 Jul 2010 15:12:02 +0000 (18:12 +0300)]
resizing works again

13 years agofix most of moving/resizing
FruitieX [Thu, 1 Jul 2010 13:13:42 +0000 (16:13 +0300)]
fix most of moving/resizing

13 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

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

13 years agomore optimization
FruitieX [Thu, 1 Jul 2010 06:51:06 +0000 (09:51 +0300)]
more optimization

13 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

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

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

13 years agofix padding. HUD should at least LOOK normal in this branch now
FruitieX [Wed, 30 Jun 2010 23:30:10 +0000 (02:30 +0300)]
fix padding. HUD should at least LOOK normal in this branch now

13 years agomake coloring work, merge getcolor with the drawbg function (only place where it...
FruitieX [Wed, 30 Jun 2010 23:18:39 +0000 (02:18 +0300)]
make coloring work, merge getcolor with the drawbg function (only place where it's used ;))

13 years agomake it draw stuff at correct sizes now :)
FruitieX [Wed, 30 Jun 2010 22:53:15 +0000 (01:53 +0300)]
make it draw stuff at correct sizes now :)

13 years ago< FruitieX> OMFG < FruitieX> IT COMPILES < FruitieX> 268 warnings < FruitieX> I serio...
FruitieX [Wed, 30 Jun 2010 22:31:18 +0000 (01:31 +0300)]
< FruitieX> OMFG < FruitieX> IT COMPILES < FruitieX> 268 warnings < FruitieX> I seriously don't dare run this

13 years agonow REALLY get past the macro call :) :)
FruitieX [Wed, 30 Jun 2010 22:27:40 +0000 (01:27 +0300)]
now REALLY get past the macro call :) :)

13 years agowoo finally it passes the first call to the macro \o/
FruitieX [Wed, 30 Jun 2010 22:21:12 +0000 (01:21 +0300)]
woo finally it passes the first call to the macro \o/

13 years agomacro almost works, i think?!
FruitieX [Wed, 30 Jun 2010 22:12:51 +0000 (01:12 +0300)]
macro almost works, i think?!

13 years agoless fail
FruitieX [Wed, 30 Jun 2010 21:38:11 +0000 (00:38 +0300)]
less fail

13 years agoless errors, but there are still plenty of them.
FruitieX [Wed, 30 Jun 2010 21:19:52 +0000 (00:19 +0300)]
less errors, but there are still plenty of them.

13 years agomacro hell
FruitieX [Wed, 30 Jun 2010 20:55:11 +0000 (23:55 +0300)]
macro hell

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

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

13 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

13 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

13 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

13 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

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

13 years agoconvert several functions into macros for a hopefully big performance boost in the...
FruitieX [Tue, 29 Jun 2010 20:59:52 +0000 (23:59 +0300)]
convert several functions into macros for a hopefully big performance boost in the future (when we get this mess to compile, hint: it does not compile)

13 years ago"complain" message bubble for weaponicons panel
FruitieX [Tue, 29 Jun 2010 13:44:38 +0000 (16:44 +0300)]
"complain" message bubble for weaponicons panel

13 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

13 years agofix icon for DEATH_MIRRORDAMAGE
FruitieX [Tue, 29 Jun 2010 10:52:28 +0000 (13:52 +0300)]
fix icon for DEATH_MIRRORDAMAGE

13 years agoallow to configure the hud when spectating, but still force a join when in the first...
FruitieX [Tue, 29 Jun 2010 10:37:20 +0000 (13:37 +0300)]
allow to configure the hud when spectating, but still force a join when in the first frame

13 years ago(crappy, placeholder) move/resize cursors! Also force border size to be 10 for the...
FruitieX [Tue, 29 Jun 2010 10:21:28 +0000 (13:21 +0300)]
(crappy, placeholder) move/resize cursors! Also force border size to be 10 for the resize checks so that it's never too small to make resizing hard

13 years agobetter handling of grid when editing with arrow keys, also hide the visible highlight...
FruitieX [Tue, 29 Jun 2010 09:35:42 +0000 (12:35 +0300)]
better handling of grid when editing with arrow keys, also hide the visible highlight when not in config mode :P

13 years agofade out the visible highlight when doubleclicking panel
FruitieX [Tue, 29 Jun 2010 08:56:37 +0000 (11:56 +0300)]
fade out the visible highlight when doubleclicking panel

13 years agohopefully fix the team/pants/shirt coloring to actually use your own entnum now
FruitieX [Tue, 29 Jun 2010 08:53:25 +0000 (11:53 +0300)]
hopefully fix the team/pants/shirt coloring to actually use your own entnum now

13 years agoreturn from the keyboard function if the mouse is clicked, easy way to prevent bugs...
FruitieX [Tue, 29 Jun 2010 08:23:19 +0000 (11:23 +0300)]
return from the keyboard function if the mouse is clicked, easy way to prevent bugs caused by doing just that (small detail that you missed, terencehill ;))

13 years agoadd a visible highlight to highlightedPanel_prev
FruitieX [Tue, 29 Jun 2010 08:19:49 +0000 (11:19 +0300)]
add a visible highlight to highlightedPanel_prev

13 years agoMerge remote branch 'origin/master' into fruitiex/newpanelhud
FruitieX [Tue, 29 Jun 2010 08:09:05 +0000 (11:09 +0300)]
Merge remote branch 'origin/master' into fruitiex/newpanelhud

13 years agoAllow to really draw panels with no border for faster rendering
terencehill [Thu, 24 Jun 2010 12:17:58 +0000 (14:17 +0200)]
Allow to really draw panels with no border for faster rendering

13 years agoMore usable move/resize speed for arrow keys, it increases with time.
terencehill [Sun, 20 Jun 2010 20:00:37 +0000 (22:00 +0200)]
More usable move/resize speed for arrow keys, it increases with time.
Holding Shift the speed is constant and the step is minor, for fine adjustments.

13 years agoShortcuts with arrow keys in conf. mode:
terencehill [Sun, 20 Jun 2010 19:35:34 +0000 (21:35 +0200)]
Shortcuts with arrow keys in conf. mode:
- Arrow keys move the panel
- Alt+Arrow keys extend the size of the panel
- Ctrl+Alt+Arrow keys reduce the size of the panel
Panel must be first activated by clicking on it.

13 years agoRearranged the code in preparation to move/resize code by arrow keys:
terencehill [Sun, 20 Jun 2010 17:07:00 +0000 (19:07 +0200)]
Rearranged the code in preparation to move/resize code by arrow keys:
- Moved a large portion of HUD_Panel_Mouse in the new function HUD_Panel_Highlight (now executed more logically only at the mouse click and not when dragging).
- HUD_Panel_SetPosSize doesn't compute the initial size (using mousepos) anymore, instead now it accepts a generic initial size in input.

13 years agoSupport for shift/ctrl/alt as keys modifiers in configuration mode
terencehill [Sun, 20 Jun 2010 13:54:01 +0000 (15:54 +0200)]
Support for shift/ctrl/alt as keys modifiers in configuration mode
First use of it: ctrl+left button drag moves/resizes disabling collisions check

Fixed an unnoticeable bug: the code of the ESC key was executed twice (when pressed and when released).

13 years agoPut back checks of ratio in CheckResize algorithm.
terencehill [Sun, 20 Jun 2010 13:11:46 +0000 (15:11 +0200)]
Put back checks of ratio in CheckResize algorithm.
They are used to decide which side limits the resizing, not to keep the aspect ratio.

13 years agoMerge branch 'master' into terencehill/newpanelhud
FruitieX [Tue, 29 Jun 2010 07:51:23 +0000 (10:51 +0300)]
Merge branch 'master' into terencehill/newpanelhud

13 years agoadd new cvars to ExportCfg, do some cleanups and initial work on aspect forcing on...
FruitieX [Tue, 29 Jun 2010 07:46:53 +0000 (10:46 +0300)]
add new cvars to ExportCfg, do some cleanups and initial work on aspect forcing on contents of vote/racetimer panels

13 years agouse hud_bigfont on big fonts to make them sharper, duh
FruitieX [Tue, 29 Jun 2010 01:20:38 +0000 (04:20 +0300)]
use hud_bigfont on big fonts to make them sharper, duh

13 years agoremove useless todo comment
FruitieX [Tue, 29 Jun 2010 01:12:59 +0000 (04:12 +0300)]
remove useless todo comment

13 years agocenter the icons/counts in powerups and h/a panels, and fix hud_healtharmor 2
FruitieX [Tue, 29 Jun 2010 01:11:59 +0000 (04:11 +0300)]
center the icons/counts in powerups and h/a panels, and fix hud_healtharmor 2

13 years agowow, why was there two GiveFrags() calls? No wonder you got -2 points when suiciding...
FruitieX [Tue, 29 Jun 2010 00:18:39 +0000 (03:18 +0300)]
wow, why was there two GiveFrags() calls? No wonder you got -2 points when suiciding...

13 years agoMerge branch 'master' into fruitiex/newpanelhud
FruitieX [Tue, 29 Jun 2010 00:13:40 +0000 (03:13 +0300)]
Merge branch 'master' into fruitiex/newpanelhud

13 years agosame thing for healtharmor. Current item aligning looks a bit ugly, should implement...
FruitieX [Tue, 29 Jun 2010 00:12:29 +0000 (03:12 +0300)]
same thing for healtharmor. Current item aligning looks a bit ugly, should implement something similar as in inventory panel.

13 years agouse drawstring in the powerup panel, do some cleanups
FruitieX [Mon, 28 Jun 2010 23:47:44 +0000 (02:47 +0300)]
use drawstring in the powerup panel, do some cleanups

13 years agomake the inventory panel aspect independent (and DrawXNum independent), comment all...
FruitieX [Mon, 28 Jun 2010 17:35:05 +0000 (20:35 +0300)]
make the inventory panel aspect independent (and DrawXNum independent), comment all other DrawXNum calls out to allow code to compile again (fix for these coming soon)

14 years agominimalistic wickedhud layout/config :)
FruitieX [Sun, 27 Jun 2010 13:24:16 +0000 (16:24 +0300)]
minimalistic wickedhud layout/config :)

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

14 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

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

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

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

14 years agono more DrawXNum
FruitieX [Fri, 25 Jun 2010 18:19:27 +0000 (21:19 +0300)]
no more DrawXNum

14 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

14 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

14 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

14 years agoalso disable dock if hud_dock is set to "0"
FruitieX [Thu, 24 Jun 2010 19:15:34 +0000 (22:15 +0300)]
also disable dock if hud_dock is set to "0"