]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoSimplify the code
terencehill [Mon, 25 Apr 2011 22:52:51 +0000 (00:52 +0200)]
Simplify the code

13 years agoRename most of the cvars to make health/armor progressbar code more intuitive
terencehill [Mon, 25 Apr 2011 17:31:08 +0000 (19:31 +0200)]
Rename most of the cvars to make health/armor progressbar code more intuitive

13 years agoSmooth armor progressbar too
terencehill [Mon, 25 Apr 2011 17:03:44 +0000 (19:03 +0200)]
Smooth armor progressbar too

13 years agoSmall clean up and more comments
terencehill [Mon, 25 Apr 2011 16:11:49 +0000 (18:11 +0200)]
Small clean up and more comments

13 years agoUse the previously added code to do the health load effect on spawning
terencehill [Mon, 25 Apr 2011 15:27:44 +0000 (17:27 +0200)]
Use the previously added code to do the health load effect on spawning

13 years agoSmooth transition from an health value to another one in the health progressbar
terencehill [Mon, 25 Apr 2011 13:32:01 +0000 (15:32 +0200)]
Smooth transition from an health value to another one in the health progressbar

13 years agocvar hud_panel_healtharmor_progressbar_gfx_damage to customize the amount of damage...
terencehill [Mon, 25 Apr 2011 10:34:19 +0000 (12:34 +0200)]
cvar hud_panel_healtharmor_progressbar_gfx_damage to customize the amount of damage needed to show the damage effect, 0 to disable the effect (default 5)
Use it when refreshing the effect too; in this case when damaged and health quickly rotting the previous value of 1 caused the effect to look like it get stuck

13 years agoCheck for spectatee_status changes only when it's updated; also write a check properl...
terencehill [Sun, 24 Apr 2011 23:13:35 +0000 (01:13 +0200)]
Check for spectatee_status changes only when it's updated; also write a check properly to fix effects behaviour moving from observer to player

13 years agoadd comments to describe how some variables are used in health/armor progressbar...
terencehill [Sun, 24 Apr 2011 22:37:44 +0000 (00:37 +0200)]
add comments to describe how some variables are used in health/armor progressbar effects code

13 years agoFix typo
terencehill [Thu, 21 Apr 2011 22:03:05 +0000 (00:03 +0200)]
Fix typo

13 years agoFix color not updated and ping not displayed in the radar for captured dom points
terencehill [Wed, 20 Apr 2011 20:53:22 +0000 (22:53 +0200)]
Fix color not updated and ping not displayed in the radar for captured dom points
Reason: self gets reassigned in FOR_EACH_PLAYER!
Curiously, this bug was introduced by the commit 'fix terencehill's code' (b02eb66e3a23baaca99809d6ad048d3c28d519b1) which REALLY didn't fix anything, ended up in a mere clean-up.

13 years agoMake translatable remaining strings of the panel hud dialogs
terencehill [Sun, 17 Apr 2011 21:02:08 +0000 (23:02 +0200)]
Make translatable remaining strings of the panel hud dialogs

13 years agoMake text labels of the panel hud dialogs use the max available space to reduce compr...
terencehill [Sun, 17 Apr 2011 20:49:09 +0000 (22:49 +0200)]
Make text labels of the panel hud dialogs use the max available space to reduce compression of long strings (can likely happen in translated strings)

13 years agoFix hud_panel_ammo_progressbar not working cause of misplaced parameters in input...
terencehill [Sun, 17 Apr 2011 17:02:58 +0000 (19:02 +0200)]
Fix hud_panel_ammo_progressbar not working cause of misplaced parameters in input to HUD_Panel_DrawProgressBar

13 years agoAdjust _hud_panelorder cvar now that shownames panel has been dropped
terencehill [Sun, 17 Apr 2011 10:39:31 +0000 (12:39 +0200)]
Adjust _hud_panelorder cvar now that shownames panel has been dropped

13 years agoMerge remote-tracking branch 'remotes/origin/fruitiex/panelhud' into terencehill...
terencehill [Sun, 17 Apr 2011 10:32:10 +0000 (12:32 +0200)]
Merge remote-tracking branch 'remotes/origin/fruitiex/panelhud' into terencehill/newpanelhud

