xonotic/xonotic-data.pk3dir.git
11 years agoMerge remote branch 'refs/remotes/origin/mrbougo/sgmelee-body'
Rudolf Polzer [Tue, 31 Aug 2010 20:12:06 +0000 (22:12 +0200)]
Merge remote branch 'refs/remotes/origin/mrbougo/sgmelee-body'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/gibeffectfix'
Rudolf Polzer [Tue, 31 Aug 2010 20:04:36 +0000 (22:04 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/gibeffectfix'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitphys'
Rudolf Polzer [Tue, 31 Aug 2010 18:40:21 +0000 (20:40 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitphys'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
Rudolf Polzer [Tue, 31 Aug 2010 18:30:25 +0000 (20:30 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'

11 years agoundo electro change, it causes the weapon to jitter when you shoot
FruitieX [Tue, 31 Aug 2010 17:13:00 +0000 (20:13 +0300)]
undo electro change, it causes the weapon to jitter when you shoot

11 years agohandle the electro lightning refire as -1 to hopefully prevent the occasional "switch...
FruitieX [Tue, 31 Aug 2010 16:58:34 +0000 (19:58 +0300)]
handle the electro lightning refire as -1 to hopefully prevent the occasional "switch to electro, hold button, fire nothing" bug, also allow shotgun secondary to be used after shotgun primary + animtime instead of shotgun primary + refire

11 years agoset the soft speed limit at 800 units per sec instead of 1000, make -xpmbased default
FruitieX [Tue, 31 Aug 2010 16:14:26 +0000 (19:14 +0300)]
set the soft speed limit at 800 units per sec instead of 1000, make -xpmbased default

11 years agotweak gib effects
FruitieX [Tue, 31 Aug 2010 15:48:10 +0000 (18:48 +0300)]
tweak gib effects

11 years agofix audio channel assignment
Rudolf Polzer [Tue, 31 Aug 2010 15:47:43 +0000 (17:47 +0200)]
fix audio channel assignment

11 years agomake the shotgun melee attack damage bodies/clones as well
MrBougo [Tue, 31 Aug 2010 13:01:23 +0000 (15:01 +0200)]
make the shotgun melee attack damage bodies/clones as well

11 years agoMerge remote branch 'refs/remotes/origin/terencehill/menu-more_keys'
Rudolf Polzer [Tue, 31 Aug 2010 07:33:55 +0000 (09:33 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/menu-more_keys'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'
Rudolf Polzer [Tue, 31 Aug 2010 07:29:40 +0000 (09:29 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitphys'
Rudolf Polzer [Tue, 31 Aug 2010 07:24:47 +0000 (09:24 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitphys'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
Rudolf Polzer [Tue, 31 Aug 2010 06:41:18 +0000 (08:41 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'

11 years agoa bit more airstrafeaccel to match XPM closer
FruitieX [Tue, 31 Aug 2010 06:21:27 +0000 (09:21 +0300)]
a bit more airstrafeaccel to match XPM closer

11 years agoAdd mouse wheel up/down keys to modify slider value
terencehill [Mon, 30 Aug 2010 21:10:11 +0000 (23:10 +0200)]
Add mouse wheel up/down keys to modify slider value

11 years agomergepower: 3 -> 4 (hope this is fine with SavageX's current right)
Rudolf Polzer [Mon, 30 Aug 2010 08:11:06 +0000 (10:11 +0200)]
mergepower: 3 -> 4 (hope this is fine with SavageX's current right)

11 years agomore extreme damage/force falloff settings on the nex to restrict it more to close...
FruitieX [Sun, 29 Aug 2010 22:04:50 +0000 (01:04 +0300)]
more extreme damage/force falloff settings on the nex to restrict it more to close-mid range

11 years agorifle magazinecapacity back to 8
FruitieX [Sun, 29 Aug 2010 21:47:37 +0000 (00:47 +0300)]
rifle magazinecapacity back to 8

11 years agoheadshot total dmg back at 100 as per kojn's request :P
FruitieX [Sun, 29 Aug 2010 20:44:09 +0000 (23:44 +0300)]
headshot total dmg back at 100 as per kojn's request :P

11 years agooops, forgot teh airspeedlimit. Also increase accel a bit further.
FruitieX [Sun, 29 Aug 2010 20:23:25 +0000 (23:23 +0300)]
oops, forgot teh airspeedlimit. Also increase accel a bit further.

11 years agouzi primary dps increased, camprifle primary nerfed a bit
FruitieX [Sun, 29 Aug 2010 20:19:55 +0000 (23:19 +0300)]
uzi primary dps increased, camprifle primary nerfed a bit

11 years agophysicsNoQWBunny-nexbased => xpmbased, 1200 speed limit, faster airaccel
FruitieX [Sun, 29 Aug 2010 19:31:35 +0000 (22:31 +0300)]
physicsNoQWBunny-nexbased => xpmbased, 1200 speed limit, faster airaccel

11 years agoincrease the shotgun melee range a bit
FruitieX [Sun, 29 Aug 2010 19:28:19 +0000 (22:28 +0300)]
increase the shotgun melee range a bit

11 years agofix vote panel alpha in hud_configure mode
FruitieX [Sun, 29 Aug 2010 10:33:08 +0000 (13:33 +0300)]
fix vote panel alpha in hud_configure mode

11 years agocampingrifle refire to 0.7, electro primary ammo usage halved, shotgun melee damage...
FruitieX [Sat, 28 Aug 2010 22:01:42 +0000 (01:01 +0300)]
campingrifle refire to 0.7, electro primary ammo usage halved, shotgun melee damage calculation changed a bit

11 years agosv_gameplayfix_stepmultipletimes 1
Rudolf Polzer [Fri, 27 Aug 2010 19:10:29 +0000 (21:10 +0200)]
sv_gameplayfix_stepmultipletimes 1

11 years agotelefrag: force telefragging when using portals even if telefrags are off (but teampl...
Rudolf Polzer [Fri, 27 Aug 2010 19:01:46 +0000 (21:01 +0200)]
telefrag: force telefragging when using portals even if telefrags are off (but teamplay restriction still applies)

11 years agosimplify telefrag logic so e.g. gibs cannot telefrag players; option g_telefrag_teamp...
Rudolf Polzer [Fri, 27 Aug 2010 18:55:14 +0000 (20:55 +0200)]
simplify telefrag logic so e.g. gibs cannot telefrag players; option g_telefrag_teamplay (if set, team mates cannot be telefragged)

11 years agodocument g_telefrags, g_telefrags_avoid; default g_telefrags_avoid to 1
Rudolf Polzer [Fri, 27 Aug 2010 18:10:29 +0000 (20:10 +0200)]
document g_telefrags, g_telefrags_avoid; default g_telefrags_avoid to 1

11 years agogive grenades a size too (6x6x6) like rockets;
Rudolf Polzer [Thu, 26 Aug 2010 05:33:35 +0000 (07:33 +0200)]
give grenades a size too (6x6x6) like rockets;
fix visual issue with grenade explosion appearing on the wrong side of a wall

11 years agoone step towards making the rifle the "standard sniper gun" instead of the Nex: on...
Rudolf Polzer [Tue, 24 Aug 2010 07:35:06 +0000 (09:35 +0200)]
one step towards making the rifle the "standard sniper gun" instead of the Nex: on Q3 maps, turn Railgun into Rifle instead of into Nex (at least for now)

11 years agono need to hard limit health and armor, as they are soft limited on item pickup anywa...
Rudolf Polzer [Tue, 24 Aug 2010 07:19:02 +0000 (09:19 +0200)]
no need to hard limit health and armor, as they are soft limited on item pickup anyway... let's make impulse 99 stronger ;)

11 years agoMerge remote branch 'refs/remotes/origin/mrbougo/dragcheat_fix'
Rudolf Polzer [Tue, 24 Aug 2010 03:33:55 +0000 (05:33 +0200)]
Merge remote branch 'refs/remotes/origin/mrbougo/dragcheat_fix'

11 years agofix the dragging cheat for visible nonsolid entities
MrBougo [Mon, 23 Aug 2010 15:06:15 +0000 (17:06 +0200)]
fix the dragging cheat for visible nonsolid entities

11 years agorealowner to the right place
Rudolf Polzer [Fri, 20 Aug 2010 21:00:15 +0000 (23:00 +0200)]
realowner to the right place

11 years agoalso set realowner if an entity asplodes because of someone's damage
Rudolf Polzer [Fri, 20 Aug 2010 18:36:43 +0000 (20:36 +0200)]
also set realowner if an entity asplodes because of someone's damage

11 years agofunc_breakable: unset owner after successfully exploding
Rudolf Polzer [Fri, 20 Aug 2010 18:33:11 +0000 (20:33 +0200)]
func_breakable: unset owner after successfully exploding

11 years agofix origin of func_breakable too
Rudolf Polzer [Fri, 20 Aug 2010 17:30:56 +0000 (19:30 +0200)]
fix origin of func_breakable too

11 years agoMerge remote branch 'refs/remotes/origin/mrbougo/breakable_fix'
Rudolf Polzer [Fri, 20 Aug 2010 17:27:12 +0000 (19:27 +0200)]
Merge remote branch 'refs/remotes/origin/mrbougo/breakable_fix'

11 years agofix origin bug in func_breakable
MrBougo [Fri, 20 Aug 2010 14:58:47 +0000 (16:58 +0200)]
fix origin bug in func_breakable

11 years agoswitch back viewport properly. Now it WORKS! Zoomwindow MOSTLY works (no selectable...
Rudolf Polzer [Thu, 19 Aug 2010 19:50:34 +0000 (21:50 +0200)]
switch back viewport properly. Now it WORKS! Zoomwindow MOSTLY works (no selectable fov), letterbox works perfectly, sidebyside stereo works perfectly

11 years agofix 2D coordinate system of console (stupid workaround)
Rudolf Polzer [Thu, 19 Aug 2010 05:55:25 +0000 (07:55 +0200)]
fix 2D coordinate system of console (stupid workaround)

11 years agocsqc-only workaround (mostly by terencehill) to work around for engine csqc bugs...
Rudolf Polzer [Thu, 19 Aug 2010 05:38:23 +0000 (07:38 +0200)]
csqc-only workaround (mostly by terencehill) to work around for engine csqc bugs with view size; waypointsprites still draw wrong though

11 years agoFix some of the fixes
Rudolf Polzer [Thu, 19 Aug 2010 04:42:50 +0000 (06:42 +0200)]
Fix some of the fixes

11 years agoMerge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
Rudolf Polzer [Thu, 19 Aug 2010 04:21:10 +0000 (06:21 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

11 years agoMerge remote branch 'remotes/origin/terencehill/misc_bugfixes' into terencehill/misc_...
terencehill [Wed, 18 Aug 2010 22:46:37 +0000 (00:46 +0200)]
Merge remote branch 'remotes/origin/terencehill/misc_bugfixes' into terencehill/misc_bugfixes

11 years agoremove some stupid setsize calls from func_breakable, Someple please test this.
Rudolf Polzer [Wed, 18 Aug 2010 18:52:26 +0000 (20:52 +0200)]
remove some stupid setsize calls from func_breakable, Someple please test this.

11 years agofix electro beam drawing through warpzone
Rudolf Polzer [Wed, 18 Aug 2010 18:44:31 +0000 (20:44 +0200)]
fix electro beam drawing through warpzone

11 years agooptimize more warpzone functions if no WZs exist
Rudolf Polzer [Wed, 18 Aug 2010 18:44:54 +0000 (20:44 +0200)]
optimize more warpzone functions if no WZs exist

11 years agofix compile errors
Rudolf Polzer [Wed, 18 Aug 2010 18:44:48 +0000 (20:44 +0200)]
fix compile errors

11 years agofix some hardcoded ticrates
Rudolf Polzer [Wed, 18 Aug 2010 12:49:20 +0000 (14:49 +0200)]
fix some hardcoded ticrates

11 years agooh no! more crlf-mings
Rudolf Polzer [Tue, 17 Aug 2010 16:52:09 +0000 (18:52 +0200)]
oh no! more crlf-mings

11 years agoRemove unnecessary checks...
terencehill [Sun, 15 Aug 2010 22:04:51 +0000 (00:04 +0200)]
Remove unnecessary checks...
Now that match_pattern on the engine works well on *.* patterns too, for now on we can trust search_begin.

11 years agoMinor cleanups:
terencehill [Sun, 15 Aug 2010 21:35:34 +0000 (23:35 +0200)]
Minor cleanups:
- add ... to the Waypoints Setup button label
- remove unneeded TDempty and TR
- place the frequency textlabel in a more "standard" way

11 years agoReflect cvar name change in the menu too: host_sleep --> cl_maxfps_alwayssleep
terencehill [Sun, 15 Aug 2010 21:01:36 +0000 (23:01 +0200)]
Reflect cvar name change in the menu too: host_sleep --> cl_maxfps_alwayssleep

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'
Rudolf Polzer [Sun, 15 Aug 2010 18:51:28 +0000 (20:51 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'

11 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Sun, 15 Aug 2010 18:42:53 +0000 (21:42 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

11 years agouse the cvar values instead of "1" :P
FruitieX [Sun, 15 Aug 2010 18:42:33 +0000 (21:42 +0300)]
use the cvar values instead of "1" :P

11 years agoalways draw the vote panel
FruitieX [Sun, 15 Aug 2010 18:31:08 +0000 (21:31 +0300)]
always draw the vote panel

11 years agodraw voteprogress pics with RGB '1 1 1'
FruitieX [Sun, 15 Aug 2010 18:27:35 +0000 (21:27 +0300)]
draw voteprogress pics with RGB '1 1 1'

11 years agoremove lots of useless Nexuiz junk from the makefile
Rudolf Polzer [Sun, 15 Aug 2010 12:55:45 +0000 (14:55 +0200)]
remove lots of useless Nexuiz junk from the makefile

11 years agoalso properly calc WarpZone_TraceToss_velocity
Rudolf Polzer [Sun, 15 Aug 2010 12:51:52 +0000 (14:51 +0200)]
also properly calc WarpZone_TraceToss_velocity

11 years agofix calculation of WarpZone_TraceToss_time if no warpzones exist
Rudolf Polzer [Sun, 15 Aug 2010 12:48:21 +0000 (14:48 +0200)]
fix calculation of WarpZone_TraceToss_time if no warpzones exist

11 years agotry negative push on CL secondary instead :P
Rudolf Polzer [Sun, 15 Aug 2010 12:40:39 +0000 (14:40 +0200)]
try negative push on CL secondary instead :P

11 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Sun, 15 Aug 2010 12:35:08 +0000 (14:35 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance'

11 years agowoops let the scoreboard fade out the team radar as well
FruitieX [Sun, 15 Aug 2010 11:59:08 +0000 (14:59 +0300)]
woops let the scoreboard fade out the team radar as well

11 years agoadd num_leading back to the old skin, and fix the maximized chat panel bg
FruitieX [Sun, 15 Aug 2010 11:53:34 +0000 (14:53 +0300)]
add num_leading back to the old skin, and fix the maximized chat panel bg

11 years agoold hud skin updates
FruitieX [Sun, 15 Aug 2010 11:38:48 +0000 (14:38 +0300)]
old hud skin updates

11 years agofix another dock related quirk, update the new luminos icons in default
FruitieX [Sun, 15 Aug 2010 11:25:43 +0000 (14:25 +0300)]
fix another dock related quirk, update the new luminos icons in default

11 years agoclear up the dock naming
FruitieX [Sun, 15 Aug 2010 11:18:55 +0000 (14:18 +0300)]
clear up the dock naming

11 years agobugfix
FruitieX [Sun, 15 Aug 2010 11:15:51 +0000 (14:15 +0300)]
bugfix

11 years agosome cleaning up
FruitieX [Sun, 15 Aug 2010 10:59:09 +0000 (13:59 +0300)]
some cleaning up

11 years agoadd fade stuff to the menu, make default fade at 3 sec
FruitieX [Sun, 15 Aug 2010 10:20:57 +0000 (13:20 +0300)]
add fade stuff to the menu, make default fade at 3 sec

11 years agoMerge remote branch 'origin/master' into fruitiex/newpanelhud
FruitieX [Sun, 15 Aug 2010 08:45:01 +0000 (11:45 +0300)]
Merge remote branch 'origin/master' into fruitiex/newpanelhud

11 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Sun, 15 Aug 2010 06:47:26 +0000 (09:47 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

11 years agomore stepheight again
Rudolf Polzer [Sat, 14 Aug 2010 20:43:54 +0000 (22:43 +0200)]
more stepheight again

11 years agoalso reset average tracking if warpzoning
Rudolf Polzer [Sat, 14 Aug 2010 20:33:26 +0000 (22:33 +0200)]
also reset average tracking if warpzoning

11 years agowhen teleporting, clear the "speed averaging" for multijump
Rudolf Polzer [Sat, 14 Aug 2010 20:30:35 +0000 (22:30 +0200)]
when teleporting, clear the "speed averaging" for multijump

11 years agofix v_angle handling
Rudolf Polzer [Sat, 14 Aug 2010 20:22:43 +0000 (22:22 +0200)]
fix v_angle handling

11 years agofix inverse logic bug :P
Rudolf Polzer [Sat, 14 Aug 2010 20:17:08 +0000 (22:17 +0200)]
fix inverse logic bug :P

11 years agomultijump: merge FruitieX's newest improvements
Rudolf Polzer [Sat, 14 Aug 2010 20:11:42 +0000 (22:11 +0200)]
multijump: merge FruitieX's newest improvements

11 years agofix the prevtopspeed handling of multijump
Rudolf Polzer [Sat, 14 Aug 2010 19:53:24 +0000 (21:53 +0200)]
fix the prevtopspeed handling of multijump

11 years agoadd a new antilag_takebackavgvelocity function to return the average velocity over...
Rudolf Polzer [Sat, 14 Aug 2010 19:53:03 +0000 (21:53 +0200)]
add a new antilag_takebackavgvelocity function to return the average velocity over some time interval

11 years agoadd a new function vec2(v) returning only the xy components
Rudolf Polzer [Sat, 14 Aug 2010 19:52:43 +0000 (21:52 +0200)]
add a new function vec2(v) returning only the xy components

11 years agomultijump: fix velocity_x and _y calculation
Rudolf Polzer [Sat, 14 Aug 2010 19:26:09 +0000 (21:26 +0200)]
multijump: fix velocity_x and _y calculation

11 years agoMerge remote branch 'origin/fruitiex/multijump'
Rudolf Polzer [Sat, 14 Aug 2010 19:20:37 +0000 (21:20 +0200)]
Merge remote branch 'origin/fruitiex/multijump'

11 years agocrylink nerf
FruitieX [Sat, 14 Aug 2010 18:10:11 +0000 (21:10 +0300)]
crylink nerf

11 years agoerm, little "workaround" ;)
FruitieX [Sat, 14 Aug 2010 16:55:23 +0000 (19:55 +0300)]
erm, little "workaround" ;)

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/multijump'
Rudolf Polzer [Sat, 14 Aug 2010 16:27:00 +0000 (18:27 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/multijump'

11 years agoMerge remote branch 'origin/master' into fruitiex/multijump
FruitieX [Sat, 14 Aug 2010 16:24:59 +0000 (19:24 +0300)]
Merge remote branch 'origin/master' into fruitiex/multijump

11 years agodisable multijump by default
FruitieX [Sat, 14 Aug 2010 15:56:58 +0000 (18:56 +0300)]
disable multijump by default

11 years agopositive push force on crylink primary
FruitieX [Sat, 14 Aug 2010 15:46:51 +0000 (18:46 +0300)]
positive push force on crylink primary

11 years agosome updates that i apparently forgot to commit
FruitieX [Sat, 14 Aug 2010 15:30:23 +0000 (18:30 +0300)]
some updates that i apparently forgot to commit

11 years agofix a typo in mapinfo code
Rudolf Polzer [Sat, 14 Aug 2010 00:58:59 +0000 (02:58 +0200)]
fix a typo in mapinfo code

11 years agoMerge remote branch 'refs/remotes/origin/divVerent/rising-of-the-phoenix'
Rudolf Polzer [Fri, 13 Aug 2010 18:47:17 +0000 (20:47 +0200)]
Merge remote branch 'refs/remotes/origin/divVerent/rising-of-the-phoenix'

11 years agofix captured dom cp message
terencehill [Fri, 13 Aug 2010 18:20:21 +0000 (20:20 +0200)]
fix captured dom cp message

11 years agoFix wrong cvar name...
terencehill [Fri, 13 Aug 2010 18:06:55 +0000 (20:06 +0200)]
Fix wrong cvar name...
autocvar_hud_color_bg_team  -->  autocvar_scoreboard_color_bg_team

11 years agoUse hud_color_bg_team only in team games
terencehill [Fri, 13 Aug 2010 17:33:44 +0000 (19:33 +0200)]
Use hud_color_bg_team only in team games

Small indentation corrections

11 years agoFix incorrect scoreboard layout with certain configs
terencehill [Fri, 13 Aug 2010 15:27:03 +0000 (17:27 +0200)]
Fix incorrect scoreboard layout with certain configs
Examples:
scoreboard_columns_set  name ping | score   -->  the fields ping and score overlap
scoreboard_columns_set  name ping score |   -->  the field score goes beyond the scoreboard table

This bug was introduced by the utf8 related changes.