]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoMerge remote branch 'origin/master' into tzork/vehicles-2
unknown [Sun, 17 Apr 2011 13:09:28 +0000 (15:09 +0200)]
Merge remote branch 'origin/master' into tzork/vehicles-2

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 rocket reload displaybug on spider. Disable crosshair-trace-pich for spider....
Jakob MG [Thu, 14 Apr 2011 00:49:56 +0000 (02:49 +0200)]
Fix rocket reload displaybug on spider. Disable crosshair-trace-pich for spider. Disable bumblebee. More groundwork towards csqc vehicles

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 agomake bumblebee gunner slot work. well a bit.. ;)
Jakob MG [Wed, 13 Apr 2011 00:07:01 +0000 (02:07 +0200)]
make bumblebee gunner slot work. well a bit.. ;)

13 years agofix warning
Jakob MG [Tue, 12 Apr 2011 17:45:27 +0000 (19:45 +0200)]
fix warning

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 agoMake bumblebee work as a spv first
Jakob MG [Tue, 12 Apr 2011 17:10:44 +0000 (19:10 +0200)]
Make bumblebee work as a spv first

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 agoMerge remote-tracking branch 'origin/master' into tzork/vehicles-2
Jakob MG [Tue, 12 Apr 2011 15:37:16 +0000 (17:37 +0200)]
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2

13 years agoAdd bumblebee code frame
Jakob MG [Tue, 12 Apr 2011 15:36:55 +0000 (17:36 +0200)]
Add bumblebee code frame

13 years agoAdd bumblebee model (mpv prototype)
Jakob MG [Tue, 12 Apr 2011 14:40:01 +0000 (16:40 +0200)]
Add bumblebee model (mpv prototype)

13 years agoAll vehicle stats as 0--100 (%) int. Spider minigun simplified
Jakob MG [Tue, 12 Apr 2011 14:36:56 +0000 (16:36 +0200)]
All vehicle stats as 0--100 (%) int. Spider minigun simplified

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 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-tracking branch 'origin/master' into tzork/vehicles-2
Jakob MG [Sat, 9 Apr 2011 05:40:58 +0000 (07:40 +0200)]
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2

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 agojeje
Jakob MG [Fri, 8 Apr 2011 14:01:56 +0000 (16:01 +0200)]
jeje

13 years agoA little more work towards csqc vehicles
Jakob MG [Fri, 8 Apr 2011 14:00:22 +0000 (16:00 +0200)]
A little more work towards csqc vehicles

13 years agoBegin csqc vehicles framework (not functional or used yet). Add some comments. Spawn...
Jakob MG [Fri, 8 Apr 2011 03:56:09 +0000 (05:56 +0200)]
Begin csqc vehicles framework (not functional or used yet). Add some comments. Spawn 3 not 4 shell fragments for raptor bomb on split (only function change in this commit)

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 agoooops
Jakob MG [Wed, 6 Apr 2011 10:34:48 +0000 (12:34 +0200)]
ooops

13 years agoMore network savings, add shell effect for clusterbomb on split
Jakob MG [Wed, 6 Apr 2011 10:30:50 +0000 (12:30 +0200)]
More network savings, add shell effect for clusterbomb on split

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 agoBetter csqc projectile types, EF_LOWPRECISION on extra vehicle bits
Jakob MG [Wed, 6 Apr 2011 09:28:01 +0000 (11:28 +0200)]
Better csqc projectile types, EF_LOWPRECISION on extra vehicle bits

13 years agoMerge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
Jakob MG [Wed, 6 Apr 2011 08:38:39 +0000 (10:38 +0200)]
Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into tzork/vehicles-2

13 years agoSave on netuse by using Ent_DamageInfo for vehicle particles / sounds on weapon impac...
Jakob MG [Wed, 6 Apr 2011 08:38:09 +0000 (10:38 +0200)]
Save on netuse by using Ent_DamageInfo for vehicle particles / sounds on weapon impacts and deaths

13 years agoMerge remote-tracking branch 'origin/master' into tzork/vehicles-2
Jakob MG [Wed, 6 Apr 2011 06:42:08 +0000 (08:42 +0200)]
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2

13 years agoreflection for cockpit texture
Morphed [Wed, 6 Apr 2011 01:55:20 +0000 (03:55 +0200)]
reflection for cockpit texture

13 years agonew cockpit for raptor
Morphed [Wed, 6 Apr 2011 00:55:07 +0000 (02:55 +0200)]
new cockpit for raptor

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 agoMerge remote-tracking branch 'origin/master' into tzork/vehicles-2
Jakob MG [Tue, 5 Apr 2011 20:40:06 +0000 (22:40 +0200)]
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2

