xonotic/xonotic-data.pk3dir.git
9 years agoMerge branch 'master' into mirceakitsune/hud_postprocessing
Mircea Kitsune [Mon, 14 Mar 2011 13:45:26 +0000 (15:45 +0200)]
Merge branch 'master' into mirceakitsune/hud_postprocessing

9 years agoMerge remote-tracking branch 'origin/samual/fixes_for_latest_merge'
Rudolf Polzer [Mon, 14 Mar 2011 07:11:31 +0000 (08:11 +0100)]
Merge remote-tracking branch 'origin/samual/fixes_for_latest_merge'

9 years agoFix some of the broken things in univeral_reload_system merge to master. -- this...
Samual [Mon, 14 Mar 2011 05:47:05 +0000 (01:47 -0400)]
Fix some of the broken things in univeral_reload_system merge to  -- this should've been done before merging! but, anyway it's mostly fine now. Has problems with weaponarena though... need to figure that out.

9 years agoMerge commit 'a5f8cbe456bed48c2c7b5d666e30cbaa344e6e33'
Jakob MG [Sun, 13 Mar 2011 22:03:52 +0000 (23:03 +0100)]
Merge commit 'a5f8cbe456bed48c2c7b5d666e30cbaa344e6e33'

9 years agoFix an issue with my last change
Mircea Kitsune [Sun, 13 Mar 2011 00:19:34 +0000 (02:19 +0200)]
Fix an issue with my last change

9 years agoFix some inconveniences with the MineLayer
Mircea Kitsune [Sun, 13 Mar 2011 00:13:22 +0000 (02:13 +0200)]
Fix some inconveniences with the MineLayer

9 years agoAlso give the reload ring a little more alpha by default
Mircea Kitsune [Sat, 12 Mar 2011 22:44:18 +0000 (00:44 +0200)]
Also give the reload ring a little more alpha by default

9 years agoCorrect size value by default
Mircea Kitsune [Sat, 12 Mar 2011 22:39:57 +0000 (00:39 +0200)]
Correct size value by default

