xonotic/xonotic-data.pk3dir.git
11 years agoMerge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
Sahil Singhal [Fri, 11 Jun 2010 21:08:37 +0000 (17:08 -0400)]
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud

11 years agoRevert "Minor change."
Sahil Singhal [Fri, 11 Jun 2010 21:08:24 +0000 (17:08 -0400)]
Revert "Minor change."

This reverts commit 2ba13dbd1b2424359c98da991714f9cacec94a8c.

11 years agoMinor change.
Sahil Singhal [Fri, 11 Jun 2010 21:06:38 +0000 (17:06 -0400)]
Minor change.

11 years agomake code compile again
FruitieX [Fri, 11 Jun 2010 18:01:44 +0000 (21:01 +0300)]
make code compile again

11 years agoRevert "some random breakage" :P
FruitieX [Fri, 11 Jun 2010 17:53:55 +0000 (20:53 +0300)]
Revert "some random breakage" :P

This reverts commit efbaef1e907078f2990a065e2c910ed5607a4618.

11 years agosome random breakage
FruitieX [Fri, 11 Jun 2010 17:44:49 +0000 (20:44 +0300)]
some random breakage

11 years agoshow disabled panels in the config mode with low alpha, just dont perform any collisi...
FruitieX [Fri, 11 Jun 2010 16:19:17 +0000 (19:19 +0300)]
show disabled panels in the config mode with low alpha, just dont perform any collision tests on them

11 years agoadd doubleclick check outside of panels (do nothing)
FruitieX [Fri, 11 Jun 2010 15:43:43 +0000 (18:43 +0300)]
add doubleclick check outside of panels (do nothing)

11 years agoworking on/off switch for panels via a hud dialog
FruitieX [Fri, 11 Jun 2010 15:42:42 +0000 (18:42 +0300)]
working on/off switch for panels via a hud dialog

11 years agoadd a yay print with current hud panel id (and commit before i break something else)
FruitieX [Fri, 11 Jun 2010 11:55:08 +0000 (14:55 +0300)]
add a yay print with current hud panel id (and commit before i break something else)

11 years agodon't hide the panels in the general hud options dialog, and in the panel-specific...
FruitieX [Thu, 10 Jun 2010 09:11:00 +0000 (12:11 +0300)]
don't hide the panels in the general hud options dialog, and in the panel-specific dialog: only show the highlighted panel (later on it will also be moved to below the dialog so it's 100% sure visible :))

11 years agoAdd a doubleclick dialog which is just empty for now.
Sahil Singhal [Thu, 10 Jun 2010 06:27:49 +0000 (02:27 -0400)]
Add a doubleclick dialog which is just empty for now.

11 years agoBetter window size.
Sahil Singhal [Thu, 10 Jun 2010 05:42:00 +0000 (01:42 -0400)]
Better window size.

11 years agoAdd default hud options to exit dialog.
Sahil Singhal [Thu, 10 Jun 2010 04:59:45 +0000 (00:59 -0400)]
Add default hud options to exit dialog.

11 years agoMerge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
Sahil Singhal [Thu, 10 Jun 2010 00:55:48 +0000 (20:55 -0400)]
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud

11 years agoMinor fix.
Sahil Singhal [Thu, 10 Jun 2010 00:55:21 +0000 (20:55 -0400)]
Minor fix.

11 years agofloat ids -> constants, thanks for good cleanup tip parasti :3
FruitieX [Thu, 10 Jun 2010 00:35:16 +0000 (03:35 +0300)]
float ids -> constants, thanks for good cleanup tip parasti :3

11 years agomove HUD_Panel_GetName into common/util.qc for easy menu access
FruitieX [Thu, 10 Jun 2010 00:22:32 +0000 (03:22 +0300)]
move HUD_Panel_GetName into common/util.qc for easy menu access

11 years agocheck for doubleclicks for future menu communication, just print a string for now
FruitieX [Thu, 10 Jun 2010 00:19:20 +0000 (03:19 +0300)]
check for doubleclicks for future menu communication, just print a string for now

11 years agoToggle menu off when already connected when pressing hud setup.
Sahil Singhal [Wed, 9 Jun 2010 23:55:30 +0000 (19:55 -0400)]
Toggle menu off when already connected when pressing hud setup.

