]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoMerge remote branch 'origin/master' into terencehill/essential_weapons_panel
Samual [Mon, 12 Sep 2011 06:37:32 +0000 (02:37 -0400)]
Merge remote branch 'origin/master' into terencehill/essential_weapons_panel

13 years agoMerge remote branch 'origin/terencehill/megaerebus_image_fix'
Samual [Mon, 12 Sep 2011 06:30:27 +0000 (02:30 -0400)]
Merge remote branch 'origin/terencehill/megaerebus_image_fix'

13 years agoMerge remote branch 'origin/terencehill/centerprint_fix'
Samual [Mon, 12 Sep 2011 05:48:48 +0000 (01:48 -0400)]
Merge remote branch 'origin/terencehill/centerprint_fix'

13 years agoselectteam: refuse changing to the team you're already on
Rudolf Polzer [Sun, 11 Sep 2011 20:08:04 +0000 (22:08 +0200)]
selectteam: refuse changing to the team you're already on

13 years agominor improvements for update notification (can now also show a custom URL)
Rudolf Polzer [Sun, 11 Sep 2011 19:56:14 +0000 (21:56 +0200)]
minor improvements for update notification (can now also show a custom URL)

13 years agoadd autoexec.cfg and autoexec/empty.cfg to hide some more startup errors
Rudolf Polzer [Sun, 11 Sep 2011 16:18:55 +0000 (18:18 +0200)]
add autoexec.cfg and autoexec/empty.cfg to hide some more startup errors

13 years agohide error for data/campaign.cfg
Rudolf Polzer [Sun, 11 Sep 2011 16:18:07 +0000 (18:18 +0200)]
hide error for data/campaign.cfg

13 years agoget rid of some old legacy
Rudolf Polzer [Sun, 11 Sep 2011 16:17:06 +0000 (18:17 +0200)]
get rid of some old legacy

13 years agoget rid of cl_nopogostick, replace it by cl_movement_track_canjump now that the engin...
Rudolf Polzer [Sun, 11 Sep 2011 13:59:58 +0000 (15:59 +0200)]
get rid of cl_nopogostick, replace it by cl_movement_track_canjump now that the engine can handle it somewhat ok; also add it to the menu

