]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
Rudolf Polzer [Sun, 4 Jul 2010 19:11:10 +0000 (21:11 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/lodplayers'
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)
FruitieX [Sat, 3 Jul 2010 22:03:48 +0000 (01:03 +0300)]
fix nasty bug that could happen with the notify panel in the first few seconds of a match, branch now ready for merging
FruitieX [Sat, 3 Jul 2010 22:00:12 +0000 (01:00 +0300)]
force border properly when checking which cursor to draw too, and remove another silly dev print that i forgot in
FruitieX [Sat, 3 Jul 2010 21:54:30 +0000 (00:54 +0300)]
remove two useless TODO notices
FruitieX [Sat, 3 Jul 2010 21:48:11 +0000 (00:48 +0300)]
fixes to the race modicon panel
FruitieX [Sat, 3 Jul 2010 21:39:53 +0000 (00:39 +0300)]
rename image in the old skin too
FruitieX [Sat, 3 Jul 2010 21:38:57 +0000 (00:38 +0300)]
better aspect check on the lead image in the score panel
FruitieX [Sat, 3 Jul 2010 21:22:44 +0000 (00:22 +0300)]
nicer looking notify panel thanks to suggestion by sev, also do several cleanups to it
FruitieX [Sat, 3 Jul 2010 21:00:43 +0000 (00:00 +0300)]
new panel for "info messages" such as the spec info
FruitieX [Sat, 3 Jul 2010 20:05:44 +0000 (23:05 +0300)]
fix vote panel, pressedkeys panel and racetimer panel
FruitieX [Sat, 3 Jul 2010 13:35:26 +0000 (16:35 +0300)]
also check the order of the panels when finding out with mouse cursor to draw :)
FruitieX [Sat, 3 Jul 2010 13:32:30 +0000 (16:32 +0300)]
update the exporter function
FruitieX [Sat, 3 Jul 2010 13:18:54 +0000 (16:18 +0300)]
bugfixes
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
FruitieX [Sat, 3 Jul 2010 01:50:20 +0000 (04:50 +0300)]
fix default paths, add much cooler border highlight and update it immediately
Rudolf Polzer [Fri, 2 Jul 2010 21:13:38 +0000 (23:13 +0200)]
fix some warnings about missing semicolons
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).
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
Sahil Singhal [Fri, 2 Jul 2010 18:23:24 +0000 (14:23 -0400)]
Erebus, Ignis, IgnisMasked, Seraphina, SeraphinaMasked
FruitieX [Fri, 2 Jul 2010 17:26:38 +0000 (20:26 +0300)]
remove debug print that i accidentally left in
FruitieX [Fri, 2 Jul 2010 17:26:00 +0000 (20:26 +0300)]
(new cvar) show bind on weapon instead of number
FruitieX [Fri, 2 Jul 2010 17:13:27 +0000 (20:13 +0300)]
bigfont for health/armor and powerups
FruitieX [Fri, 2 Jul 2010 17:12:22 +0000 (20:12 +0300)]
fix grid by renaming cvar...
FruitieX [Fri, 2 Jul 2010 16:55:03 +0000 (19:55 +0300)]
fix colors
FruitieX [Fri, 2 Jul 2010 16:43:53 +0000 (19:43 +0300)]
setpos/size fixes, branch should now work as good as _stable
Stephan Stahl [Fri, 2 Jul 2010 13:31:09 +0000 (15:31 +0200)]
this is only used if the matching config file is loaded
FruitieX [Fri, 2 Jul 2010 12:33:30 +0000 (15:33 +0300)]
drawpic_aspect => macro, make it compile
FruitieX [Fri, 2 Jul 2010 12:00:14 +0000 (15:00 +0300)]
correct argument usage on DrawBg calls...
FruitieX [Fri, 2 Jul 2010 11:57:08 +0000 (14:57 +0300)]
macro for drawpic_aspect
Rudolf Polzer [Fri, 2 Jul 2010 11:50:56 +0000 (13:50 +0200)]
when calling hooks, use a final \n and not ;
Rudolf Polzer [Fri, 2 Jul 2010 11:48:44 +0000 (13:48 +0200)]
fix issue with having no weapon currently selected
Rudolf Polzer [Fri, 2 Jul 2010 11:46:31 +0000 (13:46 +0200)]
fix dummy weapon info
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)
Mircea Kitsune [Fri, 2 Jul 2010 11:31:04 +0000 (14:31 +0300)]
Move cvars to the script file too
Mircea Kitsune [Fri, 2 Jul 2010 11:28:31 +0000 (14:28 +0300)]
Fix an issue introduced with separating the script
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
Mircea Kitsune [Fri, 2 Jul 2010 11:14:07 +0000 (14:14 +0300)]
preattack -> fire
Mircea Kitsune [Fri, 2 Jul 2010 10:45:58 +0000 (13:45 +0300)]
Merge branch 'master' into mirceakitsune/reverse_firing_buttons
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.
Rudolf Polzer [Fri, 2 Jul 2010 08:22:14 +0000 (10:22 +0200)]
move reticle from textures/ to gfx/
Rudolf Polzer [Fri, 2 Jul 2010 08:19:20 +0000 (10:19 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/nex_reticle'
Sahil Singhal [Thu, 1 Jul 2010 15:05:33 +0000 (11:05 -0400)]
Actually fix rifle and electro.
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
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.
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.
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.
FruitieX [Thu, 1 Jul 2010 20:19:52 +0000 (23:19 +0300)]
fix coloring on dock
FruitieX [Thu, 1 Jul 2010 20:12:30 +0000 (23:12 +0300)]
optimization noch einmal :)
FruitieX [Thu, 1 Jul 2010 18:49:28 +0000 (21:49 +0300)]
make menu code compile
FruitieX [Thu, 1 Jul 2010 15:12:02 +0000 (18:12 +0300)]
resizing works again
FruitieX [Thu, 1 Jul 2010 13:13:42 +0000 (16:13 +0300)]
fix most of moving/resizing
Mircea Kitsune [Thu, 1 Jul 2010 12:12:04 +0000 (15:12 +0300)]
More cosmetic changes to the script
Mircea Kitsune [Thu, 1 Jul 2010 11:59:31 +0000 (14:59 +0300)]
Make some comments sound better
FruitieX [Thu, 1 Jul 2010 06:51:06 +0000 (09:51 +0300)]
more optimization
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
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 :)
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.
FruitieX [Wed, 30 Jun 2010 23:30:10 +0000 (02:30 +0300)]
fix padding. HUD should at least LOOK normal in this branch now
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 ;))
FruitieX [Wed, 30 Jun 2010 22:53:15 +0000 (01:53 +0300)]
make it draw stuff at correct sizes now :)
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
FruitieX [Wed, 30 Jun 2010 22:27:40 +0000 (01:27 +0300)]
now REALLY get past the macro call :) :)
FruitieX [Wed, 30 Jun 2010 22:21:12 +0000 (01:21 +0300)]
woo finally it passes the first call to the macro \o/
FruitieX [Wed, 30 Jun 2010 22:12:51 +0000 (01:12 +0300)]
macro almost works, i think?!
FruitieX [Wed, 30 Jun 2010 21:38:11 +0000 (00:38 +0300)]
less fail
FruitieX [Wed, 30 Jun 2010 21:19:52 +0000 (00:19 +0300)]
less errors, but there are still plenty of them.
FruitieX [Wed, 30 Jun 2010 20:55:11 +0000 (23:55 +0300)]
macro hell
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.
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.
Mircea Kitsune [Wed, 30 Jun 2010 20:06:00 +0000 (23:06 +0300)]
More progress with the script, but still not ready / working
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
Mircea Kitsune [Wed, 30 Jun 2010 15:25:00 +0000 (18:25 +0300)]
Part of the script, not yet ready nor working
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
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...
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)
FruitieX [Tue, 29 Jun 2010 13:44:38 +0000 (16:44 +0300)]
"complain" message bubble for weaponicons panel
Mircea Kitsune [Tue, 29 Jun 2010 10:53:07 +0000 (13:53 +0300)]
Merge branch 'master' into mirceakitsune/nex_reticle
FruitieX [Tue, 29 Jun 2010 10:52:28 +0000 (13:52 +0300)]
fix icon for DEATH_MIRRORDAMAGE
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
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
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
FruitieX [Tue, 29 Jun 2010 08:56:37 +0000 (11:56 +0300)]
fade out the visible highlight when doubleclicking panel
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
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 ;))
FruitieX [Tue, 29 Jun 2010 08:19:49 +0000 (11:19 +0300)]
add a visible highlight to highlightedPanel_prev
FruitieX [Tue, 29 Jun 2010 08:09:05 +0000 (11:09 +0300)]
Merge remote branch 'origin/master' into fruitiex/newpanelhud
terencehill [Thu, 24 Jun 2010 12:17:58 +0000 (14:17 +0200)]
Allow to really draw panels with no border for faster rendering
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.
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.
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.
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).
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.
FruitieX [Tue, 29 Jun 2010 07:51:23 +0000 (10:51 +0300)]
Merge branch 'master' into terencehill/newpanelhud
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
FruitieX [Tue, 29 Jun 2010 01:20:38 +0000 (04:20 +0300)]
use hud_bigfont on big fonts to make them sharper, duh
FruitieX [Tue, 29 Jun 2010 01:12:59 +0000 (04:12 +0300)]
remove useless todo comment
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
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...
FruitieX [Tue, 29 Jun 2010 00:13:40 +0000 (03:13 +0300)]
Merge branch 'master' into fruitiex/newpanelhud