11 years agoMerge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
FruitieX [Wed, 9 Jun 2010 23:44:16 +0000 (02:44 +0300)]
Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud

11 years agoForgot the dialog part, my bad :P
Sahil Singhal [Wed, 9 Jun 2010 23:43:20 +0000 (19:43 -0400)]
Forgot the dialog part, my bad :P

11 years agoMerge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
FruitieX [Wed, 9 Jun 2010 23:41:33 +0000 (02:41 +0300)]
Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud

11 years agoAdd exit dialog. Not done yet though.
Sahil Singhal [Wed, 9 Jun 2010 23:39:01 +0000 (19:39 -0400)]
Add exit dialog. Not done yet though.

11 years agoautojoin if we are still spec, and hud_config mode is on
FruitieX [Wed, 9 Jun 2010 22:46:52 +0000 (01:46 +0300)]
autojoin if we are still spec, and hud_config mode is on

11 years agoallow console bind to work in config mode
FruitieX [Wed, 9 Jun 2010 22:38:03 +0000 (01:38 +0300)]
allow console bind to work in config mode

11 years agoMerge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
FruitieX [Wed, 9 Jun 2010 20:26:06 +0000 (23:26 +0300)]
Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud

11 years agoforce showing rockets on the inventory panel in conf mode (with showonlycurrent type on)
FruitieX [Wed, 9 Jun 2010 20:08:43 +0000 (23:08 +0300)]
force showing rockets on the inventory panel in conf mode (with showonlycurrent type on)

11 years agomovement disabling patch by parasti, thanks :)
FruitieX [Wed, 9 Jun 2010 19:52:52 +0000 (22:52 +0300)]
movement disabling patch by parasti, thanks :)

11 years agoActually make it called "hudsetup".
Sahil Singhal [Wed, 9 Jun 2010 19:00:18 +0000 (15:00 -0400)]
Actually make it called "hudsetup".

11 years agoMerge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
Sahil Singhal [Wed, 9 Jun 2010 18:55:57 +0000 (14:55 -0400)]
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud

11 years agoHUD Setup menu button. Defaults to map "hudsetup" temporarily. TODO: Force join.
Sahil Singhal [Wed, 9 Jun 2010 18:54:41 +0000 (14:54 -0400)]
HUD Setup menu button. Defaults to map "hudsetup" temporarily. TODO: Force join.

11 years agofix odd spacing in notify panel, also center the names
FruitieX [Wed, 9 Jun 2010 18:34:37 +0000 (21:34 +0300)]
fix odd spacing in notify panel, also center the names

11 years agodefault events to the notify panel when in conf mode
FruitieX [Wed, 9 Jun 2010 17:14:52 +0000 (20:14 +0300)]
default events to the notify panel when in conf mode

11 years agosame thing for scoreboard
FruitieX [Wed, 9 Jun 2010 16:37:42 +0000 (19:37 +0300)]
same thing for scoreboard

11 years agofade the hud out correctly when opening the menu
FruitieX [Wed, 9 Jun 2010 16:34:28 +0000 (19:34 +0300)]
fade the hud out correctly when opening the menu

11 years agoalso fade in/out the modicons when there are no mod icons, do a little alpha renaming...
FruitieX [Wed, 9 Jun 2010 16:25:41 +0000 (19:25 +0300)]
also fade in/out the modicons when there are no mod icons, do a little alpha renaming cleanup while we are at it...

11 years agofade vote dialog in/out when needed/not needed
FruitieX [Wed, 9 Jun 2010 15:48:32 +0000 (18:48 +0300)]
fade vote dialog in/out when needed/not needed

11 years agofix camprifle ammo ring
FruitieX [Wed, 9 Jun 2010 14:01:13 +0000 (17:01 +0300)]
fix camprifle ammo ring

11 years agofix paths to the weapon icons
FruitieX [Wed, 9 Jun 2010 13:53:59 +0000 (16:53 +0300)]
fix paths to the weapon icons

11 years agoremove hud_radar_background_alpha to prevent confusion, same thing can be achieved...
FruitieX [Wed, 9 Jun 2010 13:51:32 +0000 (16:51 +0300)]
remove hud_radar_background_alpha to prevent confusion, same thing can be achieved with the panel background