13 years agobring back the serverside cull distance, why it didn't work was because of a stupid...
FruitieX [Sat, 16 Apr 2011 11:54:46 +0000 (14:54 +0300)]
bring back the serverside cull distance, why it didn't work was because of a stupid stupid issue that we can all forget about. :D

13 years agostart fading already at 1000 units
FruitieX [Sat, 16 Apr 2011 11:43:24 +0000 (14:43 +0300)]
start fading already at 1000 units

13 years agoset the max distance a bit further, increase font size
FruitieX [Sat, 16 Apr 2011 11:32:48 +0000 (14:32 +0300)]
set the max distance a bit further, increase font size

13 years agoMerge branch 'master' into fruitiex/panelhud
FruitieX [Sat, 16 Apr 2011 11:25:33 +0000 (14:25 +0300)]
Merge branch 'master' into fruitiex/panelhud

13 years agoremove some unused functions; add "checkfail" logic with some example checks one...
Rudolf Polzer [Fri, 15 Apr 2011 14:36:46 +0000 (16:36 +0200)]
remove some unused functions; add "checkfail" logic with some example checks one can do

13 years agofix health/armor wrapping around when someone was fragged
FruitieX [Wed, 13 Apr 2011 15:58:50 +0000 (18:58 +0300)]
fix health/armor wrapping around when someone was fragged

13 years agowoops, forgot some header files
FruitieX [Wed, 13 Apr 2011 15:43:00 +0000 (18:43 +0300)]
woops, forgot some header files

13 years agoallow decolorization as an option, enable by default in teamgames similar to how...
FruitieX [Wed, 13 Apr 2011 15:42:01 +0000 (18:42 +0300)]
allow decolorization as an option, enable by default in teamgames similar to how the old cl_shownames did it. Can be forced on in non-teamgames too.

13 years agosupport resizing the name and enable by default
FruitieX [Wed, 13 Apr 2011 14:47:26 +0000 (17:47 +0300)]
support resizing the name and enable by default

13 years agoMerge remote branch 'origin/mand1nga/bot-misc-fixes'
mand1nga [Wed, 13 Apr 2011 14:37:01 +0000 (11:37 -0300)]
Merge remote branch 'origin/mand1nga/bot-misc-fixes'

13 years agosmooth alpha fade clientside from 1500 to 2500 units distance, now a hard cut can...
FruitieX [Wed, 13 Apr 2011 14:19:27 +0000 (17:19 +0300)]
smooth alpha fade clientside from 1500 to 2500 units distance, now a hard cut can be enabled serverside at 2500 whenever code for it works

13 years agodistance culling doesn't want to work for some reason... leaving it commented still
FruitieX [Wed, 13 Apr 2011 13:42:57 +0000 (16:42 +0300)]
distance culling doesn't want to work for some reason... leaving it commented still

13 years agosmall fix
FruitieX [Wed, 13 Apr 2011 13:22:48 +0000 (16:22 +0300)]
small fix

13 years agomake them fade out/in :o
FruitieX [Wed, 13 Apr 2011 13:18:42 +0000 (16:18 +0300)]
make them fade out/in :o

13 years agoone more feature is WIP (only show enemies when pointed at), other than that it shoul...
FruitieX [Wed, 13 Apr 2011 13:10:06 +0000 (16:10 +0300)]
one more feature is WIP (only show enemies when pointed at), other than that it should be done

13 years agoi forgot to center the names, lol
FruitieX [Wed, 13 Apr 2011 12:23:16 +0000 (15:23 +0300)]
i forgot to center the names, lol

13 years agoonly draw the question mark health/armor icons in teamplay games
FruitieX [Wed, 13 Apr 2011 12:16:52 +0000 (15:16 +0300)]
only draw the question mark health/armor icons in teamplay games

13 years ago@ CSQC: You've been trolled, you've been trolled... Also enemy nametags are no longer...
FruitieX [Wed, 13 Apr 2011 12:09:31 +0000 (15:09 +0300)]
@ CSQC: You've been trolled, you've been trolled... Also enemy nametags are no longer visible through solid :D

