xonotic/xonotic-data.pk3dir.git
12 years agoMerge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600' into terencehill/misc_bugfixes
terencehill [Fri, 13 Aug 2010 14:56:04 +0000 (16:56 +0200)]
Merge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600' into terencehill/misc_bugfixes

Conflicts:
qcsrc/common/util.qc

I didn't merge directly master as I get this error:
too many files (created: 234 deleted: 1239), skipping inexact rename detection
I _HOPE_ the next merge won't fail...

12 years agoWorkaround to not draw a big closebutton when HEIGHT_DIALOGBORDER is 0
terencehill [Wed, 4 Aug 2010 18:58:35 +0000 (20:58 +0200)]
Workaround to not draw a big closebutton when HEIGHT_DIALOGBORDER is 0

12 years agoAllow to draw BorderPicture without borders in menu too
terencehill [Wed, 4 Aug 2010 18:55:12 +0000 (20:55 +0200)]
Allow to draw BorderPicture without borders in menu too
This actually fix menu dialogs with exaggerated dimensions using HEIGHT_DIALOGBORDER 0

12 years agoMerge remote branch 'refs/remotes/origin/divVerent/mapinfo-cleanup'
Rudolf Polzer [Wed, 4 Aug 2010 11:33:16 +0000 (13:33 +0200)]
Merge remote branch 'refs/remotes/origin/divVerent/mapinfo-cleanup'

12 years agohide a warning
Rudolf Polzer [Wed, 4 Aug 2010 06:32:40 +0000 (08:32 +0200)]
hide a warning

12 years agodo not use a cvar for the safety margin
Rudolf Polzer [Wed, 4 Aug 2010 06:30:38 +0000 (08:30 +0200)]
do not use a cvar for the safety margin

12 years agofix nearclip PROPERLY, even at evil fov values
Rudolf Polzer [Wed, 4 Aug 2010 06:28:57 +0000 (08:28 +0200)]
fix nearclip PROPERLY, even at evil fov values

12 years agostore a diff of balanceXPM.cfg and balanceXonotic.cfg in defaultXPM.cfg instead,...
FruitieX [Mon, 2 Aug 2010 11:31:09 +0000 (14:31 +0300)]
store a diff of balanceXPM.cfg and balanceXonotic.cfg in defaultXPM.cfg instead, and restructure this file a bit

12 years agodisable health/armor stats in XPM, not good to know this stuff in duels. :P Also...
FruitieX [Mon, 2 Aug 2010 11:25:45 +0000 (14:25 +0300)]
disable health/armor stats in XPM, not good to know this stuff in duels. :P Also, make the grunt sound and footsteps default in defaultXonotic.cfg (we need better sounds for these!!)

12 years agoenable some more fragmessage info by default, remove the weaponreplaces from defaultX...
FruitieX [Mon, 2 Aug 2010 11:24:18 +0000 (14:24 +0300)]
enable some more fragmessage info by default, remove the weaponreplaces from defaultXPM (shotgun will be the starting weapon in XPM)

12 years agoweaponswitchdelay 0 in XPM
FruitieX [Mon, 2 Aug 2010 11:22:40 +0000 (14:22 +0300)]
weaponswitchdelay 0 in XPM

12 years agostart with 200 health in LMS/CA, not 250
FruitieX [Mon, 2 Aug 2010 11:20:45 +0000 (14:20 +0300)]
start with 200 health in LMS/CA, not 250

12 years agowhy were some g_start_weapon_* set to 0...
FruitieX [Mon, 2 Aug 2010 11:19:50 +0000 (14:19 +0300)]
why were some g_start_weapon_* set to 0...

12 years agocopy current balanceXonotic into balanceXPM, and disable the laser altogether in...
FruitieX [Mon, 2 Aug 2010 11:18:43 +0000 (14:18 +0300)]
copy current balanceXonotic into balanceXPM, and disable the laser altogether in XPM (the shotgun already has a good enough melee ;))

12 years agodisable the laser gauntlet, secondary switches back to previous weapon again
FruitieX [Mon, 2 Aug 2010 11:16:27 +0000 (14:16 +0300)]
disable the laser gauntlet, secondary switches back to previous weapon again