13 years agoThis is a commit message, one of many noone will realy need or read
Jakob MG [Tue, 5 Apr 2011 20:25:34 +0000 (22:25 +0200)]
This is a commit message, one of many noone will realy need or read

13 years agoMerge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
Jakob MG [Tue, 5 Apr 2011 19:08:01 +0000 (21:08 +0200)]
Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into tzork/vehicles-2

13 years agosome more particle fx
Morphed [Tue, 5 Apr 2011 19:04:48 +0000 (21:04 +0200)]
some more particle fx

13 years agoMerge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
Jakob MG [Tue, 5 Apr 2011 18:04:35 +0000 (20:04 +0200)]
Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into tzork/vehicles-2

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 agomore particles for vehicles
Morphed [Tue, 5 Apr 2011 10:23:01 +0000 (12:23 +0200)]
more particles for vehicles

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 agoswitching branch
Jakob MG [Tue, 5 Apr 2011 09:27:19 +0000 (11:27 +0200)]
switching branch

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 branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
Morphed [Tue, 5 Apr 2011 00:51:10 +0000 (02:51 +0200)]
Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into vehicles-2

13 years agonew effects for vehicles
Morphed [Tue, 5 Apr 2011 00:44:02 +0000 (02:44 +0200)]
new effects for vehicles