9 years agoMerge branch 'master' into mirceakitsune/universal_reload_system
Mircea Kitsune [Sat, 12 Mar 2011 22:32:59 +0000 (00:32 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system

9 years agoSeparate rings for Nex charge / MineLayer mines and reload. You can now see everythin...
Mircea Kitsune [Sat, 12 Mar 2011 22:29:45 +0000 (00:29 +0200)]
Separate rings for Nex charge / MineLayer mines and reload. You can now see everything when using the nex with both charge and reloading enabled, or the minelayer with limited mines and reloading. The rings also won't overlap, and ammo rings can be individually sized and toggled.

9 years agomore French by Taximus
Rudolf Polzer [Sat, 12 Mar 2011 18:59:41 +0000 (19:59 +0100)]
more French by Taximus

9 years agoMerge branch 'master' into mirceakitsune/universal_reload_system
Mircea Kitsune [Thu, 10 Mar 2011 14:09:50 +0000 (16:09 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system

9 years agosimplify unlimited_weapon_ammo: just set all ammo counters to 999. Way simpler...
Rudolf Polzer [Wed, 9 Mar 2011 16:35:00 +0000 (17:35 +0100)]
simplify unlimited_weapon_ammo: just set all ammo counters to 999. Way simpler...

9 years agoFix some stupidities in the code I just merged: changing the log output is bad so...
Rudolf Polzer [Wed, 9 Mar 2011 11:53:20 +0000 (12:53 +0100)]
Fix some stupidities in the code I just merged: changing the log output is bad so long after it got done that way (people may be parsing it!), and the %d in the printfs were there for a reason (I know using %s there would be more efficient, but %d tells what that data actually IS)

9 years agoMerge remote branch 'origin/terencehill/misc_bugfixes'
Rudolf Polzer [Wed, 9 Mar 2011 11:48:02 +0000 (12:48 +0100)]
Merge remote branch 'origin/terencehill/misc_bugfixes'

9 years agoFix inverted commands for German/US keyboard layouts in input-tuba.cfg instructions
terencehill [Tue, 8 Mar 2011 22:28:54 +0000 (23:28 +0100)]
Fix inverted commands for German/US keyboard layouts in input-tuba.cfg instructions

9 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 8 Mar 2011 22:05:48 +0000 (23:05 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

9 years agofix a stupid weaponarena warning
Rudolf Polzer [Tue, 8 Mar 2011 22:05:12 +0000 (23:05 +0100)]
fix a stupid weaponarena warning

9 years agoAdd missing cl_swapattacks_minelayer to hook-firing_swap.cfg
terencehill [Tue, 8 Mar 2011 18:42:34 +0000 (19:42 +0100)]
Add missing cl_swapattacks_minelayer to hook-firing_swap.cfg
Also apply weapon impulse order to cl_swapattacks_* cvars list for future easier maintenance

9 years agoLess ambiguous description of g_use_ammunition
terencehill [Mon, 7 Mar 2011 23:16:47 +0000 (00:16 +0100)]
Less ambiguous description of g_use_ammunition

9 years agoDo not use spaces within string logged by sv_eventlog
terencehill [Mon, 7 Mar 2011 23:11:48 +0000 (00:11 +0100)]
Do not use spaces within string logged by sv_eventlog
Not sure it's a requirement, but I note that every other logged string got no space, so... if I'm wrong pls revert :)

9 years agoRevert "another LeeStricklin update", he shall fix it and resubmit
Rudolf Polzer [Mon, 7 Mar 2011 15:44:42 +0000 (16:44 +0100)]
Revert "another LeeStricklin update", he shall fix it and resubmit

This reverts commit 9170fadb9b63d855aa7b1c8df4e14bda51d0d374.

9 years agoanother LeeStricklin update
Rudolf Polzer [Mon, 7 Mar 2011 10:57:24 +0000 (11:57 +0100)]
another LeeStricklin update

9 years agoItalian
Rudolf Polzer [Mon, 7 Mar 2011 10:54:13 +0000 (11:54 +0100)]
Italian

9 years agoFinnish update
Rudolf Polzer [Mon, 7 Mar 2011 10:53:50 +0000 (11:53 +0100)]
Finnish update

9 years agofix Exitium's name in the credits
Rudolf Polzer [Mon, 7 Mar 2011 10:52:52 +0000 (11:52 +0100)]
fix Exitium's name in the credits

9 years agoFix visual bug when g_weapon_stay 3 and g_pickup_weapons_anyway 1: staying over a...
terencehill [Sun, 6 Mar 2011 22:26:38 +0000 (23:26 +0100)]
Fix visual bug when g_weapon_stay 3 and g_pickup_weapons_anyway 1: staying over a weapon spawn point the pickup effect gets shown repeatedly

9 years agog_ghost_items_color must not be used when g_ghost_items is disabled and the item...
terencehill [Sun, 6 Mar 2011 14:31:50 +0000 (15:31 +0100)]
g_ghost_items_color must not be used when g_ghost_items is disabled and the item isn't visible anyway
Also updated comments

9 years ago"Blood loss" here too, like in the menu
terencehill [Sun, 6 Mar 2011 13:39:05 +0000 (14:39 +0100)]
"Blood loss" here too, like in the menu

9 years agoFix missing parenthesis and put TRs in a more coherent way (no change in the menu)
terencehill [Sat, 5 Mar 2011 20:21:39 +0000 (21:21 +0100)]
Fix missing parenthesis and put TRs in a more coherent way (no change in the menu)

9 years agoTypo in my nick ;P
terencehill [Sat, 5 Mar 2011 20:13:39 +0000 (21:13 +0100)]
Typo in my nick ;P

9 years agoGerman update by ItsMe|CapBots
Rudolf Polzer [Fri, 4 Mar 2011 22:26:03 +0000 (23:26 +0100)]
German update by ItsMe|CapBots

9 years agoTypo in menu.dat.pt.po
terencehill [Fri, 4 Mar 2011 17:26:39 +0000 (18:26 +0100)]
Typo in menu.dat.pt.po

9 years agoFix the lifetimes for projectiles (THEY USED TO BE WAY TOO HIGH!) -- Also change...
Samual [Thu, 3 Mar 2011 04:25:53 +0000 (23:25 -0500)]
Fix the lifetimes for projectiles (THEY USED TO BE WAY TOO HIGH!) -- Also change the damage of the HLAC, even though i'm going to remove it later for now it will be "balanced."

9 years agoFix an issue that appeared as of recent. Odd this didn't happen before.
Mircea Kitsune [Wed, 2 Mar 2011 23:36:45 +0000 (01:36 +0200)]
Fix an issue that appeared as of recent. Odd this didn't happen before.

9 years agoUse some more direct values with the new system
Mircea Kitsune [Wed, 2 Mar 2011 22:29:47 +0000 (00:29 +0200)]
Use some more direct values with the new system

9 years agocrosshair_ring instead of crosshair_ring_sniperrifle. Since the ammo cvars can be...
Mircea Kitsune [Wed, 2 Mar 2011 22:21:16 +0000 (00:21 +0200)]
crosshair_ring instead of crosshair_ring_sniperrifle. Since the ammo cvars can be set to any value, and the ring for reloading must not have any spacings. I believe the crosshair_ring_sniperrifle image can be deleted, as its no longer used, but I won't do this in this branch

9 years agoMerge branch 'master' into mirceakitsune/universal_reload_system, with some VERY...
Mircea Kitsune [Wed, 2 Mar 2011 22:19:06 +0000 (00:19 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system, with some VERY conflicting changes. This is why I have waiting a long time for a branch to get merged in 

9 years agoMove code for a check in an already existing function, as recommended by tZork.
Mircea Kitsune [Wed, 2 Mar 2011 21:49:26 +0000 (23:49 +0200)]
Move code for a check in an already existing function, as recommended by tZork.

9 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Wed, 2 Mar 2011 17:04:56 +0000 (12:04 -0500)]
Merge remote branch 'origin/master' into samual/balance

9 years agoDocument defaults
Mircea Kitsune [Wed, 2 Mar 2011 15:52:37 +0000 (17:52 +0200)]
Document defaults

9 years agoDisable the blur and sharpen effects by default. They qualify as fancier rendering...
Mircea Kitsune [Wed, 2 Mar 2011 15:46:01 +0000 (17:46 +0200)]
Disable the blur and sharpen effects by default. They qualify as fancier rendering effects IMO, and as long as they're in the menu, they're best off I think.

9 years agoMerge remote branch 'origin/sev/menuskinupdate'
Rudolf Polzer [Wed, 2 Mar 2011 09:38:11 +0000 (10:38 +0100)]
Merge remote branch 'origin/sev/menuskinupdate'

9 years agoFix wrong HUD strings (vote count, flag capture message, kill spree message)
terencehill [Wed, 2 Mar 2011 08:35:27 +0000 (09:35 +0100)]
Fix wrong HUD strings (vote count, flag capture message, kill spree message)

9 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Wed, 2 Mar 2011 00:22:10 +0000 (19:22 -0500)]
Merge remote branch 'origin/master' into samual/balance

9 years agoLots and lots of updates to balanceSamual.cfg.
Samual [Wed, 2 Mar 2011 00:10:46 +0000 (19:10 -0500)]
Lots and lots of updates to balanceSamual.cfg.

9 years agoFix an outdated reload system comment, for the sake of correction
Mircea Kitsune [Tue, 1 Mar 2011 23:20:10 +0000 (01:20 +0200)]
Fix an outdated reload system comment, for the sake of correction

9 years agoPrecache the reload sound in one place only, until weapons have individual reload...
Mircea Kitsune [Tue, 1 Mar 2011 21:21:40 +0000 (23:21 +0200)]
Precache the reload sound in one place only, until weapons have individual reload sounds, as suggested by many devs.

9 years agoMerge remote-tracking branch 'origin/samual/crosshair_ring_updates'
Rudolf Polzer [Tue, 1 Mar 2011 18:09:46 +0000 (19:09 +0100)]
Merge remote-tracking branch 'origin/samual/crosshair_ring_updates'

9 years agoremove that test file again
Rudolf Polzer [Tue, 1 Mar 2011 18:08:57 +0000 (19:08 +0100)]
remove that test file again

9 years ago[TEST COMMIT] add a test file to make ciabot not hide this one
Rudolf Polzer [Tue, 1 Mar 2011 18:06:13 +0000 (19:06 +0100)]
[TEST COMMIT] add a test file to make ciabot not hide this one

9 years agoAn empty commit to test CIAbot
Rudolf Polzer [Tue, 1 Mar 2011 18:05:11 +0000 (19:05 +0100)]
An empty commit to test CIAbot

9 years agoMerge remote-tracking branch 'origin/fruitiex/uzidebugprint'
Rudolf Polzer [Tue, 1 Mar 2011 18:01:55 +0000 (19:01 +0100)]
Merge remote-tracking branch 'origin/fruitiex/uzidebugprint'

9 years agoMerge remote-tracking branch 'origin/mrbougo/tooltips_fix'
Rudolf Polzer [Tue, 1 Mar 2011 17:50:50 +0000 (18:50 +0100)]
Merge remote-tracking branch 'origin/mrbougo/tooltips_fix'

9 years agoMerge remote-tracking branch 'origin/terencehill/misc_bugfixes'
Rudolf Polzer [Tue, 1 Mar 2011 17:49:08 +0000 (18:49 +0100)]
Merge remote-tracking branch 'origin/terencehill/misc_bugfixes'

9 years agoFix uservec*_enable cvars getting set dynamically, causing hiccups. They will now...
Mircea Kitsune [Tue, 1 Mar 2011 17:39:46 +0000 (19:39 +0200)]
Fix uservec*_enable cvars getting set dynamically, causing hiccups. They will now be turned on or off if the features that use them are on or off. This addresses the merge request on the previous commit (when I had not noticed the issue yet).

9 years agoFix effects not coming back on if toggling them off and back on while they should...
Mircea Kitsune [Tue, 1 Mar 2011 15:32:06 +0000 (17:32 +0200)]
Fix effects not coming back on if toggling them off and back on while they should be active.

9 years agoCode a check in a more optimal way, reducing some code.
Mircea Kitsune [Tue, 1 Mar 2011 15:23:12 +0000 (17:23 +0200)]
Code a check in a more optimal way, reducing some code.

9 years agoFix something about the menu settings
Mircea Kitsune [Tue, 1 Mar 2011 15:01:09 +0000 (17:01 +0200)]
Fix something about the menu settings

9 years agoFix a last check, and remove the conflict between damage splashes and damage blur...
Mircea Kitsune [Tue, 1 Mar 2011 14:54:37 +0000 (16:54 +0200)]
Fix a last check, and remove the conflict between damage splashes and damage blur, making them independent of one another.

9 years agoCorrect menu settings
Mircea Kitsune [Tue, 1 Mar 2011 14:21:37 +0000 (16:21 +0200)]
Correct menu settings

9 years agoRadius 8 by default
Mircea Kitsune [Tue, 1 Mar 2011 14:06:00 +0000 (16:06 +0200)]
Radius 8 by default

9 years agoA spacing that makes sense in the cfg.
Mircea Kitsune [Tue, 1 Mar 2011 14:00:30 +0000 (16:00 +0200)]
A spacing that makes sense in the cfg.

9 years agoBetter name for the menu entry
Mircea Kitsune [Tue, 1 Mar 2011 13:46:30 +0000 (15:46 +0200)]
Better name for the menu entry

9 years agoSimplify code
Mircea Kitsune [Tue, 1 Mar 2011 13:37:21 +0000 (15:37 +0200)]
Simplify code

9 years agoLimit cvar spam for sharpening effect too
Mircea Kitsune [Tue, 1 Mar 2011 13:36:13 +0000 (15:36 +0200)]
Limit cvar spam for sharpening effect too

9 years agoFix possibility of blur getting stuck on when it's not the case to apply it (eg:...
Mircea Kitsune [Tue, 1 Mar 2011 13:29:48 +0000 (15:29 +0200)]
Fix possibility of blur getting stuck on when it's not the case to apply it (eg: your screen remained damage blurred, you restarted Xonotic, and when you connected again you'd be stuck with the last blur state)

9 years agoReduce the spam on cvar_set for the blur
Mircea Kitsune [Tue, 1 Mar 2011 13:17:50 +0000 (15:17 +0200)]
Reduce the spam on cvar_set for the blur

9 years agoMerge branch 'master' into mirceakitsune/hud_postprocessing
Mircea Kitsune [Tue, 1 Mar 2011 12:49:07 +0000 (14:49 +0200)]
Merge branch 'master' into mirceakitsune/hud_postprocessing

9 years agoMerge branch 'master' into mirceakitsune/universal_reload_system
Mircea Kitsune [Mon, 28 Feb 2011 13:27:21 +0000 (15:27 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system

9 years agoUse one less loop
Stephan Stahl [Sun, 27 Feb 2011 16:09:28 +0000 (17:09 +0100)]
Use one less loop

9 years agoremoving the old slider animations is enough
Stephan Stahl [Sat, 19 Feb 2011 18:31:00 +0000 (19:31 +0100)]
removing the old slider animations is enough

9 years agothis way animations should not possible leak ents
Stephan Stahl [Sat, 19 Feb 2011 18:30:26 +0000 (19:30 +0100)]
this way animations should not possible leak ents

9 years agoFix "Unregistered player" coloring
terencehill [Sun, 27 Feb 2011 01:11:11 +0000 (02:11 +0100)]
Fix "Unregistered player" coloring

9 years agoMake translatable a few HUD strings
terencehill [Sun, 27 Feb 2011 01:10:19 +0000 (02:10 +0100)]
Make translatable a few HUD strings

9 years agoRemove * (code forgotten from where I ported this :P)
Mircea Kitsune [Sat, 26 Feb 2011 02:14:12 +0000 (04:14 +0200)]
Remove * (code forgotten from where I ported this :P)

9 years agoAlso update the menu.
Mircea Kitsune [Sat, 26 Feb 2011 02:10:41 +0000 (04:10 +0200)]
Also update the menu.

9 years agoComment old r_damageblur cvar as removed (but leave it in defaultXonotic.cfg, so...
Mircea Kitsune [Sat, 26 Feb 2011 02:08:05 +0000 (04:08 +0200)]
Comment old r_damageblur cvar as removed (but leave it in defaultXonotic.cfg, so it's sure it sets it to 0).

9 years agoUpdate config presets
Mircea Kitsune [Sat, 26 Feb 2011 02:06:34 +0000 (04:06 +0200)]
Update config presets

9 years agoAdd the water blur code too
Mircea Kitsune [Sat, 26 Feb 2011 02:01:41 +0000 (04:01 +0200)]
Add the water blur code too

9 years agoRe-merge Samual's HUD post processing effects. Including a new one, using the sharpen...
Mircea Kitsune [Sat, 26 Feb 2011 01:39:55 +0000 (03:39 +0200)]
Re-merge Samual's HUD post processing effects. Including a new one, using the sharpen / cartoonify effect when having the strength / shield powerups.

9 years agoMerge remote branch 'origin/master' into samual/crosshair_ring_updates
Samual [Thu, 24 Feb 2011 02:23:21 +0000 (21:23 -0500)]
Merge remote branch 'origin/master' into samual/crosshair_ring_updates

9 years agowork around a fteqcc bug; fteqcc currently does not support "var functiontype array[N]"
Rudolf Polzer [Wed, 23 Feb 2011 19:57:40 +0000 (20:57 +0100)]
work around a fteqcc bug; fteqcc currently does not support "var functiontype array[N]"

9 years agofix more issues... still doesn't compile
Rudolf Polzer [Wed, 23 Feb 2011 19:55:13 +0000 (20:55 +0100)]
fix more issues... still doesn't compile

9 years agoundo an accidentally done chaneg in last commit
Rudolf Polzer [Wed, 23 Feb 2011 19:47:42 +0000 (20:47 +0100)]
undo an accidentally done chaneg in last commit

9 years agomutator system: refuse to add a mutator for the second time
Rudolf Polzer [Wed, 23 Feb 2011 19:45:36 +0000 (20:45 +0100)]
mutator system: refuse to add a mutator for the second time

9 years agoORIGINAL GERMAN TOOLTIPS by ItsMe|CapBots
Rudolf Polzer [Wed, 23 Feb 2011 19:31:11 +0000 (20:31 +0100)]
ORIGINAL GERMAN TOOLTIPS by ItsMe|CapBots

9 years agoMinor Luminos menu skin updates - background, checkbox, slider.
sev [Tue, 22 Feb 2011 23:04:52 +0000 (00:04 +0100)]
Minor Luminos menu skin updates - background, checkbox, slider.

9 years agoMake it so that crosshair rings work when spectating too
Samual [Tue, 22 Feb 2011 06:43:00 +0000 (01:43 -0500)]
Make it so that crosshair rings work when spectating too

9 years agoMerge remote branch 'origin/master' into samual/crosshair_ring_updates
Samual [Tue, 22 Feb 2011 06:03:51 +0000 (01:03 -0500)]
Merge remote branch 'origin/master' into samual/crosshair_ring_updates

9 years agoFix typo
Samual [Tue, 22 Feb 2011 06:02:45 +0000 (01:02 -0500)]
Fix typo

9 years agoFix use of SKINOFFSET_CURSOR
terencehill [Sun, 20 Feb 2011 20:44:57 +0000 (21:44 +0100)]
Fix use of SKINOFFSET_CURSOR

9 years agoPlay sound on mouse release only for enabled buttons/sliders
terencehill [Sun, 20 Feb 2011 17:26:43 +0000 (18:26 +0100)]
Play sound on mouse release only for enabled buttons/sliders

9 years agoMerge remote-tracking branch 'origin/terencehill/menu_sounds'
Rudolf Polzer [Sat, 19 Feb 2011 16:34:07 +0000 (17:34 +0100)]
Merge remote-tracking branch 'origin/terencehill/menu_sounds'

9 years agoMerge remote-tracking branch 'origin/terencehill/misc_bugfixes'
Rudolf Polzer [Sat, 19 Feb 2011 16:32:06 +0000 (17:32 +0100)]
Merge remote-tracking branch 'origin/terencehill/misc_bugfixes'

9 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 19 Feb 2011 16:31:06 +0000 (17:31 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

9 years agomove the execution of the font cfg AGAIN
Rudolf Polzer [Fri, 18 Feb 2011 21:25:21 +0000 (22:25 +0100)]
move the execution of the font cfg AGAIN

9 years agoalso support notq3a/notta fields, by considering any teamplay non-DM non-CTF game...
Rudolf Polzer [Fri, 18 Feb 2011 14:55:59 +0000 (15:55 +0100)]
also support notq3a/notta fields, by considering any teamplay non-DM non-CTF game type a "team arena" game type

9 years agosupport Q3A's gametype filtering (notteam, notq3a, notsingle, gametype) as in ioq3...
Rudolf Polzer [Fri, 18 Feb 2011 14:43:33 +0000 (15:43 +0100)]
support Q3A's gametype filtering (notteam, notq3a, notsingle, gametype) as in ioq3 source. Has a known bug it shares with ioq3 (namely, that "gametype" "teamtournament" also matches "tournament" (in Xonotic: arena) and "team" because of retarded substring matching). ONLY the game type names ffa (anything non-teamplay not having a more special name), tournament (Arena), single (maxplayers == 1), team (anything teamplay not having a more special name), ctf (ctf, duh) are supported, as we currently have nothing matching Q3A's oneflag, obelisk, harvester and teamtournament modes!

9 years agomenu sounds improvements:
terencehill [Thu, 17 Feb 2011 21:27:59 +0000 (22:27 +0100)]
menu sounds improvements:
- play menu2 sound on mouse release rather than on mouse press, it makes more sense (particularly for sliders)
- play menu1 sound in focusEnter rather in draw, with very simple (and less expensive) code; the behaviour is the same
- play menu1 sound in focusEnter for sliders too, it's more coherent this way