]>
de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
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: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
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.
FruitieX [Mon, 28 Jun 2010 23:47:44 +0000 (02:47 +0300)]
use drawstring in the powerup panel, do some cleanups
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)
FruitieX [Sun, 27 Jun 2010 13:24:16 +0000 (16:24 +0300)]
minimalistic wickedhud layout/config :)
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).
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
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.
terencehill [Fri, 25 Jun 2010 22:49:47 +0000 (00:49 +0200)]
remove an outdated comment
terencehill [Fri, 25 Jun 2010 22:47:50 +0000 (00:47 +0200)]
add *.iqm to .gitattributes
FruitieX [Fri, 25 Jun 2010 18:19:27 +0000 (21:19 +0300)]
no more DrawXNum
Rudolf Polzer [Fri, 25 Jun 2010 11:00:57 +0000 (13:00 +0200)]
fix endless loops in Nex shots through recursive warpzones
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
Rudolf Polzer [Fri, 25 Jun 2010 10:11:59 +0000 (12:11 +0200)]
fix a warpzone connection bug when using random warpzone arrangement
FruitieX [Thu, 24 Jun 2010 19:15:34 +0000 (22:15 +0300)]
also disable dock if hud_dock is set to "0"
FruitieX [Thu, 24 Jun 2010 19:14:23 +0000 (22:14 +0300)]
skip drawing progressbar (or any calculations belonging to that) if alpha is 0
Mircea Kitsune [Thu, 24 Jun 2010 17:52:16 +0000 (20:52 +0300)]
Another tiny alignment I missed
Mircea Kitsune [Thu, 24 Jun 2010 17:42:54 +0000 (20:42 +0300)]
Comment alignment and a small texture improvement
Mircea Kitsune [Thu, 24 Jun 2010 17:11:27 +0000 (20:11 +0300)]
Fix a comment
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)
Mircea Kitsune [Thu, 24 Jun 2010 16:45:50 +0000 (19:45 +0300)]
Slightly better normal zoom reticle
Mircea Kitsune [Thu, 24 Jun 2010 16:15:39 +0000 (19:15 +0300)]
Make 0 the disabled reticle. Should be safer.
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
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.
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
Mircea Kitsune [Thu, 24 Jun 2010 15:25:10 +0000 (18:25 +0300)]
Add zoomfraction check back, to avoid drawpic at 0 alpha.
Mircea Kitsune [Thu, 24 Jun 2010 15:16:38 +0000 (18:16 +0300)]
Make a comment even more clear
Mircea Kitsune [Thu, 24 Jun 2010 15:12:58 +0000 (18:12 +0300)]
Comments
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.
Mircea Kitsune [Thu, 24 Jun 2010 14:56:31 +0000 (17:56 +0300)]
Precache the texture only if the cvar is enabled.
Mircea Kitsune [Thu, 24 Jun 2010 14:54:41 +0000 (17:54 +0300)]
Must be persisted in order to work, of course :)
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).
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.
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
Mircea Kitsune [Thu, 24 Jun 2010 14:18:33 +0000 (17:18 +0300)]
Merge branch 'master' into mirceakitsune/nex_reticle
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
FruitieX [Thu, 24 Jun 2010 12:11:58 +0000 (15:11 +0300)]
force 1:1 aspect on reticle pic, also precache it
FruitieX [Thu, 24 Jun 2010 12:00:24 +0000 (15:00 +0300)]
Merge branch 'master' into mirceakitsune/nex_reticle
Rudolf Polzer [Thu, 24 Jun 2010 11:23:02 +0000 (13:23 +0200)]
attempt at a camera fix
Rudolf Polzer [Thu, 24 Jun 2010 08:10:12 +0000 (10:10 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/nexmodel'
Rudolf Polzer [Thu, 24 Jun 2010 08:04:33 +0000 (10:04 +0200)]
now PROPERLY apply draw_fontscale in TextWidth
Sahil Singhal [Thu, 24 Jun 2010 03:54:55 +0000 (23:54 -0400)]
Merge commit 'origin/master' into diabolik/nexmodel
PlasmaSheep [Wed, 23 Jun 2010 23:34:55 +0000 (16:34 -0700)]
Added teamkill icon
Stephan Stahl [Wed, 23 Jun 2010 19:06:43 +0000 (21:06 +0200)]
fix unban via rcon_restricted
Rudolf Polzer [Wed, 23 Jun 2010 13:07:02 +0000 (15:07 +0200)]
fix weapon count when sorting
Rudolf Polzer [Wed, 23 Jun 2010 13:01:42 +0000 (15:01 +0200)]
menu: fix lots of issues with font rendering
Mircea Kitsune [Wed, 23 Jun 2010 11:22:00 +0000 (14:22 +0300)]
Merge branch 'master' into mirceakitsune/nex_reticle
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
Rudolf Polzer [Wed, 23 Jun 2010 08:36:15 +0000 (10:36 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots'
Rudolf Polzer [Wed, 23 Jun 2010 08:31:48 +0000 (10:31 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'
Rudolf Polzer [Wed, 23 Jun 2010 08:21:59 +0000 (10:21 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/iqmmodelfix'
PlasmaSheep [Tue, 22 Jun 2010 23:34:51 +0000 (16:34 -0700)]
Added icons for actions that are yet to be coded. Also changed all icons to my simple icons.
Rudolf Polzer [Tue, 22 Jun 2010 15:04:14 +0000 (17:04 +0200)]
get rid of md5sum dependency
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.