]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoClient side countdown for kicking when idle
terencehill [Mon, 20 Jun 2011 22:41:09 +0000 (00:41 +0200)]
Client side countdown for kicking when idle

13 years agoClient side countdowns when suiciding / changing team / spectating
terencehill [Mon, 20 Jun 2011 18:06:36 +0000 (20:06 +0200)]
Client side countdowns when suiciding / changing team / spectating

13 years agoFix yet another bug, "Active weapon: X" centerprint spam in the first round of a...
terencehill [Mon, 20 Jun 2011 16:42:22 +0000 (18:42 +0200)]
Fix yet another bug, "Active weapon: X" centerprint spam in the first round of a NIX game.

13 years agoNow that "The Champion is X" msg is centerprinted only once there's no need to strzon...
terencehill [Mon, 20 Jun 2011 16:00:29 +0000 (18:00 +0200)]
Now that "The Champion is X" msg is centerprinted only once there's no need to strzone champion.netname. Also I had to fix other centerprint-related bugs in the arena code (yet another couple of bugs created BY SOMEONE ELSE (guess who?) and fixed BY ME):
* "The Champion is X" msg was never sent because champion was cleared just before sending it (bad check f > 0).
Furthermore, bug in the bug, although the champion is needed only in arena, mysteriously its name was strzoned only in a part of the ca code
* "Begin!" msg in arena mode was never sent cause of a missing FOR_EACH_PLAYER(e)

13 years agoGet rid of the function getTimeoutText and use directly the timeout strings instead
terencehill [Sun, 19 Jun 2011 16:14:51 +0000 (18:14 +0200)]
Get rid of the function getTimeoutText and use directly the timeout strings instead

13 years agoWe don't need timeout countdown string in the MOTD as it's always shown during the...
terencehill [Sun, 19 Jun 2011 15:47:13 +0000 (17:47 +0200)]
We don't need timeout countdown string in the MOTD as it's always shown during the timeout as a separate msg