13 years agofix the aforementioned problem in the previous commit
FruitieX [Wed, 13 Apr 2011 11:11:56 +0000 (14:11 +0300)]
fix the aforementioned problem in the previous commit

13 years agosome more tweaks, remaining issues: why does it project the names also behind the...
FruitieX [Wed, 13 Apr 2011 10:58:38 +0000 (13:58 +0300)]
some more tweaks, remaining issues: why does it project the names also behind the player? also need to fix the customizeentityforclient (currently is disabled)

13 years agothat think function was useless actually, remove it and use draw2d instead
FruitieX [Wed, 13 Apr 2011 10:40:47 +0000 (13:40 +0300)]
that think function was useless actually, remove it and use draw2d instead

13 years agonow it "works" again
FruitieX [Wed, 13 Apr 2011 10:37:05 +0000 (13:37 +0300)]
now it "works" again

13 years agodo some restructuring according to div0s suggestions... now the branch name is accura...
FruitieX [Wed, 13 Apr 2011 09:54:37 +0000 (12:54 +0300)]
do some restructuring according to div0s suggestions... now the branch name is accurate again (borken)

13 years agoremove the old shownames from here
FruitieX [Wed, 13 Apr 2011 08:55:55 +0000 (11:55 +0300)]
remove the old shownames from here

13 years agoholy crap it compiles
FruitieX [Wed, 13 Apr 2011 08:54:41 +0000 (11:54 +0300)]
holy crap it compiles

13 years agoremove the shownames HUD panel, start implementing the actual drawing/positioning...
FruitieX [Wed, 13 Apr 2011 07:49:56 +0000 (10:49 +0300)]
remove the shownames HUD panel, start implementing the actual drawing/positioning code

13 years agowhy do i store the edict when i call this function every frame anyway... stupid ...
FruitieX [Wed, 13 Apr 2011 07:37:01 +0000 (10:37 +0300)]
why do i store the edict when i call this function every frame anyway... stupid :P Oh plus some other changes apparently :-P

13 years agoha! got health/armor networking right finally
FruitieX [Wed, 13 Apr 2011 07:22:18 +0000 (10:22 +0300)]
ha! got health/armor networking right finally

13 years agoMerge remote-tracking branch 'origin/master' into fruitiex/borken_shownames
FruitieX [Wed, 13 Apr 2011 06:51:59 +0000 (09:51 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/borken_shownames

13 years agoMerge remote-tracking branch 'origin/samual/balance'
Jakob MG [Tue, 12 Apr 2011 17:14:12 +0000 (19:14 +0200)]
Merge remote-tracking branch 'origin/samual/balance'

13 years agoSlightly less rotlinear so that your health/armor doesn't TOTALLY disappear instantly.
Samual [Tue, 12 Apr 2011 16:11:37 +0000 (12:11 -0400)]
Slightly less rotlinear so that your health/armor doesn't TOTALLY disappear instantly.

13 years agosome debug prints, distance culling (cvarred)
FruitieX [Mon, 11 Apr 2011 19:46:59 +0000 (22:46 +0300)]
some debug prints, distance culling (cvarred)

13 years agolooks like we can figure out the netname with stuff that already exists in CSQC :)
FruitieX [Mon, 11 Apr 2011 19:20:26 +0000 (22:20 +0300)]
looks like we can figure out the netname with stuff that already exists in CSQC :)

13 years agoyay origins and player ids printed correctly now (lol trolled samual)
FruitieX [Mon, 11 Apr 2011 18:57:45 +0000 (21:57 +0300)]
yay origins and player ids printed correctly now (lol trolled samual)

13 years agooh wait, haha
FruitieX [Mon, 11 Apr 2011 18:44:36 +0000 (21:44 +0300)]
oh wait, haha

13 years agonew implementation of shownames with MSG_ENTITY (broken currently)
FruitieX [Mon, 11 Apr 2011 18:34:34 +0000 (21:34 +0300)]
new implementation of shownames with MSG_ENTITY (broken currently)