13 years agoStop using vehicles_customizeentityforclient, its expensive. (lets see how much break...
Jakob MG [Mon, 4 Apr 2011 02:49:55 +0000 (04:49 +0200)]
Stop using vehicles_customizeentityforclient, its expensive. (lets see how much breaks =). Fix angles overflow for raptor rotors. Stop player fierinf weapons from inside vehicle while raptor is taking off. Dont apply friction to racer's z-velocity - its upwards speed is handeld elsewhere (not perfect but better)

13 years agonew bomblet size
Morphed [Mon, 4 Apr 2011 01:19:51 +0000 (03:19 +0200)]
new bomblet size

13 years agoRemove some stale code, very basic racer tough csqc (disabled) new models for raptor...
Jakob MG [Mon, 4 Apr 2011 01:03:34 +0000 (03:03 +0200)]
Remove some stale code, very basic racer tough csqc (disabled) new models for raptor & otehr models, thanks morphed. friction cvar for racer.

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 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 agoSync with master
Jakob MG [Sun, 3 Apr 2011 17:29:02 +0000 (19:29 +0200)]
Sync with master

13 years agoMake raptr bombs bounce if vehicle that droped them is to close to impact. Better...
Jakob MG [Sun, 3 Apr 2011 17:04:44 +0000 (19:04 +0200)]
Make raptr bombs bounce if vehicle that droped them is to close to impact. Better hover handeling for racer (gravity was accidently applied twice), should get stuck less now. Some pointless but nice looking bobbing while racer is unmaned. Clean up and speed up vehicle shiled handeling

13 years agoMerge remote branch 'origin/terencehill/italian_update'
mand1nga [Sun, 3 Apr 2011 16:48:09 +0000 (13:48 -0300)]
Merge remote branch 'origin/terencehill/italian_update'

13 years agoCorrect various errors and translate some more strings
terencehill [Sun, 3 Apr 2011 13:48:26 +0000 (15:48 +0200)]
Correct various errors and translate some more strings

13 years agoAdd Italian to languages.txt so that it can be selected in the menu
terencehill [Sun, 3 Apr 2011 13:34:05 +0000 (15:34 +0200)]
Add Italian to languages.txt so that it can be selected in the menu

13 years agoCreate and use vehicles_projectile(...) to reduce code duplication. Spiderbot deaht...
Jakob MG [Sun, 3 Apr 2011 02:39:02 +0000 (04:39 +0200)]
Create and use vehicles_projectile(...) to reduce code duplication. Spiderbot deaht aimations. New spiderbot top & cockpit models. Aditional textures for spider and racer

13 years agoFix fb cockpit, better camera location for raptor
Jakob MG [Sat, 2 Apr 2011 21:36:48 +0000 (23:36 +0200)]
Fix fb cockpit, better camera location for raptor

13 years agoBring back raptor straferoll, fix raptor mode 1 movement, fix raptor bomb reload...
Jakob MG [Sat, 2 Apr 2011 20:38:16 +0000 (22:38 +0200)]
Bring back raptor straferoll, fix raptor mode 1 movement, fix raptor bomb reload, make lock decrease quicker if you aim at anoterh ENTITY (so you can pick target faster). Clean up some junk.

13 years agoskip the WarpZone_StoreProjectileData loop if there are no warpzones
Rudolf Polzer [Sat, 2 Apr 2011 19:33:55 +0000 (21:33 +0200)]
skip the WarpZone_StoreProjectileData loop if there are no warpzones

13 years agoFix rpojectile models/shader for vehicles, disable upforce case in racer_frame as...
Jakob MG [Sat, 2 Apr 2011 18:05:50 +0000 (20:05 +0200)]
Fix rpojectile models/shader for vehicles, disable upforce case in racer_frame as tahts handled selwhere now

13 years agoGet rid of 240 tracelines / second for racer by disabelign swept colission code,...
Jakob MG [Sat, 2 Apr 2011 17:53:50 +0000 (19:53 +0200)]
Get rid of 240 tracelines / second for racer by disabelign swept colission code, its bbox is large eougth to make it not cut so much into world now anyway. make upforce stabalizer a bit better, but longer springs for racer. better movetype (less bouncy)

13 years agocsqc projectile types for vehicles, and models
Jakob MG [Sat, 2 Apr 2011 16:08:05 +0000 (18:08 +0200)]
csqc projectile types for vehicles, and models

13 years agoaccelerometer: remove the "glow"/fade out effects from the status bar image. They...
FruitieX [Sat, 2 Apr 2011 14:46:48 +0000 (17:46 +0300)]
accelerometer: remove the "glow"/fade out effects from the status bar image. They created an annoying gap in the center of the accelerometer.

13 years agoMapvote: Don't show the "-1 votes" count when a map has been voted out
FruitieX [Sat, 2 Apr 2011 14:32:17 +0000 (17:32 +0300)]
Mapvote: Don't show the "-1 votes" count when a map has been voted out

13 years agoFix racer rockets, reset lock on spawn, zero avelocity on exit
Jakob MG [Fri, 1 Apr 2011 18:56:39 +0000 (20:56 +0200)]
Fix racer rockets, reset lock on spawn, zero avelocity on exit

13 years agoForgot a bad lines in raptor spawn code
Jakob MG [Fri, 1 Apr 2011 17:17:38 +0000 (19:17 +0200)]
Forgot a bad lines in raptor spawn code

13 years agoMake a common vehicles_spawn to handle bulk stuff / reduce code duplication. Make...
Jakob MG [Fri, 1 Apr 2011 16:49:00 +0000 (18:49 +0200)]
Make a common vehicles_spawn to handle bulk stuff / reduce code duplication. Make raptor steer/aim by angular velocity (smoother, compatibel with ode). Make raptor & spiderbut use a combination of v_angle and crosshait_trace for accurate aim regardless of chase or not

13 years agoput the watermark in an ifdef
Rudolf Polzer [Fri, 1 Apr 2011 16:48:02 +0000 (18:48 +0200)]
put the watermark in an ifdef

13 years agoSwitching branch
Jakob MG [Fri, 1 Apr 2011 14:35:28 +0000 (16:35 +0200)]
Switching branch

13 years agosupport # comments in player stats
Rudolf Polzer [Fri, 1 Apr 2011 13:53:36 +0000 (15:53 +0200)]
support # comments in player stats

13 years agosend a "R" line in the player stats POST that is the current version string
Rudolf Polzer [Fri, 1 Apr 2011 13:44:20 +0000 (15:44 +0200)]
send a "R" line in the player stats POST that is the current version string

13 years agoin adminmsg: entnumber 0 means "all clients"
Rudolf Polzer [Fri, 1 Apr 2011 13:12:55 +0000 (15:12 +0200)]
in adminmsg: entnumber 0 means "all clients"

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 1 Apr 2011 13:09:06 +0000 (15:09 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agonew command: sv_cmd adminmsg <clientno> "string" <infobartime>
Rudolf Polzer [Fri, 1 Apr 2011 13:07:57 +0000 (15:07 +0200)]
new command: sv_cmd adminmsg <clientno> "string" <infobartime>

shows using the "infobar" console command on the client

13 years agoimprove team spawn logic
Rudolf Polzer [Thu, 31 Mar 2011 19:59:05 +0000 (21:59 +0200)]
improve team spawn logic

in a non-team match, ignore team spawns if there is at least one non-team spawn

13 years agoMerge remote branch 'origin/mirceakitsune/cvared_gib_health'
Rudolf Polzer [Thu, 31 Mar 2011 07:27:22 +0000 (09:27 +0200)]
Merge remote branch 'origin/mirceakitsune/cvared_gib_health'