]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoMerge branch 'master' into mirceakitsune/event_chasecam
Mircea Kitsune [Thu, 7 Apr 2011 21:40:46 +0000 (00:40 +0300)]
Merge branch 'master' into mirceakitsune/event_chasecam

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 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 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 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 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 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 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 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 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 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 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 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 agoRemove useless double cvar checks, and always set chase_active to 0 if it's -1. This...
Mircea Kitsune [Fri, 1 Apr 2011 01:19:21 +0000 (04:19 +0300)]
Remove useless double cvar checks, and always set chase_active to 0 if it's -1. This should make the code all ready now.

13 years agoCvar description fix
Mircea Kitsune [Fri, 1 Apr 2011 01:00:23 +0000 (04:00 +0300)]
Cvar description fix

13 years agoNo need to keep eventchase_target_origin a global any more.
Mircea Kitsune [Thu, 31 Mar 2011 23:25:41 +0000 (02:25 +0300)]
No need to keep eventchase_target_origin a global any more.

13 years agoRename functions the same way
Mircea Kitsune [Thu, 31 Mar 2011 23:23:29 +0000 (02:23 +0300)]
Rename functions the same way

13 years agoMore descriptive cvar names
Mircea Kitsune [Thu, 31 Mar 2011 23:22:13 +0000 (02:22 +0300)]
More descriptive cvar names

13 years agoMuch better defaults
Mircea Kitsune [Thu, 31 Mar 2011 23:15:09 +0000 (02:15 +0300)]
Much better defaults

13 years agoNo need to stop updating the view origin while in the map voting screen. As long...
Mircea Kitsune [Thu, 31 Mar 2011 22:49:13 +0000 (01:49 +0300)]
No need to stop updating the view origin while in the map voting screen. As long as the view *angles* are blocked there, the camera won't move while using the mouse in map voting.

13 years agoFix some comments
Mircea Kitsune [Thu, 31 Mar 2011 22:45:02 +0000 (01:45 +0300)]
Fix some comments

13 years agoMany code comments
Mircea Kitsune [Thu, 31 Mar 2011 22:38:22 +0000 (01:38 +0300)]
Many code comments

13 years agoDecrease trace_fraction by 0.1 to avoid the camera getting limited exactly at the...
Mircea Kitsune [Thu, 31 Mar 2011 22:20:31 +0000 (01:20 +0300)]
Decrease trace_fraction by 0.1 to avoid the camera getting limited exactly at the surface of the wall. That allowed the view to poke through at some angles.

13 years agoFix some comments
Mircea Kitsune [Thu, 31 Mar 2011 22:14:51 +0000 (01:14 +0300)]
Fix some comments

13 years agoDo that last code properly
Mircea Kitsune [Thu, 31 Mar 2011 22:10:33 +0000 (01:10 +0300)]
Do that last code properly

13 years agoFix the intermission chasecam during the map voting screen. No longer revert to 1st...
Mircea Kitsune [Thu, 31 Mar 2011 22:03:17 +0000 (01:03 +0300)]
Fix the intermission chasecam during the map voting screen. No longer revert to 1st person mode when entering map voting, but freeze any mouse input. Works well but the code needs to be better.

13 years agoProperly unstick the camera from going through walls. The code is a little tricky...
Mircea Kitsune [Thu, 31 Mar 2011 21:16:44 +0000 (00:16 +0300)]
Properly unstick the camera from going through walls. The code is a little tricky, but hopefully alright. Thanks Samual for the very useful tips :)

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 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 agoMerge branch 'morphed/hpitems' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
Morphed [Wed, 30 Mar 2011 21:38:48 +0000 (23:38 +0200)]
Merge branch 'morphed/hpitems' of ssh://git.xonotic.org/xonotic-data.pk3dir into morphed/hpitems

13 years agobigger size, removed leaning, more unified texture brightness
Morphed [Wed, 30 Mar 2011 21:22:43 +0000 (23:22 +0200)]
bigger size, removed leaning, more unified texture brightness

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