13 years agofactor out player jump checking into a CheckPlayerJump() function
Rudolf Polzer [Sun, 11 Sep 2011 13:40:31 +0000 (15:40 +0200)]
factor out player jump checking into a CheckPlayerJump() function

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sun, 11 Sep 2011 12:47:40 +0000 (14:47 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agosv_doublejump: clip velocity when landing (fixes sticking-to-floor bug)
Rudolf Polzer [Sun, 11 Sep 2011 12:47:17 +0000 (14:47 +0200)]
sv_doublejump: clip velocity when landing (fixes sticking-to-floor bug)

13 years agosplit Makefile into two for more convenient source packaging
Rudolf Polzer [Sat, 10 Sep 2011 18:31:29 +0000 (20:31 +0200)]
split Makefile into two for more convenient source packaging

13 years agocvar cl_nopogostick (allows a client to turn off sv_pogostick for itself)
Rudolf Polzer [Thu, 8 Sep 2011 19:21:11 +0000 (21:21 +0200)]
cvar cl_nopogostick (allows a client to turn off sv_pogostick for itself)

for people who like to cripple themselves

13 years agoon nagger: treat "autobuild" the same as "git"
Rudolf Polzer [Thu, 8 Sep 2011 08:25:37 +0000 (10:25 +0200)]
on nagger: treat "autobuild" the same as "git"
s Please enter the commit message for your changes. Lines starting

13 years agofix xonotic.com -> xonotic.org
Rudolf Polzer [Wed, 7 Sep 2011 19:05:23 +0000 (21:05 +0200)]
fix xonotic.com -> xonotic.org

13 years agomapvote: support numpad
Rudolf Polzer [Wed, 7 Sep 2011 19:05:15 +0000 (21:05 +0200)]
mapvote: support numpad

13 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 7 Sep 2011 19:01:09 +0000 (21:01 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agomenu: be more robust about menu_skin, reset to default on error
Rudolf Polzer [Wed, 7 Sep 2011 18:59:15 +0000 (20:59 +0200)]
menu: be more robust about menu_skin, reset to default on error

this helps csqc find the mouse cursor

13 years agomake some guns able to be "excessive" xonotic-v0.5.0
Rudolf Polzer [Mon, 5 Sep 2011 18:21:00 +0000 (20:21 +0200)]
make some guns able to be "excessive"

13 years agoadd a field for the current switching-to weapon. Finally fixes #648
Rudolf Polzer [Sun, 4 Sep 2011 17:10:41 +0000 (19:10 +0200)]
add a field for the current switching-to weapon. Finally fixes #648

13 years agoclean up handling of active and switch weapon
Rudolf Polzer [Sun, 4 Sep 2011 16:48:59 +0000 (18:48 +0200)]
clean up handling of active and switch weapon

13 years agoshow crosshair for the ACTIVE, not SWITCHING-TO weapon
Rudolf Polzer [Sun, 4 Sep 2011 16:41:37 +0000 (18:41 +0200)]
show crosshair for the ACTIVE, not SWITCHING-TO weapon

13 years agoMerge remote-tracking branch 'origin/terencehill/it_update'
Rudolf Polzer [Sun, 4 Sep 2011 06:01:02 +0000 (08:01 +0200)]
Merge remote-tracking branch 'origin/terencehill/it_update'

13 years agoReplace the image...
terencehill [Sat, 3 Sep 2011 23:52:10 +0000 (01:52 +0200)]
Replace the image...

13 years agoTranslate the 2 new strings
terencehill [Sat, 3 Sep 2011 23:42:48 +0000 (01:42 +0200)]
Translate the 2 new strings

13 years agoMerge branch 'master' into terencehill/it_update
terencehill [Sat, 3 Sep 2011 23:35:11 +0000 (01:35 +0200)]
Merge branch 'master' into terencehill/it_update

Conflicts:
csprogs.dat.it.po
menu.dat.it.po

13 years agoFix centerprint msg occasionally showing again for just 1 frame after it faded out
terencehill [Sat, 3 Sep 2011 16:02:56 +0000 (18:02 +0200)]
Fix centerprint msg occasionally showing again for just 1 frame after it faded out

13 years agoFinnish improved
Rudolf Polzer [Sat, 3 Sep 2011 14:43:28 +0000 (16:43 +0200)]
Finnish improved

13 years agoSmall adjustments to the italian translation
terencehill [Sat, 3 Sep 2011 14:25:18 +0000 (16:25 +0200)]
Small adjustments to the italian translation

13 years agofix blendfunc add use
Rudolf Polzer [Sat, 3 Sep 2011 11:23:23 +0000 (13:23 +0200)]
fix blendfunc add use

13 years agoDesaturate megaerebus menu image so that it looks like the other character images
terencehill [Sat, 3 Sep 2011 09:35:48 +0000 (11:35 +0200)]
Desaturate megaerebus menu image so that it looks like the other character images

13 years agofix campaign team forcing
Rudolf Polzer [Fri, 2 Sep 2011 18:00:32 +0000 (20:00 +0200)]
fix campaign team forcing

13 years agoremove freezetag and CA from instant action
Rudolf Polzer [Fri, 2 Sep 2011 10:10:12 +0000 (12:10 +0200)]
remove freezetag and CA from instant action

13 years agosend version info with weaponstats data
Rudolf Polzer [Fri, 2 Sep 2011 06:03:36 +0000 (08:03 +0200)]
send version info with weaponstats data

13 years agoupdate translation files again
Rudolf Polzer [Fri, 2 Sep 2011 05:52:06 +0000 (07:52 +0200)]
update translation files again

13 years agoSwedish translation is totally unfinished
Rudolf Polzer [Fri, 2 Sep 2011 05:50:20 +0000 (07:50 +0200)]
Swedish translation is totally unfinished

13 years agoMerge remote branch 'origin/samual/quick_menu_updates'
Rudolf Polzer [Fri, 2 Sep 2011 05:44:29 +0000 (07:44 +0200)]
Merge remote branch 'origin/samual/quick_menu_updates'

13 years agoDouble left/right margin (from 8 to 16) in all menu skins -- This positions the items...
Samual [Fri, 2 Sep 2011 01:13:25 +0000 (21:13 -0400)]
Double left/right margin (from 8 to 16) in all menu skins -- This positions the items much better on screen.. Was supposed to be added much earlier but was forgotten to be committed

13 years agoMake the wickedx menu theme say 0.5 instead of 0.9 (NOTE, TEMPORARY FIX.. LATER NEEDS...
Samual [Fri, 2 Sep 2011 01:08:55 +0000 (21:08 -0400)]
Make the wickedx menu theme say 0.5 instead of 0.9 (NOTE, TEMPORARY FIX.. LATER NEEDS TO BE AUTOGENERATED)

13 years agowe don't have enough cvars yet
Rudolf Polzer [Thu, 1 Sep 2011 11:35:34 +0000 (13:35 +0200)]
we don't have enough cvars yet

13 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Thu, 1 Sep 2011 11:22:40 +0000 (13:22 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

13 years agoremove legacy cvar("deathmatch" "2") support to enable weapon stay
Rudolf Polzer [Thu, 1 Sep 2011 11:21:56 +0000 (13:21 +0200)]
remove legacy cvar("deathmatch" "2") support to enable weapon stay

13 years agomachineshotgunswap: use regular settemp methods instead
Rudolf Polzer [Thu, 1 Sep 2011 11:19:52 +0000 (13:19 +0200)]
machineshotgunswap: use regular settemp methods instead

13 years agoallow gameversion cvar
Rudolf Polzer [Thu, 1 Sep 2011 11:15:14 +0000 (13:15 +0200)]
allow gameversion cvar

13 years agoMerge remote-tracking branch 'origin/samual/shownames_fixes'
mand1nga [Thu, 1 Sep 2011 03:05:39 +0000 (00:05 -0300)]
Merge remote-tracking branch 'origin/samual/shownames_fixes'

13 years agoMerge remote-tracking branch 'origin/samual/fix_welcome_message'
mand1nga [Thu, 1 Sep 2011 02:56:17 +0000 (23:56 -0300)]
Merge remote-tracking branch 'origin/samual/fix_welcome_message'

13 years agoMake the centerprint panel ACTUALLY centered properly :P
Samual [Thu, 1 Sep 2011 01:57:43 +0000 (21:57 -0400)]
Make the centerprint panel ACTUALLY centered properly :P

13 years agoMake it so that spectators and observers can see welcome message too (Also, force...
Samual [Thu, 1 Sep 2011 01:30:05 +0000 (21:30 -0400)]
Make it so that spectators and observers can see welcome message too (Also, force it on while in campaign and spectating)

13 years agoMerge remote branch 'origin/terencehill/weapon_stay_fix'
Rudolf Polzer [Wed, 31 Aug 2011 13:47:53 +0000 (15:47 +0200)]
Merge remote branch 'origin/terencehill/weapon_stay_fix'

13 years agouse the right casings model
Rudolf Polzer [Tue, 30 Aug 2011 19:16:28 +0000 (21:16 +0200)]
use the right casings model

13 years agofix newlines in the casing shader
Rudolf Polzer [Tue, 30 Aug 2011 19:15:00 +0000 (21:15 +0200)]
fix newlines in the casing shader

13 years agoMerge remote-tracking branch 'origin/morphed/casing'
Rudolf Polzer [Tue, 30 Aug 2011 19:12:18 +0000 (21:12 +0200)]
Merge remote-tracking branch 'origin/morphed/casing'

13 years agoupdate sc0rp credits
Rudolf Polzer [Tue, 30 Aug 2011 16:18:35 +0000 (18:18 +0200)]
update sc0rp credits

13 years agonew casing model for machine gun, it uses cubemap from exomorph set, I deleted old...
Morphed [Tue, 30 Aug 2011 15:09:56 +0000 (17:09 +0200)]
new casing model for machine gun, it uses cubemap from exomorph set, I deleted old model but I couldnt find old texture

13 years agoshow dead CA players in scoreboard
Rudolf Polzer [Tue, 30 Aug 2011 14:08:14 +0000 (16:08 +0200)]
show dead CA players in scoreboard

13 years agoMerge commit 'a7829e92ab32fb6859749938a2cd1294fda41d50'
Rudolf Polzer [Tue, 30 Aug 2011 14:04:46 +0000 (16:04 +0200)]
Merge commit 'a7829e92ab32fb6859749938a2cd1294fda41d50'

13 years agoundo unintentional changes; restrict CA spectators by default
Rudolf Polzer [Tue, 30 Aug 2011 14:03:54 +0000 (16:03 +0200)]
undo unintentional changes; restrict CA spectators by default

13 years agoMerge remote-tracking branch 'origin/atheros/strict-ca'
Rudolf Polzer [Tue, 30 Aug 2011 14:01:58 +0000 (16:01 +0200)]
Merge remote-tracking branch 'origin/atheros/strict-ca'

13 years agog_ca_spectate_enemies 0 will forbid dead ca players from spectating enemy players...
atheros [Tue, 30 Aug 2011 13:35:13 +0000 (15:35 +0200)]
g_ca_spectate_enemies 0 will forbid dead ca players from spectating enemy players in clan arena games

13 years agodo a bit less spam while waiting for the demo to load; this may cost at most 19ms...
Rudolf Polzer [Tue, 30 Aug 2011 09:29:44 +0000 (11:29 +0200)]
do a bit less spam while waiting for the demo to load; this may cost at most 19ms when seeking

13 years agoMerge remote branch 'origin/master' into samual/shownames_fixes
Samual [Tue, 30 Aug 2011 08:52:17 +0000 (04:52 -0400)]
Merge remote branch 'origin/master' into samual/shownames_fixes

13 years agoFix seeing the name tag for the person you're spectating
Samual [Tue, 30 Aug 2011 08:46:05 +0000 (04:46 -0400)]
Fix seeing the name tag for the person you're spectating

13 years agoImplement fade delay feature which waits X seconds before beginning to show name...
Samual [Tue, 30 Aug 2011 08:05:25 +0000 (04:05 -0400)]
Implement fade delay feature which waits X seconds before beginning to show name of player - helps to prevent showing names of players when they aren't in view for very long

13 years agorename default menu skin to wickedx
Rudolf Polzer [Tue, 30 Aug 2011 07:49:26 +0000 (09:49 +0200)]
rename default menu skin to wickedx

13 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 30 Aug 2011 07:48:14 +0000 (09:48 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agoshow a clear error when no menu skin works
Rudolf Polzer [Tue, 30 Aug 2011 07:47:52 +0000 (09:47 +0200)]
show a clear error when no menu skin works

13 years agoCheck teams when player is a .caplayer -- A dead caplayer does not need to know enemy...
Samual [Tue, 30 Aug 2011 06:47:21 +0000 (02:47 -0400)]
Check teams when player is a .caplayer -- A dead caplayer does not need to know enemy information

13 years agoDisable showing of your own name in hud_shownames by default (added cvar) -- it is...
Samual [Tue, 30 Aug 2011 06:05:31 +0000 (02:05 -0400)]
Disable showing of your own name in hud_shownames by default (added cvar) -- it is considered a bug by some to see this when you die, and is pointless.

13 years agoMinor update
mand1nga [Tue, 30 Aug 2011 03:12:37 +0000 (00:12 -0300)]
Minor update

13 years agoFix typo
mand1nga [Tue, 30 Aug 2011 02:56:34 +0000 (23:56 -0300)]
Fix typo

13 years agoForgot a debug print :(
terencehill [Mon, 29 Aug 2011 23:42:06 +0000 (01:42 +0200)]
Forgot a debug print :(

13 years agoMake g_pickup_weapons_anyway totally incompatible with g_weapon_stay. It only causes...
terencehill [Mon, 29 Aug 2011 20:13:07 +0000 (22:13 +0200)]
Make g_pickup_weapons_anyway totally incompatible with g_weapon_stay. It only causes to show the pickup effect repeatedly in g_weapon_stay 2 and 3.

13 years agoMinor fixes to Spanish translation
mand1nga [Mon, 29 Aug 2011 19:27:07 +0000 (16:27 -0300)]
Minor fixes to Spanish translation

13 years agoDon't invalidate the whole links cache if some waypoints can't be found
mand1nga [Mon, 29 Aug 2011 15:11:48 +0000 (12:11 -0300)]
Don't invalidate the whole links cache if some waypoints can't be found

13 years agoMerge remote branch 'origin/samual/balance'
Rudolf Polzer [Mon, 29 Aug 2011 12:42:05 +0000 (14:42 +0200)]
Merge remote branch 'origin/samual/balance'

13 years agoIncrease damage of rifle primary and secondary, plus double the spread on the seconda...
Samual [Mon, 29 Aug 2011 09:40:59 +0000 (05:40 -0400)]
Increase damage of rifle primary and secondary, plus double the spread on the secondary. This gun actually feels a lot better now I think :O

13 years agoMerge commit 'b2baadb34fab4fa42d1529f083eb72b4df105049'
Rudolf Polzer [Mon, 29 Aug 2011 09:07:28 +0000 (11:07 +0200)]
Merge commit 'b2baadb34fab4fa42d1529f083eb72b4df105049'

13 years agoMerge remote branch 'origin/samual/update_credits'
Rudolf Polzer [Mon, 29 Aug 2011 07:38:25 +0000 (09:38 +0200)]
Merge remote branch 'origin/samual/update_credits'

13 years agoMerge remote branch 'origin/samual/replace_rifle_secondary_sound'
Rudolf Polzer [Mon, 29 Aug 2011 07:30:09 +0000 (09:30 +0200)]
Merge remote branch 'origin/samual/replace_rifle_secondary_sound'

13 years agoMerge remote branch 'origin/master' into terencehill/essential_weapons_panel
Samual [Mon, 29 Aug 2011 07:16:36 +0000 (03:16 -0400)]
Merge remote branch 'origin/master' into terencehill/essential_weapons_panel

13 years agoReplace the campingrifle secondary sound with one which isn't silenced (the old one...
Samual [Mon, 29 Aug 2011 06:41:43 +0000 (02:41 -0400)]
Replace the campingrifle secondary sound with one which isn't silenced (the old one was for old secondary) -- I didn't notice this as I had locally replaced it in my data directory and never noticed it was wrong in master

13 years agoFix duplicate
Samual [Mon, 29 Aug 2011 06:27:54 +0000 (02:27 -0400)]
Fix duplicate

13 years agoMove myself to core team in credits
Samual [Mon, 29 Aug 2011 06:19:01 +0000 (02:19 -0400)]
Move myself to core team in credits

13 years agoMerge remote branch 'origin/master' into samual/fix_camera_in_intermission
Samual [Mon, 29 Aug 2011 05:52:13 +0000 (01:52 -0400)]
Merge remote branch 'origin/master' into samual/fix_camera_in_intermission

13 years agoMove lockview code to be after chase_camera, this way it freezes whenever map voting...
Samual [Mon, 29 Aug 2011 05:43:10 +0000 (01:43 -0400)]
Move lockview code to be after chase_camera, this way it freezes whenever map voting starts.

13 years agoMerge remote-tracking branch 'origin/samual/fix_hud_postprocess_effects'
Rudolf Polzer [Mon, 29 Aug 2011 04:51:09 +0000 (06:51 +0200)]
Merge remote-tracking branch 'origin/samual/fix_hud_postprocess_effects'

13 years agoMerge remote-tracking branch 'origin/samual/fix_centerprint_messages'
Rudolf Polzer [Mon, 29 Aug 2011 04:50:23 +0000 (06:50 +0200)]
Merge remote-tracking branch 'origin/samual/fix_centerprint_messages'

13 years agofix typo
Rudolf Polzer [Mon, 29 Aug 2011 04:48:54 +0000 (06:48 +0200)]
fix typo

13 years agobot upstepping: use both stepheightvec and jumpstepheightvec
Rudolf Polzer [Mon, 29 Aug 2011 04:42:13 +0000 (06:42 +0200)]
bot upstepping: use both stepheightvec and jumpstepheightvec

should fix warpzone issues on space-elevator

13 years agoBugfix for 0.5: Basically just allow drawing of larger centerprints ANYWAY instead...
Samual [Mon, 29 Aug 2011 04:23:51 +0000 (00:23 -0400)]
Bugfix for 0.5: Basically just allow drawing of larger centerprints ANYWAY instead of rejecting them totally, this way e.g. motd and such still shows up.

13 years agoMake slightly more readable
Samual [Mon, 29 Aug 2011 00:48:28 +0000 (20:48 -0400)]
Make slightly more readable

13 years agoCode cleanup and fix stupid problem of not using autocvar_'s
Samual [Mon, 29 Aug 2011 00:45:16 +0000 (20:45 -0400)]
Code cleanup and fix stupid problem of not using autocvar_'s

13 years agoUpdate hud_powerup code to disable effect when player dies, plus enhance the effect...
Samual [Mon, 29 Aug 2011 00:28:45 +0000 (20:28 -0400)]
Update hud_powerup code to disable effect when player dies, plus enhance the effect so it doesn't make the screen totally dark (You forgot to use the brighten feature, otherwise it drowns out all the color with black)

13 years agoMerge remote-tracking branch 'origin/mand1nga/bot-fixes-II'
Rudolf Polzer [Sun, 28 Aug 2011 18:32:48 +0000 (20:32 +0200)]
Merge remote-tracking branch 'origin/mand1nga/bot-fixes-II'

13 years agoMerge branch 'master' into mand1nga/bot-fixes-II
mand1nga [Sun, 28 Aug 2011 18:27:36 +0000 (15:27 -0300)]
Merge branch 'master' into mand1nga/bot-fixes-II

13 years agoMore conservative values for bunny-hopping
mand1nga [Sun, 28 Aug 2011 18:27:11 +0000 (15:27 -0300)]
More conservative values for bunny-hopping

13 years agoMerge branch 'master' into mand1nga/bot-fixes-II
mand1nga [Sun, 28 Aug 2011 18:19:35 +0000 (15:19 -0300)]
Merge branch 'master' into mand1nga/bot-fixes-II

13 years agoMerge remote branch 'origin/mirceakitsune/sniper_crosshair'
Rudolf Polzer [Sun, 28 Aug 2011 15:33:45 +0000 (17:33 +0200)]
Merge remote branch 'origin/mirceakitsune/sniper_crosshair'

13 years agonew translations by Taoki
Rudolf Polzer [Sun, 28 Aug 2011 15:11:26 +0000 (17:11 +0200)]
new translations by Taoki