13 years agoSimplify message parsing and actually make it work better (it fixes duplicated MOTD...
terencehill [Sun, 19 Jun 2011 15:32:59 +0000 (17:32 +0200)]
Simplify message parsing and actually make it work better (it fixes duplicated MOTD message when timeout ends for example)

13 years agoClean up: add Send_CSQC_Centerprint_Generic_Expire
terencehill [Sun, 19 Jun 2011 14:08:59 +0000 (16:08 +0200)]
Clean up: add Send_CSQC_Centerprint_Generic_Expire

13 years agoRestore the ability to show campaign message or MOTD by pressing the info button...
terencehill [Wed, 15 Jun 2011 22:10:22 +0000 (00:10 +0200)]
Restore the ability to show campaign message or MOTD by pressing the info button (default key i)

13 years agoServer doesn't need to know the client cvar hud_panel_centerprint_time anymore, it...
terencehill [Tue, 14 Jun 2011 22:33:51 +0000 (00:33 +0200)]
Server doesn't need to know the client cvar hud_panel_centerprint_time anymore, it was used by the priority system

13 years agoRemove the priority system for centerprint messages in the server, we no longer need it
terencehill [Mon, 13 Jun 2011 23:06:42 +0000 (01:06 +0200)]
Remove the priority system for centerprint messages in the server, we no longer need it
centerprint_expire calls in vote.qc were useless since votes called aren't centerprinted anymore (there is the vote panel)

13 years agoMerge branch 'master' into terencehill/centerprint_stuff
terencehill [Sun, 12 Jun 2011 23:53:36 +0000 (01:53 +0200)]
Merge branch 'master' into terencehill/centerprint_stuff

13 years agoDamn! PlayerPreThink code is buggy! The countdown didn't stop when dead because ...
terencehill [Sun, 12 Jun 2011 23:13:47 +0000 (01:13 +0200)]
Damn! PlayerPreThink code is buggy! The countdown didn't stop when dead because (self.deadflag == DEAD_NO) is always true there... Add a FIXME comment as other code does that check and needs to be fixed.

13 years agoOther improvements to the multiple centerprints system
terencehill [Sun, 12 Jun 2011 22:25:37 +0000 (00:25 +0200)]
Other improvements to the multiple centerprints system

Server now uses Send_CSQC_Centerprint_Generic instead of centerprint_builtin to send messages, so that it's possible to send more parameters (id, duration and countdown_num) without adding them to the msg (like the id before). If duration is not set, then the default duration will be used, that is hud_panel_centerprint_time.

In the countdown case, the server can send only the first msg of a series with the same id and the client can continue the countdown by its own; the next countdown messages can be sent by the server anyway, for example to change the countdown msg or for whatever reason. Countdown can be stopped by the server at any time by sending an empty msg (always same id).

The centerprint function in the client now is a wrapper for centerprint_generic, which actually handles the new parameters and add the msgs to the list.

Changes on minstagib_ammocheck are neccessary to correctly stop the out of ammo countdown.

Still other work to do anyway...

13 years agoalso exec autoexec/*.cfg on startup
Rudolf Polzer [Sun, 12 Jun 2011 20:29:48 +0000 (22:29 +0200)]
also exec autoexec/*.cfg on startup

13 years agorename teams_matter to teamplay everywhere
Rudolf Polzer [Sun, 12 Jun 2011 13:40:16 +0000 (15:40 +0200)]
rename teams_matter to teamplay everywhere

this makes the code less confusing

13 years agofix bug causing a warning
Rudolf Polzer [Sun, 12 Jun 2011 13:24:53 +0000 (15:24 +0200)]
fix bug causing a warning

13 years agomake keyhunt and keepaway use the new use key system
Rudolf Polzer [Sun, 12 Jun 2011 13:23:20 +0000 (15:23 +0200)]
make keyhunt and keepaway use the new use key system

13 years agoadd a second use key system that responds to presses, not to holding it down
Rudolf Polzer [Sun, 12 Jun 2011 12:58:53 +0000 (14:58 +0200)]
add a second use key system that responds to presses, not to holding it down

13 years agosimply assault code a bit
Rudolf Polzer [Sun, 12 Jun 2011 12:03:02 +0000 (14:03 +0200)]
simply assault code a bit

13 years agoadd "xencoding", an encoding scheme of numbers into invisible parts of messages
Rudolf Polzer [Sun, 12 Jun 2011 12:02:33 +0000 (14:02 +0200)]
add "xencoding", an encoding scheme of numbers into invisible parts of messages

13 years agofix compile error
Rudolf Polzer [Sat, 11 Jun 2011 18:50:27 +0000 (20:50 +0200)]
fix compile error

13 years agobetter also set menu_cl_gunalign to 3 here
Rudolf Polzer [Sat, 11 Jun 2011 18:03:26 +0000 (20:03 +0200)]
better also set menu_cl_gunalign to 3 here

13 years agoswitch the meanings of cl_gunalign 1/2 and 3/4 because of problems with old client...
Rudolf Polzer [Sat, 11 Jun 2011 18:02:13 +0000 (20:02 +0200)]
switch the meanings of cl_gunalign 1/2 and 3/4 because of problems with old client on new server

13 years agoKeep displayed the centerprint panel when showing the scoreboard and move it smoothly...
terencehill [Fri, 10 Jun 2011 21:47:58 +0000 (23:47 +0200)]
Keep displayed the centerprint panel when showing the scoreboard and move it smoothly below the scoreboard
Also apply the global alpha (hud_panel_fg_alpha) to the messages

13 years agoconfig_update: switch all users to cl_gunalign 1 once
Rudolf Polzer [Fri, 10 Jun 2011 21:17:09 +0000 (23:17 +0200)]
config_update: switch all users to cl_gunalign 1 once

13 years agomake shootfromeye and shootfromclient show properly by default
Rudolf Polzer [Fri, 10 Jun 2011 21:14:10 +0000 (23:14 +0200)]
make shootfromeye and shootfromclient show properly by default

13 years agochange default of cl_gunalign to "right only"; add "Center" item to the menu; allow...
Rudolf Polzer [Fri, 10 Jun 2011 21:09:38 +0000 (23:09 +0200)]
change default of cl_gunalign to "right only"; add "Center" item to the menu; allow Center choice by default

13 years agonew parameter target_random to ALL entities; when set to 1, only one instead of all...
Rudolf Polzer [Wed, 8 Jun 2011 08:51:38 +0000 (10:51 +0200)]
new parameter target_random to ALL entities; when set to 1, only one instead of all entities matched by target/target2/target3/target4 are triggered

13 years agoMerge remote-tracking branch 'origin/MaidenBeast/italian_translation'
Rudolf Polzer [Mon, 6 Jun 2011 19:11:14 +0000 (21:11 +0200)]
Merge remote-tracking branch 'origin/MaidenBeast/italian_translation'

13 years agodon't send a vote string when no vote is active
Rudolf Polzer [Mon, 6 Jun 2011 19:09:53 +0000 (21:09 +0200)]
don't send a vote string when no vote is active

13 years agotry another attempt to fix extendmatchtime (by Space_Man)
Rudolf Polzer [Mon, 6 Jun 2011 19:02:31 +0000 (21:02 +0200)]
try another attempt to fix extendmatchtime (by Space_Man)

13 years agofix the gloss box dependencies as gloss can work on player models without deluxemapping
Rudolf Polzer [Mon, 6 Jun 2011 07:38:34 +0000 (09:38 +0200)]
fix the gloss box dependencies as gloss can work on player models without deluxemapping

13 years agofix extendmatchtime/reducematchtime commands
Rudolf Polzer [Mon, 6 Jun 2011 04:45:24 +0000 (06:45 +0200)]
fix extendmatchtime/reducematchtime commands

13 years agoAdded 1st version of csprogs.dat.it.po (there are some untraslated strings)
MaidenBeast [Sat, 4 Jun 2011 12:02:06 +0000 (14:02 +0200)]
Added 1st version of csprogs.dat.it.po (there are some untraslated strings)

13 years agomake the first frame even nicer
Rudolf Polzer [Sat, 4 Jun 2011 04:49:00 +0000 (06:49 +0200)]
make the first frame even nicer

13 years agodon't allow drawframetime to be > 1 sec (sorry, laggers)
Rudolf Polzer [Sat, 4 Jun 2011 04:35:16 +0000 (06:35 +0200)]
don't allow drawframetime to be > 1 sec (sorry, laggers)

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 3 Jun 2011 20:14:55 +0000 (22:14 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agoadd a demo seeking cfg
Rudolf Polzer [Fri, 3 Jun 2011 20:13:51 +0000 (22:13 +0200)]
add a demo seeking cfg

13 years agoclarification comment, nothing else
Rudolf Polzer [Fri, 3 Jun 2011 07:27:32 +0000 (09:27 +0200)]
clarification comment, nothing else

13 years agoARGH, fix another terencehill bug - this fixes DDS detection for builds
Rudolf Polzer [Fri, 3 Jun 2011 05:53:38 +0000 (07:53 +0200)]
ARGH, fix another terencehill bug - this fixes DDS detection for builds

13 years agoconvert to iqm v2
Rudolf Polzer [Wed, 1 Jun 2011 11:53:03 +0000 (13:53 +0200)]
convert to iqm v2

13 years agoMerge branch 'master' into terencehill/centerprint_stuff
terencehill [Sat, 28 May 2011 08:52:29 +0000 (10:52 +0200)]
Merge branch 'master' into terencehill/centerprint_stuff

Conflicts:
qcsrc/client/hud.qc

13 years agoFix stupid typo... should fix occasional crashes
terencehill [Sat, 28 May 2011 06:37:04 +0000 (08:37 +0200)]
Fix stupid typo... should fix occasional crashes

13 years agomake warpzones nicer with chase_active (no longer hide the player)
Rudolf Polzer [Sat, 28 May 2011 06:18:47 +0000 (08:18 +0200)]
make warpzones nicer with chase_active (no longer hide the player)

13 years agorewrote warpzonelib view fixing
Rudolf Polzer [Sat, 28 May 2011 06:13:28 +0000 (08:13 +0200)]
rewrote warpzonelib view fixing

for better handling of stuff like chase_active, view bob.

Authors of the csqcplayers branch, please look at this, it may help using the
engine's viewbob etc. for csqc players!

13 years agodo the nearclip hack in the chasecam too
Rudolf Polzer [Fri, 27 May 2011 20:23:04 +0000 (22:23 +0200)]
do the nearclip hack in the chasecam too

13 years agoproperly restore the chasecam view also for R_SetView3fv() usage
Rudolf Polzer [Fri, 27 May 2011 20:22:43 +0000 (22:22 +0200)]
properly restore the chasecam view also for R_SetView3fv() usage

13 years agoalso fade out warpzones properly (based on VIEW origin, not on MOVE origin)
Rudolf Polzer [Fri, 27 May 2011 19:30:10 +0000 (21:30 +0200)]
also fade out warpzones properly (based on VIEW origin, not on MOVE origin)

13 years agomake event chase cam warpzone aware (PLEASE TEST)
Rudolf Polzer [Fri, 27 May 2011 19:05:32 +0000 (21:05 +0200)]
make event chase cam warpzone aware (PLEASE TEST)

13 years agoMerge remote-tracking branch 'origin/terencehill/mine_explosion_fix'
Rudolf Polzer [Fri, 27 May 2011 18:55:11 +0000 (20:55 +0200)]
Merge remote-tracking branch 'origin/terencehill/mine_explosion_fix'

13 years agoMerge remote-tracking branch 'origin/samual/fix_fragmessage_coloring'
Rudolf Polzer [Fri, 27 May 2011 18:50:12 +0000 (20:50 +0200)]
Merge remote-tracking branch 'origin/samual/fix_fragmessage_coloring'

13 years agoMerge remote-tracking branch 'origin/samual/no_dead_airshots'
Rudolf Polzer [Fri, 27 May 2011 18:49:46 +0000 (20:49 +0200)]
Merge remote-tracking branch 'origin/samual/no_dead_airshots'

13 years agoMerge remote-tracking branch 'origin/samual/fix_anim_divisionbyzero'
Rudolf Polzer [Fri, 27 May 2011 18:48:59 +0000 (20:48 +0200)]
Merge remote-tracking branch 'origin/samual/fix_anim_divisionbyzero'

13 years agoremove a stupid percent sign
Rudolf Polzer [Fri, 27 May 2011 18:43:54 +0000 (20:43 +0200)]
remove a stupid percent sign

13 years agomake intermission chase cam always on
Rudolf Polzer [Fri, 27 May 2011 18:42:26 +0000 (20:42 +0200)]
make intermission chase cam always on

don't need a cvar for that; that way, we allow Samual's code to break the non-intermissionchase version of the code :P

13 years agoMerge remote-tracking branch 'origin/samual/intermission_fixes'
Rudolf Polzer [Fri, 27 May 2011 18:33:02 +0000 (20:33 +0200)]
Merge remote-tracking branch 'origin/samual/intermission_fixes'

13 years agoMerge remote-tracking branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Fri, 27 May 2011 18:19:34 +0000 (20:19 +0200)]
Merge remote-tracking branch 'origin/fruitiex/panelhud'

13 years agoNo damage splash when !!chase_active
FruitieX [Thu, 26 May 2011 13:04:14 +0000 (16:04 +0300)]
No damage splash when !!chase_active

13 years agoStop the weapon model from changing pitch while in intermission (makes no sense,...
Samual [Wed, 25 May 2011 04:10:01 +0000 (00:10 -0400)]
Stop the weapon model from changing pitch while in intermission (makes no sense, the player should be frozen)

13 years agoFix intermission player model so that it doesn't tilt based on where the player is...
Samual [Wed, 25 May 2011 04:04:35 +0000 (00:04 -0400)]
Fix intermission player model so that it doesn't tilt based on where the player is aiming. (wtf comes to mind.. why was this broken in the first place?)

13 years agoFix a warning given by setanim since it had no animation information sent to it.
Samual [Wed, 25 May 2011 02:38:36 +0000 (22:38 -0400)]
Fix a warning given by setanim since it had no animation information sent to it.

13 years agoAdd checks for other.deadflag when announcing airshot -- this way airshots don't...
Samual [Tue, 24 May 2011 23:45:29 +0000 (19:45 -0400)]
Add checks for other.deadflag when announcing airshot -- this way airshots don't happen when the player is dead.

13 years agoTHE BIG BALANCE SWITCHOVER!!!1
Rudolf Polzer [Tue, 24 May 2011 20:03:10 +0000 (22:03 +0200)]
THE BIG BALANCE SWITCHOVER!!!1

13 years agoAlso replace cvar_scr_centertime with cvar_hud_panel_centerprint_time
terencehill [Tue, 24 May 2011 19:44:35 +0000 (21:44 +0200)]
Also replace cvar_scr_centertime with cvar_hud_panel_centerprint_time
However, the engine's cvar scr_centertime that refers to the builtin centerprint cannot be removed therefore it may lead to confusion. Maybe it can be avoided by renaming the panel to something else...

13 years agohud_panel_centerprint_flip to invert messages order
terencehill [Tue, 24 May 2011 18:19:00 +0000 (20:19 +0200)]
hud_panel_centerprint_flip to invert messages order

13 years agoGet rid of scr_centerpos in the skin file too, and put centerprint cvars at the end...
terencehill [Tue, 24 May 2011 14:17:21 +0000 (16:17 +0200)]
Get rid of scr_centerpos in the skin file too, and put centerprint cvars at the end as the hud_save command saves them there

13 years agoMerge branch 'master' into terencehill/centerprint_stuff
terencehill [Tue, 24 May 2011 14:12:36 +0000 (16:12 +0200)]
Merge branch 'master' into terencehill/centerprint_stuff

13 years agorename the sniper rifle to just a rifle.
Rudolf Polzer [Tue, 24 May 2011 12:29:16 +0000 (14:29 +0200)]
rename the sniper rifle to just a rifle.

If we ever want to rename it again, we then just need to change the visible name.

13 years agoJust a quick fix for the teamkill message coloring -- if the player has colors in...
Samual [Tue, 24 May 2011 05:22:06 +0000 (01:22 -0400)]
Just a quick fix for the teamkill message coloring -- if the player has colors in their nickname, it breaks the rest of the string since the color isn't re-set.

13 years agoEarly+++ changes to sniper rifle to be more of just a "rifle" instead of a sniper.
Samual [Tue, 24 May 2011 05:02:00 +0000 (01:02 -0400)]
Early+++ changes to sniper rifle to be more of just a "rifle" instead of a sniper.

13 years agoChange some things about Nex charge slightly -- Instead of using shot multiplier...
Samual [Tue, 24 May 2011 04:50:35 +0000 (00:50 -0400)]
Change some things about Nex charge slightly -- Instead of using shot multiplier, just go directly from 0 charge to 100% each time (same exact time to charge as before, 2 seconds, but done in a better way) - Also make it so that you have 50% charge when you first pick up the weapon, so you aren't totally screwed from it.

13 years agoSome improvements to the hagar (lower spread on primary, better settings for secondar...
Samual [Tue, 24 May 2011 04:40:23 +0000 (00:40 -0400)]
Some improvements to the hagar (lower spread on primary, better settings for secondary load damage/radius)

13 years agoGet rid of the EOLS at the beginning of the messages, they no longer need, stop/finis...
terencehill [Mon, 23 May 2011 22:23:40 +0000 (00:23 +0200)]
Get rid of the EOLS at the beginning of the messages, they no longer need, stop/finish some countdown better by sending one last message; stop displaying the MOTD too in the same way

13 years agoMerge remote-tracking branch 'origin/diabolik/newanims'
merlijn [Mon, 23 May 2011 19:29:18 +0000 (21:29 +0200)]
Merge remote-tracking branch 'origin/diabolik/newanims'

13 years agoMerge remote branch 'origin/master' into diabolik/newanims
Sahil Singhal [Mon, 23 May 2011 18:59:05 +0000 (14:59 -0400)]
Merge remote branch 'origin/master' into diabolik/newanims

13 years agohud_panel_centerprint_align to change text alignment
terencehill [Mon, 23 May 2011 17:54:01 +0000 (19:54 +0200)]
hud_panel_centerprint_align to change text alignment

13 years agoPut msgs with the same id in the same array position only when the msg is still showing
terencehill [Mon, 23 May 2011 16:56:58 +0000 (18:56 +0200)]
Put msgs with the same id in the same array position only when the msg is still showing

13 years agoRename a function
terencehill [Mon, 23 May 2011 16:49:42 +0000 (18:49 +0200)]
Rename a function

13 years agoNew panel for centerprint messages
terencehill [Mon, 23 May 2011 16:41:16 +0000 (18:41 +0200)]
New panel for centerprint messages

13 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Mon, 23 May 2011 15:44:42 +0000 (17:44 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agomove the contentdownload URL to xonotic.org
Rudolf Polzer [Mon, 23 May 2011 15:44:26 +0000 (17:44 +0200)]
move the contentdownload URL to xonotic.org

13 years agoGive the proper name to a constant
terencehill [Sun, 22 May 2011 21:10:30 +0000 (23:10 +0200)]
Give the proper name to a constant

13 years agoUse \r as id symbol so it cannot be confused with a player name (cannot contain \r)
terencehill [Sun, 22 May 2011 20:04:40 +0000 (22:04 +0200)]
Use \r as id symbol so it cannot be confused with a player name (cannot contain \r)

13 years agoMerge remote-tracking branch 'origin/master' into fruitiex/playerstats
FruitieX [Sun, 22 May 2011 18:42:44 +0000 (21:42 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/playerstats

13 years agoUnify series of countdown messages in one message. Also now the messages can be displ...
terencehill [Sun, 22 May 2011 16:57:27 +0000 (18:57 +0200)]
Unify series of countdown messages in one message. Also now the messages can be displayed lower on the screen when they have EOLS at the beginning

13 years agoWhile an entry is fading out move the successive ones up
terencehill [Sat, 21 May 2011 19:55:38 +0000 (21:55 +0200)]
While an entry is fading out move the successive ones up

13 years agoAdd spacer in between the messages
terencehill [Sat, 21 May 2011 17:54:45 +0000 (19:54 +0200)]
Add spacer in between the messages

13 years agoSome updates to the shotgun melee
Samual [Sat, 21 May 2011 16:18:59 +0000 (12:18 -0400)]
Some updates to the shotgun melee

13 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Sat, 21 May 2011 16:01:08 +0000 (12:01 -0400)]
Merge remote branch 'origin/master' into samual/balance

13 years agoAllow to display more than one centerprint at once
terencehill [Sat, 21 May 2011 15:37:14 +0000 (17:37 +0200)]
Allow to display more than one centerprint at once

13 years agoremove menu_slist_modfilter for now, as we currently don't need it
Rudolf Polzer [Sat, 21 May 2011 10:44:10 +0000 (12:44 +0200)]
remove menu_slist_modfilter for now, as we currently don't need it

13 years agoadd bots back to the playerstats
FruitieX [Fri, 20 May 2011 14:40:37 +0000 (17:40 +0300)]
add bots back to the playerstats

13 years agofinally fix accuracy stats, well hopefully. Testing shows that they do work :P
FruitieX [Fri, 20 May 2011 13:48:27 +0000 (16:48 +0300)]
finally fix accuracy stats, well hopefully. Testing shows that they do work :P

13 years agoMerge remote-tracking branch 'origin/master' into fruitiex/playerstats
FruitieX [Fri, 20 May 2011 13:32:53 +0000 (16:32 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/playerstats

13 years agoMerge remote branch 'origin/master' into diabolik/newanims
Sahil Singhal [Thu, 19 May 2011 19:43:28 +0000 (15:43 -0400)]
Merge remote branch 'origin/master' into diabolik/newanims

13 years agoActually set the melee anim.
Sahil Singhal [Thu, 19 May 2011 19:42:56 +0000 (15:42 -0400)]
Actually set the melee anim.

13 years agoMerge remote-tracking branch 'origin/master' into samual/balance
FruitieX [Thu, 19 May 2011 19:38:40 +0000 (22:38 +0300)]
Merge remote-tracking branch 'origin/master' into samual/balance

13 years agoMerge remote-tracking branch 'origin/samual/balance'
Rudolf Polzer [Thu, 19 May 2011 19:34:03 +0000 (21:34 +0200)]
Merge remote-tracking branch 'origin/samual/balance'

13 years agoDisable some more unused code
terencehill [Thu, 19 May 2011 15:37:17 +0000 (17:37 +0200)]
Disable some more unused code