12 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Sat, 31 Jul 2010 16:50:09 +0000 (19:50 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

12 years agocrylink speed back at 1100
FruitieX [Sat, 31 Jul 2010 16:49:09 +0000 (19:49 +0300)]
crylink speed back at 1100

12 years agobetter lgbeam texture
Rudolf Polzer [Sat, 31 Jul 2010 13:08:24 +0000 (15:08 +0200)]
better lgbeam texture

12 years agoelectro lightning: make it look more electric
Rudolf Polzer [Sat, 31 Jul 2010 12:48:34 +0000 (14:48 +0200)]
electro lightning: make it look more electric

12 years agoMerge branch 'master' into fruitiex/fruitbalance
FruitieX [Fri, 30 Jul 2010 23:36:14 +0000 (02:36 +0300)]
Merge branch 'master' into fruitiex/fruitbalance

12 years agonew rifle ring
FruitieX [Fri, 30 Jul 2010 23:35:36 +0000 (02:35 +0300)]
new rifle ring

12 years agodouble the refire time between electro secondary bursts
FruitieX [Fri, 30 Jul 2010 23:07:33 +0000 (02:07 +0300)]
double the refire time between electro secondary bursts

12 years agonerf crylink forces a load. Introducing new sport: Crylink Jumping!
FruitieX [Fri, 30 Jul 2010 23:01:14 +0000 (02:01 +0300)]
nerf crylink forces a load. Introducing new sport: Crylink Jumping!

12 years agosame thing for secondary, also bound(0, a, 1) the alpha
FruitieX [Fri, 30 Jul 2010 22:51:17 +0000 (01:51 +0300)]
same thing for secondary, also bound(0, a, 1) the alpha

12 years agoexplode all crylink projectiles if even one of them hits (primary only currently)
FruitieX [Fri, 30 Jul 2010 22:41:16 +0000 (01:41 +0300)]
explode all crylink projectiles if even one of them hits (primary only currently)

12 years agoshotgun primary back at 60 max dps
FruitieX [Fri, 30 Jul 2010 20:01:31 +0000 (23:01 +0300)]
shotgun primary back at 60 max dps

12 years agofaster crylink primary projectiles, added headshotdamage for CR
FruitieX [Fri, 30 Jul 2010 19:37:48 +0000 (22:37 +0300)]
faster crylink primary projectiles, added headshotdamage for CR

12 years agohandle CR and nex scope sending in a better way
FruitieX [Thu, 29 Jul 2010 17:53:12 +0000 (20:53 +0300)]
handle CR and nex scope sending in a better way

12 years agoMerge remote branch 'refs/remotes/origin/tzork/vehicles1'
Rudolf Polzer [Thu, 29 Jul 2010 17:19:37 +0000 (19:19 +0200)]
Merge remote branch 'refs/remotes/origin/tzork/vehicles1'

12 years agosimplify ftos_decimals now that we have sprintf
Rudolf Polzer [Thu, 29 Jul 2010 17:18:18 +0000 (19:18 +0200)]
simplify ftos_decimals now that we have sprintf

12 years agoDelete jetpack.blend from this repo (it's already present in mediasource repo)
terencehill [Mon, 26 Jul 2010 17:23:09 +0000 (19:23 +0200)]
Delete jetpack.blend from this repo (it's already present in mediasource repo)

12 years agoMerge commit '9805d7cf0ce8875950b667e16982fcecd02068ad'
Rudolf Polzer [Thu, 29 Jul 2010 17:15:00 +0000 (19:15 +0200)]
Merge commit '9805d7cf0ce8875950b667e16982fcecd02068ad'

12 years agoMerge commit '3f5af11a8794a82f13d066452580dd8d0cc756bc'
Rudolf Polzer [Thu, 29 Jul 2010 17:13:12 +0000 (19:13 +0200)]
Merge commit '3f5af11a8794a82f13d066452580dd8d0cc756bc'

12 years agoMerge remote branch 'refs/remotes/origin/fruitiex/newpanelhud'
Rudolf Polzer [Thu, 29 Jul 2010 17:08:49 +0000 (19:08 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/newpanelhud'

12 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
Rudolf Polzer [Thu, 29 Jul 2010 17:05:41 +0000 (19:05 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'

12 years agoMerge remote branch 'refs/remotes/origin/fruitiex/conback'
Rudolf Polzer [Thu, 29 Jul 2010 17:00:43 +0000 (19:00 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/conback'

12 years agofix to invisible mapvote cursor and to invisible waypointsprites
FruitieX [Thu, 29 Jul 2010 09:00:36 +0000 (12:00 +0300)]
fix to invisible mapvote cursor and to invisible waypointsprites

12 years agooops also enable secondary
FruitieX [Wed, 28 Jul 2010 21:13:17 +0000 (00:13 +0300)]
oops also enable secondary

12 years agomagazinecapacity at 4 on CR to make it quite useless in close combat
FruitieX [Wed, 28 Jul 2010 21:11:56 +0000 (00:11 +0300)]
magazinecapacity at 4 on CR to make it quite useless in close combat

12 years agookay nevermind that effects reverse thing
FruitieX [Wed, 28 Jul 2010 21:04:43 +0000 (00:04 +0300)]
okay nevermind that effects reverse thing

12 years agonex secondary = negative push (very experimental!)
FruitieX [Wed, 28 Jul 2010 21:03:28 +0000 (00:03 +0300)]
nex secondary = negative push (very experimental!)

12 years agomake the seeker fire 8 missiles
FruitieX [Wed, 28 Jul 2010 20:04:33 +0000 (23:04 +0300)]
make the seeker fire 8 missiles

12 years agoMerge remote branch 'origin/tzork/uzifix' into fruitiex/fruitbalance
FruitieX [Wed, 28 Jul 2010 20:01:04 +0000 (23:01 +0300)]
Merge remote branch 'origin/tzork/uzifix' into fruitiex/fruitbalance

12 years agoMake uzi muzzleflah smaller, more transparent and stop it from spamming enteties
Jakob MG [Wed, 28 Jul 2010 19:56:26 +0000 (21:56 +0200)]
Make uzi muzzleflah smaller, more transparent and stop it from spamming enteties

12 years agoNew raptor cockpit mode, add missing "spinner" model, add missing raptor config and...
Jakob MG [Wed, 28 Jul 2010 13:26:07 +0000 (15:26 +0200)]
New raptor cockpit mode, add missing "spinner" model, add missing raptor config and fix some code/cvar name mismatches. Fix a seriouse bug if vehicles shield handeling.

12 years agoMerge remote branch 'origin/sev/newpanelhudskin' into fruitiex/newpanelhud
FruitieX [Wed, 28 Jul 2010 10:35:05 +0000 (13:35 +0300)]
Merge remote branch 'origin/sev/newpanelhudskin' into fruitiex/newpanelhud

12 years agoAdded notify_telefrag and nexball_carrying. RLE compressed all tga files.
sev [Wed, 28 Jul 2010 10:22:05 +0000 (12:22 +0200)]
Added notify_telefrag and nexball_carrying. RLE compressed all tga files.

12 years agoelectro primary: use more ammo
FruitieX [Tue, 27 Jul 2010 22:33:35 +0000 (01:33 +0300)]
electro primary: use more ammo

12 years agonex animtime sligthly down (from 1 second to 0.75 seconds)
FruitieX [Tue, 27 Jul 2010 22:22:37 +0000 (01:22 +0300)]
nex animtime sligthly down (from 1 second to 0.75 seconds)

12 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Tue, 27 Jul 2010 20:02:05 +0000 (23:02 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

12 years agodetect zoom scripts in reticle code too
Rudolf Polzer [Tue, 27 Jul 2010 19:44:58 +0000 (21:44 +0200)]
detect zoom scripts in reticle code too

12 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Tue, 27 Jul 2010 13:46:43 +0000 (16:46 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

12 years agoMerge remote branch 'origin/master' into fruitiex/newpanelhud_stable
FruitieX [Tue, 27 Jul 2010 13:46:40 +0000 (16:46 +0300)]
Merge remote branch 'origin/master' into fruitiex/newpanelhud_stable

12 years agoMerge branch 'master' into fruitiex/newpanelhud_stable
FruitieX [Tue, 27 Jul 2010 13:46:37 +0000 (16:46 +0300)]
Merge branch 'master' into fruitiex/newpanelhud_stable

12 years ago"ghost" ammo icons
FruitieX [Tue, 27 Jul 2010 13:42:33 +0000 (16:42 +0300)]
"ghost" ammo icons

12 years agoMerge remote branch 'origin/master' into fruitiex/newpanelhud
FruitieX [Tue, 27 Jul 2010 13:42:29 +0000 (16:42 +0300)]
Merge remote branch 'origin/master' into fruitiex/newpanelhud

12 years agofix radar, showspeed and showacceleration. These used the wrong cvar names as their...
FruitieX [Tue, 27 Jul 2010 13:15:44 +0000 (16:15 +0300)]
fix radar, showspeed and showacceleration. These used the wrong cvar names as their alpha

12 years agoburst mode back on electro secondary, heavy nerf too because of this
FruitieX [Tue, 27 Jul 2010 12:48:45 +0000 (15:48 +0300)]
burst mode back on electro secondary, heavy nerf too because of this

12 years agohalve health regen speed
FruitieX [Tue, 27 Jul 2010 12:38:24 +0000 (15:38 +0300)]
halve health regen speed

12 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Tue, 27 Jul 2010 11:35:03 +0000 (14:35 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

12 years agonegative crylink primary force, negative nex force (experimental), nerf electro light...
FruitieX [Tue, 27 Jul 2010 11:33:40 +0000 (14:33 +0300)]
negative crylink primary force, negative nex force (experimental), nerf electro lightning gun force a bit

12 years agoelectro lightning: paint with decals
Rudolf Polzer [Tue, 27 Jul 2010 06:18:36 +0000 (08:18 +0200)]
electro lightning: paint with decals

12 years agophysics: change jumpvelocity to 260, a bit higher. Now optimized for 180bpm instead...
Rudolf Polzer [Tue, 27 Jul 2010 05:27:00 +0000 (07:27 +0200)]
physics: change jumpvelocity to 260, a bit higher. Now optimized for 180bpm instead (exactly 180bpm would be 266.666666666, but we can only bpm sync if cl_maxfps is 60 anyway, and if it is, it matches 180bpm still exactly because part of a frame is still a frame; also, 260 is nicer for mappers than 266.66666, as a jumping player then still fits in 112qu without hitting the ceiling with his head)

12 years agoDelete jetpack.blend from this repo (it's already present in mediasource repo)
terencehill [Mon, 26 Jul 2010 17:23:09 +0000 (19:23 +0200)]
Delete jetpack.blend from this repo (it's already present in mediasource repo)

12 years agoFix ftos_decimals returning -0 instead of 0 in some case
terencehill [Mon, 26 Jul 2010 12:33:44 +0000 (14:33 +0200)]
Fix ftos_decimals returning -0 instead of 0 in some case
e.g.: ftos_decimals(-0.00001, 2)  returned  -0.00

12 years agohealth regeneration is back!
FruitieX [Sun, 25 Jul 2010 21:45:09 +0000 (00:45 +0300)]
health regeneration is back!

12 years agolaser gauntlet dps 150 -> 200, this might now need functionality similar to the q3...
FruitieX [Sun, 25 Jul 2010 18:22:22 +0000 (21:22 +0300)]
laser gauntlet dps 150 -> 200, this might now need functionality similar to the q3 gauntlet... (e.g. refire time after you hit)

12 years agogrenade secondary health to 40 so you can still explode it with primary
FruitieX [Sun, 25 Jul 2010 18:03:38 +0000 (21:03 +0300)]
grenade secondary health to 40 so you can still explode it with primary

12 years agonerf the electro lightning a bit (dps 100 -> 90)
FruitieX [Sun, 25 Jul 2010 17:09:02 +0000 (20:09 +0300)]
nerf the electro lightning a bit (dps 100 -> 90)

12 years agobetter laser/electro effects...
FruitieX [Sun, 25 Jul 2010 16:46:48 +0000 (19:46 +0300)]
better laser/electro effects...

12 years agoparticle effects on gauntlet too, make crylink secondary force negative again
FruitieX [Sun, 25 Jul 2010 15:39:16 +0000 (18:39 +0300)]
particle effects on gauntlet too, make crylink secondary force negative again

12 years agoeven more shotgun ammo...
FruitieX [Sun, 25 Jul 2010 14:59:54 +0000 (17:59 +0300)]
even more shotgun ammo...

12 years agonex damage to 90, less damage nerfing over distance
FruitieX [Sun, 25 Jul 2010 14:27:03 +0000 (17:27 +0300)]
nex damage to 90, less damage nerfing over distance

12 years agotry fixing the accuracies... shotgun secondary accuracy still broken?
FruitieX [Sun, 25 Jul 2010 13:51:03 +0000 (16:51 +0300)]
try fixing the accuracies... shotgun secondary accuracy still broken?

12 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Sun, 25 Jul 2010 12:36:35 +0000 (15:36 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

12 years agomore speed on electro secondary :)
FruitieX [Sun, 25 Jul 2010 11:56:37 +0000 (14:56 +0300)]
more speed on electro secondary :)

12 years agomore damage for mortar primary again :)
FruitieX [Sun, 25 Jul 2010 11:24:07 +0000 (14:24 +0300)]
more damage for mortar primary again :)

12 years agofaster nade again, but just a bit less edgedmg
FruitieX [Sun, 25 Jul 2010 11:19:33 +0000 (14:19 +0300)]
faster nade again, but just a bit less edgedmg

12 years agocrylink 2 bounces, shotgun ammo usage tweaked
FruitieX [Sun, 25 Jul 2010 11:11:47 +0000 (14:11 +0300)]
crylink 2 bounces, shotgun ammo usage tweaked

12 years agobring the mortar primary speed way down, it's completely unavoidable at 2000 speed...
FruitieX [Sun, 25 Jul 2010 10:53:27 +0000 (13:53 +0300)]
bring the mortar primary speed way down, it's completely unavoidable at 2000 speed, damage nerfed too

12 years agolaser damage, force up
FruitieX [Sat, 24 Jul 2010 22:48:09 +0000 (01:48 +0300)]
laser damage, force up

12 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Sat, 24 Jul 2010 17:26:32 +0000 (19:26 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance'

12 years agoincrease near clip workaround :(
Rudolf Polzer [Sat, 24 Jul 2010 17:25:05 +0000 (19:25 +0200)]
increase near clip workaround :(

12 years agonew electro_lightning effect :P
Rudolf Polzer [Sat, 24 Jul 2010 17:23:17 +0000 (19:23 +0200)]
new electro_lightning effect :P

12 years agouse a better factor
Rudolf Polzer [Sat, 24 Jul 2010 17:23:12 +0000 (19:23 +0200)]
use a better factor

12 years agochange update-cvarcount.sh to use balanceXonotic.cfg
FruitieX [Sat, 24 Jul 2010 17:14:53 +0000 (20:14 +0300)]
change update-cvarcount.sh to use balanceXonotic.cfg

12 years agominor cleanup of projectile trails
Rudolf Polzer [Sat, 24 Jul 2010 17:09:49 +0000 (19:09 +0200)]
minor cleanup of projectile trails

12 years agouse the electro_lightning effect
Rudolf Polzer [Sat, 24 Jul 2010 17:09:36 +0000 (19:09 +0200)]
use the electro_lightning effect

12 years agorename balance configs :P
Rudolf Polzer [Sat, 24 Jul 2010 16:53:55 +0000 (18:53 +0200)]
rename balance configs :P

12 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Sat, 24 Jul 2010 16:50:19 +0000 (18:50 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance'

12 years agooops, balance.cfg too
FruitieX [Sat, 24 Jul 2010 16:27:06 +0000 (19:27 +0300)]
oops, balance.cfg too

12 years agoremove unused cvars, copy shotgun melee settings to all other configs
FruitieX [Sat, 24 Jul 2010 16:25:28 +0000 (19:25 +0300)]
remove unused cvars, copy shotgun melee settings to all other configs

12 years agoadd a comment about 200bpm
Rudolf Polzer [Sat, 24 Jul 2010 16:16:24 +0000 (18:16 +0200)]
add a comment about 200bpm

12 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Sat, 24 Jul 2010 16:07:18 +0000 (19:07 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

12 years agofix typo
FruitieX [Sat, 24 Jul 2010 16:06:26 +0000 (19:06 +0300)]
fix typo

12 years agomore range and force on the gauntlet to maybe make it more usable
FruitieX [Sat, 24 Jul 2010 15:58:52 +0000 (18:58 +0300)]
more range and force on the gauntlet to maybe make it more usable

12 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Sat, 24 Jul 2010 15:54:00 +0000 (18:54 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

12 years agofix ordering of kill messages, add kill messages for melee wpns ;)
FruitieX [Sat, 24 Jul 2010 15:53:05 +0000 (18:53 +0300)]
fix ordering of kill messages, add kill messages for melee wpns ;)

12 years agomelee icon code :-)
FruitieX [Sat, 24 Jul 2010 15:42:29 +0000 (18:42 +0300)]
melee icon code :-)

12 years agotemp workaround to make 192bpm music fit
Rudolf Polzer [Sat, 24 Jul 2010 15:41:21 +0000 (17:41 +0200)]
temp workaround to make 192bpm music fit