]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoSimplify that last code, but it still needs to be done properly
Mircea Kitsune [Thu, 31 Mar 2011 17:13:22 +0000 (20:13 +0300)]
Simplify that last code, but it still needs to be done properly

13 years agoA slightly better way of sticking the camera above the ground. Still bad though,...
Mircea Kitsune [Thu, 31 Mar 2011 17:10:19 +0000 (20:10 +0300)]
A slightly better way of sticking the camera above the ground. Still bad though, need to figure the correct maths

13 years agoProperly fix the intermission chase camera, by also updating / rendering the view...
Mircea Kitsune [Thu, 31 Mar 2011 16:59:33 +0000 (19:59 +0300)]
Properly fix the intermission chase camera, by also updating / rendering the view during intermission as long as the intermission chase cam cvar is enabled

13 years agoTemporarily move the camera better when it touches a wall. Needs to be improved.
Mircea Kitsune [Thu, 31 Mar 2011 16:51:05 +0000 (19:51 +0300)]
Temporarily move the camera better when it touches a wall. Needs to be improved.

13 years agomakevectors goes before view_forward. Though it worked fine before too, so I'm not...
Mircea Kitsune [Thu, 31 Mar 2011 15:16:07 +0000 (18:16 +0300)]
makevectors goes before view_forward. Though it worked fine before too, so I'm not sure if makevectors is even needed. Just following the classic design for maximum safety :)

13 years agoRename a function
Mircea Kitsune [Thu, 31 Mar 2011 15:12:42 +0000 (18:12 +0300)]
Rename a function

13 years agoAdd a comment about the usage of chase_active
Mircea Kitsune [Thu, 31 Mar 2011 15:11:54 +0000 (18:11 +0300)]
Add a comment about the usage of chase_active

13 years agoMerge branch 'master' into mirceakitsune/event_chasecam
Mircea Kitsune [Thu, 31 Mar 2011 15:00:39 +0000 (18:00 +0300)]
Merge branch 'master' into mirceakitsune/event_chasecam

13 years agoDon't allow the camera to go through walls. Thanks tZork for the help :)
Mircea Kitsune [Thu, 31 Mar 2011 14:58:03 +0000 (17:58 +0300)]
Don't allow the camera to go through walls. Thanks tZork for the help :)

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'

13 years agoMerge remote branch 'origin/mand1nga/i18n-ES'
Rudolf Polzer [Thu, 31 Mar 2011 07:26:06 +0000 (09:26 +0200)]
Merge remote branch 'origin/mand1nga/i18n-ES'

13 years agoMerge remote branch 'origin/sev/hudlayout'
Rudolf Polzer [Thu, 31 Mar 2011 07:25:44 +0000 (09:25 +0200)]
Merge remote branch 'origin/sev/hudlayout'

13 years agoDisable intermission chase cam when reaching the map voting screen. It caused the...
Mircea Kitsune [Thu, 31 Mar 2011 01:06:24 +0000 (04:06 +0300)]
Disable intermission chase cam when reaching the map voting screen. It caused the mouse cursor to move the view as well, which looked kinda odd. Don't think this is bad looking either.

13 years agoThis fixes that issue with the intermission camera, so I can enable it by default...
Mircea Kitsune [Thu, 31 Mar 2011 00:38:35 +0000 (03:38 +0300)]
This fixes that issue with the intermission camera, so I can enable it by default as well now.

13 years agoSet all angles as the camera smooths back, not only X and Y (making height annoying...
Mircea Kitsune [Thu, 31 Mar 2011 00:37:54 +0000 (03:37 +0300)]
Set all angles as the camera smooths back, not only X and Y (making height annoying when moving the mouse)

13 years agoUse chase_active -1 in the code, which behaves just like 1. This can be used to mark...
Mircea Kitsune [Thu, 31 Mar 2011 00:34:41 +0000 (03:34 +0300)]
Use chase_active -1 in the code, which behaves just like 1. This can be used to mark chase_active as set by the code and thus avoid any risk of it getting stuck.

13 years agoChange how the camera position is set. No more setting the chase_back cvar, but use...
Mircea Kitsune [Thu, 31 Mar 2011 00:18:22 +0000 (03:18 +0300)]
Change how the camera position is set. No more setting the chase_back cvar, but use R_SetView to change the origin. Thanks for the help to tZork and Samual :)