11 years agocap grid size to >= 2 to prevent accidental crashing (extremely small grid sizes...
FruitieX [Wed, 9 Jun 2010 13:38:40 +0000 (16:38 +0300)]
cap grid size to >= 2 to prevent accidental crashing (extremely small grid sizes = very long loops drawing all the lines)

11 years agofix too big padding values, fix minsize of chat panel
FruitieX [Wed, 9 Jun 2010 13:03:03 +0000 (16:03 +0300)]
fix too big padding values, fix minsize of chat panel

11 years agoremove a warning
FruitieX [Wed, 9 Jun 2010 12:00:33 +0000 (15:00 +0300)]
remove a warning

11 years agocomment out the escape until we know how to do it properly :P
FruitieX [Wed, 9 Jun 2010 11:50:24 +0000 (14:50 +0300)]
comment out the escape until we know how to do it properly :P

11 years agochat area "panel"
FruitieX [Wed, 9 Jun 2010 10:34:27 +0000 (13:34 +0300)]
chat area "panel"

11 years agofix hud_notify_flip cvar, also export it in the exporter
FruitieX [Tue, 8 Jun 2010 20:24:45 +0000 (23:24 +0300)]
fix hud_notify_flip cvar, also export it in the exporter

11 years agoenable notify panel by default, it should be ready for testing
FruitieX [Tue, 8 Jun 2010 18:29:22 +0000 (21:29 +0300)]
enable notify panel by default, it should be ready for testing

11 years agohack in flipping the order of the notify stack, so that it can stack from the bottom...
FruitieX [Tue, 8 Jun 2010 18:28:41 +0000 (21:28 +0300)]
hack in flipping the order of the notify stack, so that it can stack from the bottom up (enable by default)

11 years agocvar time/fadetime, fix scoreboard
FruitieX [Tue, 8 Jun 2010 18:09:17 +0000 (21:09 +0300)]
cvar time/fadetime, fix scoreboard

11 years agofix resizing the notify panel
FruitieX [Tue, 8 Jun 2010 17:20:46 +0000 (20:20 +0300)]
fix resizing the notify panel

11 years agoctf flags on hud notify panel :)
FruitieX [Tue, 8 Jun 2010 16:12:30 +0000 (19:12 +0300)]
ctf flags on hud notify panel :)

11 years agoahahaha fix a silly mistake (using same constant for many things)
FruitieX [Tue, 8 Jun 2010 14:50:29 +0000 (17:50 +0300)]
ahahaha fix a silly mistake (using same constant for many things)

11 years agoall weapons supported. thanks div0
FruitieX [Tue, 8 Jun 2010 14:42:33 +0000 (17:42 +0300)]
all weapons supported. thanks div0

11 years agocenterprints
FruitieX [Tue, 8 Jun 2010 14:12:42 +0000 (17:12 +0300)]
centerprints

11 years agonotify messages MOSTLY work... some breakage here and there, please test :/
FruitieX [Tue, 8 Jun 2010 13:20:17 +0000 (16:20 +0300)]
notify messages MOSTLY work... some breakage here and there, please test :/

11 years agonotify panel should now work for weapons
FruitieX [Tue, 8 Jun 2010 12:56:31 +0000 (15:56 +0300)]
notify panel should now work for weapons

11 years agod'oh! Write a *SHORT*, not byte >_<
FruitieX [Tue, 8 Jun 2010 10:14:42 +0000 (13:14 +0300)]
d'oh! Write a *SHORT*, not byte >_<

11 years agomove more of the weapon stuff to CSQC
FruitieX [Tue, 8 Jun 2010 09:58:50 +0000 (12:58 +0300)]
move more of the weapon stuff to CSQC

11 years agoMerge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
FruitieX [Mon, 7 Jun 2010 17:29:41 +0000 (20:29 +0300)]
Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud

11 years agoremove dupes of the hud_configure global, show crosshair in hud_configure mode, use...
FruitieX [Mon, 7 Jun 2010 16:39:06 +0000 (19:39 +0300)]
remove dupes of the hud_configure global, show crosshair in hud_configure mode, use cl_lockview in hud_configure for better results :)

11 years agoMerge branch 'master' into fruitiex/newpanelhud_stable
FruitieX [Mon, 7 Jun 2010 16:01:58 +0000 (19:01 +0300)]
Merge branch 'master' into fruitiex/newpanelhud_stable