13 years agoMerge remote-tracking branch 'remotes/origin/terencehill/newpanelhud' into terencehil...
terencehill [Mon, 11 Apr 2011 17:20:48 +0000 (19:20 +0200)]
Merge remote-tracking branch 'remotes/origin/terencehill/newpanelhud' into terencehill/newpanelhud

Conflicts:
hud_luminos.cfg
hud_luminos_old.cfg

13 years agouse maxhealth/maxarmor cvars instead of constants (hud_panel_shownames)
FruitieX [Mon, 11 Apr 2011 13:49:18 +0000 (16:49 +0300)]
use maxhealth/maxarmor cvars instead of constants (hud_panel_shownames)

13 years agothis one seems to have been forgotten :)
FruitieX [Mon, 11 Apr 2011 13:42:35 +0000 (16:42 +0300)]
this one seems to have been forgotten :)

13 years agoMerge branch 'fruitiex/better_shownames' into terencehill/newpanelhud
FruitieX [Mon, 11 Apr 2011 13:38:02 +0000 (16:38 +0300)]
Merge branch 'fruitiex/better_shownames' into terencehill/newpanelhud

Conflicts:
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_xhair_minimal.cfg
hud_nexuiz.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/menu/xonotic/mainwindow.c

13 years agomake text readable in physics panel setup
FruitieX [Mon, 11 Apr 2011 13:16:04 +0000 (16:16 +0300)]
make text readable in physics panel setup

13 years agoMerge remote-tracking branch 'origin/master' into terencehill/newpanelhud
FruitieX [Mon, 11 Apr 2011 12:56:27 +0000 (15:56 +0300)]
Merge remote-tracking branch 'origin/master' into terencehill/newpanelhud

Conflicts:
defaultXonotic.cfg
hud_luminos.cfg
qcsrc/client/hud.qc

13 years agofix the shownames dialog finally
FruitieX [Mon, 11 Apr 2011 12:43:32 +0000 (15:43 +0300)]
fix the shownames dialog finally

13 years agoMerge branch 'fruitiex/hud_effect_from_goldenhealth'
mand1nga [Mon, 11 Apr 2011 12:39:26 +0000 (09:39 -0300)]
Merge branch 'fruitiex/hud_effect_from_goldenhealth'

13 years agoIndentation fascist reporting for duty\!
mand1nga [Mon, 11 Apr 2011 12:35:49 +0000 (09:35 -0300)]
Indentation fascist reporting for duty\!

13 years agoBots: Fix divide by zero error when using the nex. Made them able to charge the nex.
mand1nga [Mon, 11 Apr 2011 12:22:05 +0000 (09:22 -0300)]
Bots: Fix divide by zero error when using the nex. Made them able to charge the nex.