13 years agoSmaller powerups panel
sev [Wed, 30 Mar 2011 20:50:04 +0000 (22:50 +0200)]
Smaller powerups panel

13 years agoMerge branch 'sev/hudlayout' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev...
sev [Wed, 30 Mar 2011 20:45:47 +0000 (22:45 +0200)]
Merge branch 'sev/hudlayout' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout

13 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
sev [Wed, 30 Mar 2011 20:31:39 +0000 (22:31 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout

13 years agoMerge remote-tracking branch 'origin/samual/fixes_for_latest_merge'
Rudolf Polzer [Wed, 30 Mar 2011 20:28:58 +0000 (22:28 +0200)]
Merge remote-tracking branch 'origin/samual/fixes_for_latest_merge'

13 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
sev [Wed, 30 Mar 2011 20:26:58 +0000 (22:26 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout

13 years agoReplace the old default hud, and add some updated/better defaults for the confg
Samual [Wed, 30 Mar 2011 17:01:55 +0000 (13:01 -0400)]
Replace the old default hud, and add some updated/better defaults for the confg

13 years agoMerge remote branch 'origin/master' into sev/hudlayout
Samual [Wed, 30 Mar 2011 07:54:12 +0000 (03:54 -0400)]
Merge remote branch 'origin/master' into sev/hudlayout

13 years agoMerge remote branch 'origin/master' into samual/fixes_for_latest_merge
Samual [Wed, 30 Mar 2011 07:34:19 +0000 (03:34 -0400)]
Merge remote branch 'origin/master' into samual/fixes_for_latest_merge

13 years agoFINALLY fix the "warpzonelib" error a proper way
Rudolf Polzer [Tue, 29 Mar 2011 16:32:04 +0000 (18:32 +0200)]
FINALLY fix the "warpzonelib" error a proper way

13 years agoMerge remote-tracking branch 'origin/samual/change_default_balance'
Rudolf Polzer [Mon, 28 Mar 2011 16:57:51 +0000 (18:57 +0200)]
Merge remote-tracking branch 'origin/samual/change_default_balance'

13 years agorebalance this to actually make some difference
Rudolf Polzer [Mon, 28 Mar 2011 15:45:37 +0000 (17:45 +0200)]
rebalance this to actually make some difference

13 years agofix slow push :P
Rudolf Polzer [Mon, 28 Mar 2011 15:45:06 +0000 (17:45 +0200)]
fix slow push :P

13 years agoFix some bugs in here
Rudolf Polzer [Mon, 28 Mar 2011 15:31:46 +0000 (17:31 +0200)]
Fix some bugs in here

13 years agonew toy: autocvar_g_damagepush_speedfactor - ENJOY
Rudolf Polzer [Mon, 28 Mar 2011 14:13:59 +0000 (16:13 +0200)]
new toy: autocvar_g_damagepush_speedfactor - ENJOY

13 years agomove the minstanex_ammo hack out of WR_THINK, as now multiple WR_s may use it, even...
Rudolf Polzer [Sun, 27 Mar 2011 05:32:42 +0000 (07:32 +0200)]
move the minstanex_ammo hack out of WR_THINK, as now multiple WR_s may use it, even before WR_THINK is called

13 years agoFix minstagib where isn't possible to shoot when you have 9 cells left
terencehill [Sat, 26 Mar 2011 19:48:29 +0000 (20:48 +0100)]
Fix minstagib where isn't possible to shoot when you have 9 cells left

13 years agoAllow chase_active to be used normally while not dead or during an intermission....
Mircea Kitsune [Sat, 26 Mar 2011 17:51:33 +0000 (19:51 +0200)]
Allow chase_active to be used normally while not dead or during an intermission. Still has the issue that chase_active will remain 1 if you disconnect while dead, when you start Xonotic next time. Perhaps this can be fixed by simply set-ing the cvars in defaultXonotic.cfg?

13 years agoDisable intermission chase by default. The camera stays very close to the player...
Mircea Kitsune [Sat, 26 Mar 2011 17:26:16 +0000 (19:26 +0200)]
Disable intermission chase by default. The camera stays very close to the player for some unknown reason, and doesn't go all the way to the required distance.

13 years agoBring back cl_deathfade, but make it very slow.
Mircea Kitsune [Sat, 26 Mar 2011 17:23:11 +0000 (19:23 +0200)]
Bring back cl_deathfade, but make it very slow.

13 years agoCvar descriptions
Mircea Kitsune [Sat, 26 Mar 2011 17:18:39 +0000 (19:18 +0200)]
Cvar descriptions

13 years agoSmooth the fading effect
Mircea Kitsune [Sat, 26 Mar 2011 17:17:05 +0000 (19:17 +0200)]
Smooth the fading effect

13 years agoFade the chase cam back when dying or entering intermission
Mircea Kitsune [Sat, 26 Mar 2011 16:59:54 +0000 (18:59 +0200)]
Fade the chase cam back when dying or entering intermission

13 years agoDisable cl_deathfade by default (filling the screen with a red tint) as long as death...
Mircea Kitsune [Sat, 26 Mar 2011 16:34:16 +0000 (18:34 +0200)]
Disable cl_deathfade by default (filling the screen with a red tint) as long as death chasecam is active by default too.

13 years agoCode cleanup
Mircea Kitsune [Sat, 26 Mar 2011 16:20:49 +0000 (18:20 +0200)]
Code cleanup

13 years agoCvar the two chase cam types
Mircea Kitsune [Sat, 26 Mar 2011 16:18:47 +0000 (18:18 +0200)]
Cvar the two chase cam types

13 years agoIntermission chase cam (player goes into 3rd person mode at after match end)
Mircea Kitsune [Sat, 26 Mar 2011 16:13:00 +0000 (18:13 +0200)]
Intermission chase cam (player goes into 3rd person mode at after match end)

13 years agoChase camera when dead. Pretty effect used in many shooters. Its usefulness will...
Mircea Kitsune [Sat, 26 Mar 2011 16:06:59 +0000 (18:06 +0200)]
Chase camera when dead. Pretty effect used in many shooters. Its usefulness will be increased when we'll have ragdoll physics :)

13 years agosome unused vars be gone
Rudolf Polzer [Fri, 25 Mar 2011 22:50:45 +0000 (23:50 +0100)]
some unused vars be gone

13 years agoMinor changes
mand1nga [Fri, 25 Mar 2011 03:34:45 +0000 (00:34 -0300)]
Minor changes

13 years agoLots of fixes and polishing!
mand1nga [Fri, 25 Mar 2011 03:17:35 +0000 (00:17 -0300)]
Lots of fixes and polishing!

13 years agoInitial version of Spanish translation
Rodrigo Mouton Laudin [Fri, 25 Mar 2011 03:15:59 +0000 (00:15 -0300)]
Initial version of Spanish translation

13 years agoMerge remote branch 'origin/master' into samual/change_default_balance
Samual [Thu, 24 Mar 2011 16:24:41 +0000 (12:24 -0400)]
Merge remote branch 'origin/master' into samual/change_default_balance

13 years agoNew panel border color for single player: light blue, matching menu window color
sev [Thu, 24 Mar 2011 11:26:18 +0000 (12:26 +0100)]
New panel border color for single player: light blue, matching menu window color

13 years agoBetter names
Mircea Kitsune [Wed, 23 Mar 2011 16:59:49 +0000 (18:59 +0200)]
Better names

13 years agoFix HUD blood splash being drawn at incorrect position / size. It was using the retic...
Mircea Kitsune [Wed, 23 Mar 2011 16:54:55 +0000 (18:54 +0200)]
Fix HUD blood splash being drawn at incorrect position / size. It was using the reticle positioning, which got filtered in a recent change.

13 years agoAdded HUD layout for the Luminos skin: hud_luminos_small. Between default and minimal.
sev [Wed, 23 Mar 2011 16:40:18 +0000 (17:40 +0100)]
Added HUD layout for the Luminos skin: hud_luminos_small. Between default and minimal.

13 years agouse crylink_impact again (which is a copy of crylink_impactbig currently, but keeping...
Rudolf Polzer [Wed, 23 Mar 2011 06:17:14 +0000 (07:17 +0100)]
use crylink_impact again (which is a copy of crylink_impactbig currently, but keeping them separate for morphed to play with)

13 years agoMerge branch 'master' into samual/change_default_balance
Rudolf Polzer [Wed, 23 Mar 2011 06:16:50 +0000 (07:16 +0100)]
Merge branch 'master' into samual/change_default_balance

13 years agovisual fix for crylink impact
Rudolf Polzer [Wed, 23 Mar 2011 06:16:16 +0000 (07:16 +0100)]
visual fix for crylink impact

13 years agoMerge remote branch 'origin/terencehill/misc_bugfixes'
Rudolf Polzer [Wed, 23 Mar 2011 06:12:06 +0000 (07:12 +0100)]
Merge remote branch 'origin/terencehill/misc_bugfixes'

13 years agoMerge branch 'samual/change_default_balance' of ssh://git.xonotic.org/xonotic-data...
Samual [Wed, 23 Mar 2011 01:36:13 +0000 (21:36 -0400)]
Merge branch 'samual/change_default_balance' of ssh://git.xonotic.org/xonotic-data.pk3dir into samual/change_default_balance

13 years agoSwap the file names back and add support for old seeker abilities -- now should be...
Samual [Tue, 22 Mar 2011 23:23:56 +0000 (19:23 -0400)]
Swap the file names back and add support for old seeker abilities -- now should be good to merge

13 years agoadd key binds for balance testing (F7 = balanceSamual, F8 = balanceXonotic), also...
Rudolf Polzer [Tue, 22 Mar 2011 21:20:38 +0000 (22:20 +0100)]
add key binds for balance testing (F7 = balanceSamual, F8 = balanceXonotic), also aliases balanceSamual, balanceFruitieX

13 years agoCheck for negative values returned by search_begin searching for waypoints frames
terencehill [Tue, 22 Mar 2011 18:30:55 +0000 (19:30 +0100)]
Check for negative values returned by search_begin searching for waypoints frames
Also add a function to load waypoints frames of a specific extension to avoid code duplication

Actually, previous code is changed with the addition of the check for dh and of the variable ext_len

13 years agoDisable protection for minelayer proximity until further notice
Samual [Tue, 22 Mar 2011 01:45:15 +0000 (21:45 -0400)]
Disable protection for minelayer proximity until further notice

13 years agoLots of tweaks to the balance which were stashed away on my server - This should...
Samual [Tue, 22 Mar 2011 00:15:00 +0000 (20:15 -0400)]
Lots of tweaks to the balance which were stashed away on my server - This should basically be done, as long as I didn't miss anything.

13 years agoMerge branch 'samual/crylink_updates' into samual/change_default_balance
Samual [Mon, 21 Mar 2011 23:24:49 +0000 (19:24 -0400)]
Merge branch 'samual/crylink_updates' into samual/change_default_balance

13 years agoMerge branch 'samual/seeker_updates' into samual/change_default_balance
Samual [Mon, 21 Mar 2011 23:22:28 +0000 (19:22 -0400)]
Merge branch 'samual/seeker_updates' into samual/change_default_balance

13 years agoSwap the configs and create one for FruitieX's old balance.
Samual [Mon, 21 Mar 2011 22:53:33 +0000 (18:53 -0400)]
Swap the configs and create one for FruitieX's old balance.

13 years agoChange the effect from crylink_impact to crylink_impactbig on the secondary of the...
Samual [Mon, 21 Mar 2011 22:42:09 +0000 (18:42 -0400)]
Change the effect from crylink_impact to crylink_impactbig on the secondary of the crylink. Old way looked pathetically weak.

13 years agoNew effect (slightly) for tag rockets
Samual [Mon, 21 Mar 2011 21:13:11 +0000 (17:13 -0400)]
New effect (slightly) for tag rockets

13 years agoMerge remote branch 'origin/master' into samual/seeker_updates
Samual [Mon, 21 Mar 2011 17:07:40 +0000 (13:07 -0400)]
Merge remote branch 'origin/master' into samual/seeker_updates

13 years agoLets just add some placeholder sprites.... they're broken for some reason (and need...
Samual [Mon, 21 Mar 2011 17:06:18 +0000 (13:06 -0400)]
Lets just add some placeholder sprites.... they're broken for some reason (and need tweaking ANYWAY)

13 years agoChange the effect slightly for the seeker, and swap primary with secondary
Samual [Mon, 21 Mar 2011 07:57:11 +0000 (03:57 -0400)]
Change the effect slightly for the seeker, and swap primary with secondary

13 years agoCvar the amount of health dead bodies must take in order to get gibbed. I thought...
Mircea Kitsune [Sun, 20 Mar 2011 22:53:44 +0000 (00:53 +0200)]
Cvar the amount of health dead bodies must take in order to get gibbed. I thought this might have some uses, if the cost of one cvar can be accepted for this purpose. Currently defaulted to 100, as that feels best balanced to me.

13 years agoRemove wrong unlimited ammo check in Hook attack code, it should be checked in W_Decr...
terencehill [Sun, 20 Mar 2011 22:36:09 +0000 (23:36 +0100)]
Remove wrong unlimited ammo check in Hook attack code, it should be checked in W_DecreaseAmmo

13 years agoFix issues when shooting if you have unlimited ammo and current ammo is 0:
terencehill [Sun, 20 Mar 2011 22:32:23 +0000 (23:32 +0100)]
Fix issues when shooting if you have unlimited ammo and current ammo is 0:
crylink and HLAC shoot once and then don't shoot anymore (or switch to a better weapon)
uzi doesn't shoot at all (or switches to a better weapon)

13 years agoFix impossibility to reload current weapon if you have unlimited ammo and current...
terencehill [Sun, 20 Mar 2011 18:58:33 +0000 (19:58 +0100)]
Fix impossibility to reload current weapon if you have unlimited ammo and current weapon ammo is 0

13 years agoMerge branch 'master' into terencehill/misc_bugfixes
terencehill [Sun, 20 Mar 2011 17:29:56 +0000 (18:29 +0100)]
Merge branch 'master' into terencehill/misc_bugfixes

13 years agoAdd a quick check to exec the reticle code only when the reticle gets drawn!
terencehill [Sun, 20 Mar 2011 00:01:10 +0000 (01:01 +0100)]
Add a quick check to exec the reticle code only when the reticle gets drawn!
The logic in this part of code is still a bit stupid and redundant, but I think no1 cares about so let leave it for the sake of the diff simplicity

13 years agoprecache gfx/reticle_* only in CSQC_Init as there's no gain doing it at every frame
terencehill [Sat, 19 Mar 2011 23:36:48 +0000 (00:36 +0100)]
precache gfx/reticle_* only in CSQC_Init as there's no gain doing it at every frame

13 years agoFix no weapon displayed in the HUD if cl_weaponpriority is set to "" before connectin...
terencehill [Sat, 19 Mar 2011 23:27:55 +0000 (00:27 +0100)]
Fix no weapon displayed in the HUD if cl_weaponpriority is set to "" before connecting to a new server

13 years agoturn off vid_netwmfullscreen
Rudolf Polzer [Sat, 19 Mar 2011 21:07:07 +0000 (22:07 +0100)]
turn off vid_netwmfullscreen

13 years agoMerge remote branch 'origin/master' into samual/seeker_updates
Samual [Sat, 19 Mar 2011 19:42:06 +0000 (15:42 -0400)]
Merge remote branch 'origin/master' into samual/seeker_updates

13 years agoMore cleanups and fixes, add waypointsprite stuff (slightly), and add the rest of...
Samual [Sat, 19 Mar 2011 19:40:48 +0000 (15:40 -0400)]
More cleanups and fixes, add waypointsprite stuff (slightly), and add the rest of the cvars

13 years agoaircontrol penalty of 200 WAS too high. 180 feels good now.
Rudolf Polzer [Sat, 19 Mar 2011 07:56:06 +0000 (08:56 +0100)]
aircontrol penalty of 200 WAS too high. 180 feels good now.

13 years agoMerge remote-tracking branch 'origin/divVerent/physics-speedfix'
Rudolf Polzer [Sat, 19 Mar 2011 07:49:46 +0000 (08:49 +0100)]
Merge remote-tracking branch 'origin/divVerent/physics-speedfix'

13 years agoMerge remote branch 'origin/terencehill/misc_bugfixes'
Rudolf Polzer [Sat, 19 Mar 2011 07:46:31 +0000 (08:46 +0100)]
Merge remote branch 'origin/terencehill/misc_bugfixes'

13 years agoWhoops this should be AFTER the return, or else you get multiple passes... weirdly.
Samual [Fri, 18 Mar 2011 22:07:03 +0000 (18:07 -0400)]
Whoops this should be AFTER the return, or else you get multiple passes... weirdly.

13 years agoMerge remote branch 'origin/master' into samual/seeker_updates
Samual [Fri, 18 Mar 2011 22:00:14 +0000 (18:00 -0400)]
Merge remote branch 'origin/master' into samual/seeker_updates

13 years agoLots and lots of updates for the seeker >;D
Samual [Fri, 18 Mar 2011 21:40:45 +0000 (17:40 -0400)]
Lots and lots of updates for the seeker >;D

13 years agoRestore menu_picmip_bypass cvar description deleted by akari I think unintentionally in
terencehill [Thu, 17 Mar 2011 21:08:25 +0000 (22:08 +0100)]
Restore menu_picmip_bypass cvar description deleted by akari I think unintentionally in
34c4a6687aaf83a50e266b63ef9ae1b299129f38
Things like this happen when the diff isn't checked line by line...

13 years agoNo need to check for g_freezetag too
terencehill [Wed, 16 Mar 2011 18:51:51 +0000 (19:51 +0100)]
No need to check for g_freezetag too

13 years agoAllow diff for tooltips.db (FINALLY!).
terencehill [Tue, 15 Mar 2011 20:18:24 +0000 (21:18 +0100)]
Allow diff for tooltips.db (FINALLY!).
NOTE: attribute "diff" must be explicitly set because it's unset for *.db

13 years agoUpdate health/damageforcescale values for rocketlauncher and mortar, add reload to...
Samual [Tue, 15 Mar 2011 18:54:49 +0000 (14:54 -0400)]
Update health/damageforcescale values for rocketlauncher and mortar, add reload to uzi, and also fix refires of crylink primary and electro secondary

13 years agoChange last instances of nixnex into nix
terencehill [Tue, 15 Mar 2011 18:34:07 +0000 (19:34 +0100)]
Change last instances of nixnex into nix

13 years agoSome small fixes and just go back to the way it was before to avoid an artifact since...
Samual [Tue, 15 Mar 2011 18:32:25 +0000 (14:32 -0400)]
Some small fixes and just go back to the way it was before to avoid an artifact since stats aren't all updated at the same time

13 years agomore aircontrol penalty may feel better (more control)
Rudolf Polzer [Tue, 15 Mar 2011 11:03:11 +0000 (12:03 +0100)]
more aircontrol penalty may feel better (more control)

13 years agominor physics adjustment as suggested by FruitieX (but with maxspeed increased to...
Rudolf Polzer [Tue, 15 Mar 2011 10:43:20 +0000 (11:43 +0100)]
minor physics adjustment as suggested by FruitieX (but with maxspeed increased to 700)

13 years agojust use inner ring instead for when main ring is already used (for weapon reload...
Samual [Tue, 15 Mar 2011 05:08:21 +0000 (01:08 -0400)]
just use inner ring instead for when main ring is already used (for weapon reload information with weapons that already have rings)

13 years agoSmall fix in view.qc
Samual [Mon, 14 Mar 2011 23:02:08 +0000 (19:02 -0400)]
Small fix in view.qc

13 years agoMerge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data...
Samual [Mon, 14 Mar 2011 22:24:03 +0000 (18:24 -0400)]
Merge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data.pk3dir into samual/fixes_for_latest_merge

13 years agoA safe tweak to my last change
Mircea Kitsune [Mon, 14 Mar 2011 22:22:14 +0000 (00:22 +0200)]
A safe tweak to my last change