11 years agofix warnings
FruitieX [Mon, 7 Jun 2010 15:48:51 +0000 (18:48 +0300)]
fix warnings

11 years agochange warpzone detection to detect non-common/trigger faces instead of common/warpzo...
Rudolf Polzer [Mon, 7 Jun 2010 07:39:49 +0000 (09:39 +0200)]
change warpzone detection to detect non-common/trigger faces instead of common/warpzone faces

11 years agofix aspect ratio on nexball icon
FruitieX [Sun, 6 Jun 2010 16:14:49 +0000 (19:14 +0300)]
fix aspect ratio on nexball icon

11 years agovisible grid (optional) for the configuration mode!
FruitieX [Sun, 6 Jun 2010 16:08:55 +0000 (19:08 +0300)]
visible grid (optional) for the configuration mode!

11 years agowoops dont draw the scoreboard behind the mapvote screen :p
FruitieX [Sun, 6 Jun 2010 15:54:13 +0000 (18:54 +0300)]
woops dont draw the scoreboard behind the mapvote screen :p

11 years agofix scoreboard fading
FruitieX [Sun, 6 Jun 2010 15:51:01 +0000 (18:51 +0300)]
fix scoreboard fading

11 years agofix several scoreboard cvars
FruitieX [Sun, 6 Jun 2010 15:13:23 +0000 (18:13 +0300)]
fix several scoreboard cvars

11 years agodisable collision testing in config mode until it resizing is stable
FruitieX [Sun, 6 Jun 2010 15:07:55 +0000 (18:07 +0300)]
disable collision testing in config mode until it resizing is stable

11 years agoadd hud_*_color_team cvars to enforce a team color in teambased games (range from...
FruitieX [Sun, 6 Jun 2010 15:05:20 +0000 (18:05 +0300)]
add hud_*_color_team cvars to enforce a team color in teambased games (range from ]0, 1] can be given to adjust brightness)

11 years agoMerge branch 'master' into fruitiex/newpanelhud
FruitieX [Sun, 6 Jun 2010 13:55:08 +0000 (16:55 +0300)]
Merge branch 'master' into fruitiex/newpanelhud

Conflicts:
qcsrc/common/constants.qh

11 years agoMerge remote branch 'refs/remotes/origin/mand1nga/rebrand'
Rudolf Polzer [Sun, 6 Jun 2010 13:47:02 +0000 (15:47 +0200)]
Merge remote branch 'refs/remotes/origin/mand1nga/rebrand'

11 years agomove projectile explosions including precaching into w_*.qc; client/damage.qc now...
Rudolf Polzer [Sun, 6 Jun 2010 12:25:47 +0000 (14:25 +0200)]
move projectile explosions including precaching into w_*.qc; client/damage.qc now no longer contains weapon specific code

11 years agogive all weapon files a w_function
Rudolf Polzer [Sun, 6 Jun 2010 12:01:38 +0000 (14:01 +0200)]
give all weapon files a w_function

11 years agoallow weapon files to define functions in csqc too
Rudolf Polzer [Sun, 6 Jun 2010 11:57:58 +0000 (13:57 +0200)]
allow weapon files to define functions in csqc too

11 years agoinitial work on supporting kill messages
FruitieX [Sun, 6 Jun 2010 11:39:47 +0000 (14:39 +0300)]
initial work on supporting kill messages

11 years agomove even more notify messages to CSQC, now we need more cl_gentle versions ;)
FruitieX [Sun, 6 Jun 2010 09:41:16 +0000 (12:41 +0300)]
move even more notify messages to CSQC, now we need more cl_gentle versions ;)

11 years agoMerge branch 'mand1nga/rebrand' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
mand1nga [Sun, 6 Jun 2010 02:13:18 +0000 (23:13 -0300)]
Merge branch 'mand1nga/rebrand' of ssh://git.xonotic.org/xonotic-data.pk3dir into mand1nga/rebrand

11 years agoRemoved old welcome message
mand1nga [Sun, 6 Jun 2010 02:07:55 +0000 (23:07 -0300)]
Removed old welcome message

11 years agoUpdated chat bubble. Someone might want to export it with better quality
mand1nga [Sun, 6 Jun 2010 02:03:43 +0000 (23:03 -0300)]
Updated chat bubble. Someone might want to export it with better quality