13 years agoMerge remote-tracking branch 'origin/master' into fruitiex/better_shownames
FruitieX [Mon, 11 Apr 2011 12:08:13 +0000 (15:08 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/better_shownames

13 years agorevive the low health/armor hud effect from fruitiex/goldenhealth, also set both...
FruitieX [Mon, 11 Apr 2011 11:58:48 +0000 (14:58 +0300)]
revive the low health/armor hud effect from fruitiex/goldenhealth, also set both healthmax/armormax at 200 (this determines when the status bars on the hud are full, used to be 250 and 150 so they had different scales...)

13 years agoMerge remote branch 'origin/samual/fix_hud_configstuff'
mand1nga [Mon, 11 Apr 2011 00:32:41 +0000 (21:32 -0300)]
Merge remote branch 'origin/samual/fix_hud_configstuff'

13 years agoFix some issues with creating hud configs automatically + add descriptions for a...
Samual [Sun, 10 Apr 2011 21:22:05 +0000 (17:22 -0400)]
Fix some issues with creating hud configs automatically + add descriptions for a cvar I added

13 years agoMerge remote branch 'origin/samual/fix_crosshair_ring_cvars'
mand1nga [Sun, 10 Apr 2011 20:58:28 +0000 (17:58 -0300)]
Merge remote branch 'origin/samual/fix_crosshair_ring_cvars'

13 years agoMerge remote branch 'origin/samual/devreleaseconfigs'
mand1nga [Sun, 10 Apr 2011 20:52:38 +0000 (17:52 -0300)]
Merge remote branch 'origin/samual/devreleaseconfigs'

13 years agoAdd checks to see if crosshair ring is even allowed to render
Samual [Sun, 10 Apr 2011 20:50:52 +0000 (16:50 -0400)]
Add checks to see if crosshair ring is even allowed to render

13 years agoAdd config for balance switching on endmatch (also for notifications of current balance)
Samual [Sun, 10 Apr 2011 20:45:29 +0000 (16:45 -0400)]
Add config for balance switching on endmatch (also for notifications of current balance)

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sun, 10 Apr 2011 15:57:56 +0000 (17:57 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agoadd some experimental aliases. Do not use.
Rudolf Polzer [Sun, 10 Apr 2011 15:57:43 +0000 (17:57 +0200)]
add some experimental aliases. Do not use.

13 years agoMerge remote branch 'origin/terencehill/hud_panel_powerups_text_fix'
mand1nga [Sat, 9 Apr 2011 01:17:38 +0000 (22:17 -0300)]
Merge remote branch 'origin/terencehill/hud_panel_powerups_text_fix'

13 years agoMerge remote branch 'origin/tzork/fl_notarget_ctflags'
mand1nga [Sat, 9 Apr 2011 00:38:02 +0000 (21:38 -0300)]
Merge remote branch 'origin/tzork/fl_notarget_ctflags'

13 years agoMerge remote branch 'origin/samual/defaults/swap_minelayer_mortar_priority'
mand1nga [Fri, 8 Apr 2011 17:05:15 +0000 (14:05 -0300)]
Merge remote branch 'origin/samual/defaults/swap_minelayer_mortar_priority'

13 years agoAdd missing cvar hud_panel_powerups_text to hud_luminos_xhair_minimal.cfg
terencehill [Thu, 7 Apr 2011 18:03:09 +0000 (20:03 +0200)]
Add missing cvar hud_panel_powerups_text to hud_luminos_xhair_minimal.cfg

13 years agofix wrong strreplace usage
Rudolf Polzer [Wed, 6 Apr 2011 20:02:44 +0000 (22:02 +0200)]
fix wrong strreplace usage

13 years agoSet FL_NOTARGET on ctf flags (avoids turrets and otehr AI shooting them
Jakob MG [Wed, 6 Apr 2011 09:30:26 +0000 (11:30 +0200)]
Set FL_NOTARGET on ctf flags (avoids turrets and otehr AI shooting them

13 years agoMerge remote-tracking branch 'origin/samual/fix_csqc_strings'
Jakob MG [Tue, 5 Apr 2011 22:55:58 +0000 (00:55 +0200)]
Merge remote-tracking branch 'origin/samual/fix_csqc_strings'

13 years agoMerge remote-tracking branch 'origin/samual/balance'
Jakob MG [Tue, 5 Apr 2011 22:51:08 +0000 (00:51 +0200)]
Merge remote-tracking branch 'origin/samual/balance'

13 years agoMerge remote-tracking branch 'origin/samual/fix_hud_drawpic_expanding'
Jakob MG [Tue, 5 Apr 2011 22:48:11 +0000 (00:48 +0200)]
Merge remote-tracking branch 'origin/samual/fix_hud_drawpic_expanding'

13 years agoSome updates to falldamage - It should hurt more to fall from a flying vehicle ^_^
Samual [Tue, 5 Apr 2011 13:33:06 +0000 (09:33 -0400)]
Some updates to falldamage - It should hurt more to fall from a flying vehicle ^_^

13 years agoACTUALLY make drawpic_aspect_skin_expanding use the proper rendering for the aspect...
Samual [Tue, 5 Apr 2011 11:24:00 +0000 (07:24 -0400)]
ACTUALLY make drawpic_aspect_skin_expanding use the proper rendering for the aspect ratio. Fixes a bug that the expanding image mismatches the normal image in the HUD, now can be used for any HUD skin

13 years agoBy request of many, swap the priority for grenadelauncher and minelayer - Most people...
Samual [Tue, 5 Apr 2011 10:56:11 +0000 (06:56 -0400)]
By request of many, swap the priority for grenadelauncher and minelayer - Most people want the grenadelauncher to come up first when they press the bind.

13 years agoLower turnrate just slightly on the seeker
Samual [Tue, 5 Apr 2011 10:44:58 +0000 (06:44 -0400)]
Lower turnrate just slightly on the seeker

13 years agog_start_weapon_sniperrifle 0 - Disable sniper rifle for now, at least until it gets...
Samual [Tue, 5 Apr 2011 10:13:36 +0000 (06:13 -0400)]
g_start_weapon_sniperrifle 0 - Disable sniper rifle for now, at least until it gets new functionality.

13 years agogettext a string which was missed for warmup
Samual [Tue, 5 Apr 2011 09:55:46 +0000 (05:55 -0400)]
gettext a string which was missed for warmup

13 years agoUpdate starting ammo values for warmup, LMS, and nix
Samual [Tue, 5 Apr 2011 09:13:02 +0000 (05:13 -0400)]
Update starting ammo values for warmup, LMS, and nix

13 years agofix health in ekg
Rudolf Polzer [Tue, 5 Apr 2011 07:12:26 +0000 (09:12 +0200)]
fix health in ekg

13 years agoMerge remote branch 'origin/samual/defaults/smoothcrouch_enable'
mand1nga [Mon, 4 Apr 2011 00:51:55 +0000 (21:51 -0300)]
Merge remote branch 'origin/samual/defaults/smoothcrouch_enable'

13 years agoMerge remote branch 'origin/samual/balance'
mand1nga [Mon, 4 Apr 2011 00:38:36 +0000 (21:38 -0300)]
Merge remote branch 'origin/samual/balance'

13 years agoThis enables a featured I added in the engine a while ago which basically smooths...
Samual [Mon, 4 Apr 2011 00:34:25 +0000 (20:34 -0400)]
This enables a featured I added in the engine a while ago which basically smooths the view when crouching (previously it was an instant switch... which looked very odd.) This was SUPPOSED to be added into master a long time ago, but I didn't notice as I had it in my config.

13 years agoNew health limit and rot rate plus use g_balance_damagepush_speedfactor 2.5
Samual [Mon, 4 Apr 2011 00:17:20 +0000 (20:17 -0400)]
New health limit and rot rate plus use g_balance_damagepush_speedfactor 2.5

13 years agoMerge remote branch 'origin/fruitiex/mapvote_fix'
mand1nga [Sun, 3 Apr 2011 23:18:32 +0000 (20:18 -0300)]
Merge remote branch 'origin/fruitiex/mapvote_fix'

13 years agoMerge remote branch 'origin/fruitiex/accelerometer_fix'
mand1nga [Sun, 3 Apr 2011 23:17:12 +0000 (20:17 -0300)]
Merge remote branch 'origin/fruitiex/accelerometer_fix'

13 years agoFix hud_panel_physics_baralign slider, value field text was unreadable because too...
terencehill [Sun, 3 Apr 2011 22:36:51 +0000 (00:36 +0200)]
Fix hud_panel_physics_baralign slider, value field text was unreadable because too much compressed

13 years agoSync hud_luminos_old.cfg and adapt pos/size of the physics panel in hud_luminos.cfg
terencehill [Sun, 3 Apr 2011 22:33:53 +0000 (00:33 +0200)]
Sync hud_luminos_old.cfg and adapt pos/size of the physics panel in hud_luminos.cfg

13 years agoadd the acceleration bars for these two skins too
FruitieX [Sun, 3 Apr 2011 22:24:40 +0000 (01:24 +0300)]
add the acceleration bars for these two skins too

13 years agoMerge remote branch 'origin/morphed/hpitems'
mand1nga [Sun, 3 Apr 2011 21:55:42 +0000 (18:55 -0300)]
Merge remote branch 'origin/morphed/hpitems'

13 years agoMerge branch 'master' into terencehill/newpanelhud
terencehill [Sun, 3 Apr 2011 21:15:52 +0000 (23:15 +0200)]
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
hud_luminos.cfg