11 years agoMerge commit 'origin/master' into diabolik/gakplayermodel
Sahil Singhal [Sat, 5 Jun 2010 18:43:19 +0000 (14:43 -0400)]
Merge commit 'origin/master' into diabolik/gakplayermodel

11 years agoFix draw anim. Gak is complete!
Sahil Singhal [Sat, 5 Jun 2010 18:41:56 +0000 (14:41 -0400)]
Fix draw anim. Gak is complete!

11 years agoinitial work on notify panel, some centerprints now will be different depending on...
FruitieX [Sat, 5 Jun 2010 17:05:58 +0000 (20:05 +0300)]
initial work on notify panel, some centerprints now will be different depending on cl_gentle :)

11 years agoMerge branch 'master' into fruitiex/newpanelhud
FruitieX [Sat, 5 Jun 2010 15:07:51 +0000 (18:07 +0300)]
Merge branch 'master' into fruitiex/newpanelhud

11 years agodefine the speedlimit cvar
Rudolf Polzer [Fri, 4 Jun 2010 21:54:56 +0000 (23:54 +0200)]
define the speedlimit cvar

11 years agorename sv_speedlimit to sv_airspeedlimit_nonqw
Rudolf Polzer [Fri, 4 Jun 2010 21:46:53 +0000 (23:46 +0200)]
rename sv_speedlimit to sv_airspeedlimit_nonqw

11 years agoMerge branch 'master' into divVerent/speedlimit
Rudolf Polzer [Fri, 4 Jun 2010 21:24:15 +0000 (23:24 +0200)]
Merge branch 'master' into divVerent/speedlimit

11 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/leanmodel_cfg_fix'
Rudolf Polzer [Fri, 4 Jun 2010 18:24:42 +0000 (20:24 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/leanmodel_cfg_fix'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/nerfstrafing'
Rudolf Polzer [Fri, 4 Jun 2010 18:20:59 +0000 (20:20 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/nerfstrafing'

11 years agoremove unused vector
FruitieX [Thu, 3 Jun 2010 18:44:06 +0000 (21:44 +0300)]
remove unused vector

11 years agoperform the hud min size cap earlier on to fix a bug when resizing aspect forced...
FruitieX [Thu, 3 Jun 2010 18:42:44 +0000 (21:42 +0300)]
perform the hud min size cap earlier on to fix a bug when resizing aspect forced panels towards the minimum

11 years agoremove a useless todo... :P
FruitieX [Thu, 3 Jun 2010 18:39:20 +0000 (21:39 +0300)]
remove a useless todo... :P

11 years agoresizing works pretty well now, but there are still some cases where it fails (try...
FruitieX [Thu, 3 Jun 2010 18:34:46 +0000 (21:34 +0300)]
resizing works pretty well now, but there are still some cases where it fails (try resizing from top left corner, and colliding against an above panel) :(

11 years agocleanup
FruitieX [Thu, 3 Jun 2010 17:51:48 +0000 (20:51 +0300)]
cleanup

11 years agomake all corners work, do collision testing against screen edges. also cap panels...
FruitieX [Thu, 3 Jun 2010 17:42:28 +0000 (20:42 +0300)]
make all corners work, do collision testing against screen edges. also cap panels to a minimum size, and cap aspect (only on one axis currently, so resizing aspect ratio forced panels is a bit dodgy). committing now before i implement collision aganist other panels (and possibly break it altogether :P)

11 years agostart reworking the resizing code completely from scratch... dont try
FruitieX [Thu, 3 Jun 2010 15:16:27 +0000 (18:16 +0300)]
start reworking the resizing code completely from scratch... dont try
any other corner than top left right now :)

11 years agoResize gakmasked and onground :P
Sahil Singhal [Wed, 2 Jun 2010 23:11:23 +0000 (19:11 -0400)]
Resize gakmasked and onground :P

11 years agoGak resized and on ground :P
Sahil Singhal [Wed, 2 Jun 2010 23:02:59 +0000 (19:02 -0400)]
Gak resized and on ground :P

11 years agoGak Armored resized and on ground :P
Sahil Singhal [Wed, 2 Jun 2010 22:41:18 +0000 (18:41 -0400)]
Gak Armored resized and on ground :P