xonotic/xonotic-data.pk3dir.git
10 years agoMerge commit '9805d7cf0ce8875950b667e16982fcecd02068ad'
Rudolf Polzer [Thu, 29 Jul 2010 17:15:00 +0000 (19:15 +0200)]
Merge commit '9805d7cf0ce8875950b667e16982fcecd02068ad'

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

10 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'

10 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'

10 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'

10 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

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

10 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

10 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

10 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!)

10 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

10 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

10 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

10 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

10 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.

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

10 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)

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

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

10 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

10 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

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

10 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)

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

10 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)

10 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

10 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)

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

10 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

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

10 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

10 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?

10 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

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

10 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 :)

10 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

10 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

10 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

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

10 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'

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

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

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

10 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

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

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

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

10 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'

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

10 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

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

10 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

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

10 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

10 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

10 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 ;)

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

10 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

10 years agoMerge remote branch 'origin/divVerent/fruitbalance' into fruitiex/fruitbalance
FruitieX [Sat, 24 Jul 2010 12:48:08 +0000 (15:48 +0300)]
Merge remote branch 'origin/divVerent/fruitbalance' into fruitiex/fruitbalance

10 years agoMerge remote branch 'origin/sev/newpanelhudskin' into fruitiex/fruitbalance
FruitieX [Sat, 24 Jul 2010 11:16:54 +0000 (14:16 +0300)]
Merge remote branch 'origin/sev/newpanelhudskin' into fruitiex/fruitbalance

10 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance
FruitieX [Sat, 24 Jul 2010 11:15:49 +0000 (14:15 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance

10 years agoattempt at melee icon sending/receiving code for notify panel
FruitieX [Sat, 24 Jul 2010 11:15:22 +0000 (14:15 +0300)]
attempt at melee icon sending/receiving code for notify panel

10 years agoAdded a trout.
sev [Sat, 24 Jul 2010 08:02:49 +0000 (10:02 +0200)]
Added a trout.

10 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Fri, 23 Jul 2010 23:26:04 +0000 (02:26 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

10 years agoremove more useless stuff, merge the luminos skin dir into default
FruitieX [Fri, 23 Jul 2010 23:22:13 +0000 (02:22 +0300)]
remove more useless stuff, merge the luminos skin dir into default

10 years agorm num_* except num_leading.tga (freetype fonts used here)
FruitieX [Fri, 23 Jul 2010 23:13:10 +0000 (02:13 +0300)]
rm num_* except num_leading.tga (freetype fonts used here)

10 years agoMerge remote branch 'origin/master' into fruitiex/newpanelhud_stable
FruitieX [Fri, 23 Jul 2010 23:04:38 +0000 (02:04 +0300)]
Merge remote branch 'origin/master' into fruitiex/newpanelhud_stable

10 years agoMerge remote branch 'origin/master' into fruitiex/newpanelhud
FruitieX [Fri, 23 Jul 2010 23:04:27 +0000 (02:04 +0300)]
Merge remote branch 'origin/master' into fruitiex/newpanelhud

10 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Fri, 23 Jul 2010 23:03:20 +0000 (02:03 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

10 years agonow update the hud_default.cfg
FruitieX [Fri, 23 Jul 2010 23:02:51 +0000 (02:02 +0300)]
now update the hud_default.cfg

10 years agomake the forced aspect slider of pressedkeys a little more accurate...
FruitieX [Fri, 23 Jul 2010 23:00:36 +0000 (02:00 +0300)]
make the forced aspect slider of pressedkeys a little more accurate...

10 years agofix typo in exporter, no wonder the aspect was saved as "1" :P
FruitieX [Fri, 23 Jul 2010 22:58:32 +0000 (01:58 +0300)]
fix typo in exporter, no wonder the aspect was saved as "1" :P

10 years agomove new luminos cfg to hud_default.cfg (with the omission of menu_restart as
FruitieX [Fri, 23 Jul 2010 22:54:12 +0000 (01:54 +0300)]
move new luminos cfg to hud_default.cfg (with the omission of menu_restart as
always!). Also make weapons panel use aspect 2 on the icons.

10 years agomortar force up a bit to 300, allow picking up any armor up to 200
FruitieX [Fri, 23 Jul 2010 22:41:37 +0000 (01:41 +0300)]
mortar force up a bit to 300, allow picking up any armor up to 200

10 years agouse speed_up instead of speed_z on electro secondary too
FruitieX [Fri, 23 Jul 2010 22:27:46 +0000 (01:27 +0300)]
use speed_up instead of speed_z on electro secondary too

10 years agoprimary mortar à la Nexuiz (slightly nerfed though), secondary now instead sticky...
FruitieX [Fri, 23 Jul 2010 22:25:09 +0000 (01:25 +0300)]
primary mortar à la Nexuiz (slightly nerfed though), secondary now instead sticky (with lifetime increased to 1)

10 years agoFix use of HEIGHT_DIALOGBORDER:
terencehill [Fri, 23 Jul 2010 15:51:23 +0000 (17:51 +0200)]
Fix use of HEIGHT_DIALOGBORDER:
- its value was ignored (always used the default value 1)
- the menu didn't handle correctly it anyway

Note:
MARGIN_BOTTOM, MARGIN_LEFT and MARGIN_RIGHT must be changed according to HEIGHT_DIALOGBORDER, as the code DON'T handle directly the border size, while MARGIN_TOP is intended as the distance from the title bar and doesn't depend on HEIGHT_DIALOGBORDER.
FONTSIZE_TITLE and HEIGHT_TITLE must NOT be changed according to HEIGHT_DIALOGBORDER because they change the borders too (I don't know why they behave in this way).

10 years agono if trace_fraction < 1
FruitieX [Fri, 23 Jul 2010 21:20:32 +0000 (00:20 +0300)]
no if trace_fraction < 1

10 years agolaser dmg down to 20
FruitieX [Fri, 23 Jul 2010 21:20:06 +0000 (00:20 +0300)]
laser dmg down to 20

10 years agoallow electro lightning to detonate the blobs again :P
FruitieX [Fri, 23 Jul 2010 21:02:59 +0000 (00:02 +0300)]
allow electro lightning to detonate the blobs again :P

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance
Rudolf Polzer [Fri, 23 Jul 2010 20:36:41 +0000 (22:36 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance

10 years agosprintf'd death messages
Rudolf Polzer [Fri, 23 Jul 2010 20:36:25 +0000 (22:36 +0200)]
sprintf'd death messages

10 years agorl radius JUST a bit bigger
FruitieX [Fri, 23 Jul 2010 20:35:27 +0000 (23:35 +0300)]
rl radius JUST a bit bigger

10 years agoRevised a few existing icons and added some new icons. Now using only one panel bg.
sev [Fri, 23 Jul 2010 20:34:00 +0000 (22:34 +0200)]
Revised a few existing icons and added some new icons. Now using only one panel bg.

10 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Fri, 23 Jul 2010 19:03:07 +0000 (22:03 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

10 years agomoving rifle_ring_*.tga to gfx/*, the crosshairs aren't hud specific, so why should...
FruitieX [Fri, 23 Jul 2010 19:02:16 +0000 (22:02 +0300)]
moving rifle_ring_*.tga to gfx/*, the crosshairs aren't hud specific, so why should the rifle ring be?

10 years agofix sometimes missing icons by using drawpic_skin_aspect... (instead of just a drawpi...
FruitieX [Fri, 23 Jul 2010 18:56:24 +0000 (21:56 +0300)]
fix sometimes missing icons by using drawpic_skin_aspect... (instead of just a drawpic, manually finding out the skin (ooold way))

10 years agouse the hud_panel_weapons_accuracy_colorX system in the scoreboard too
FruitieX [Fri, 23 Jul 2010 18:53:12 +0000 (21:53 +0300)]
use the hud_panel_weapons_accuracy_colorX system in the scoreboard too

10 years agoMerge branch 'master' into divVerent/fruitbalance
Rudolf Polzer [Fri, 23 Jul 2010 18:25:21 +0000 (20:25 +0200)]
Merge branch 'master' into divVerent/fruitbalance

10 years agorename physicsNoQWBunny.cfg to physicsNoQWBunny-xpmbased.cfg, and default to the...
Rudolf Polzer [Fri, 23 Jul 2010 08:35:33 +0000 (10:35 +0200)]
rename physicsNoQWBunny.cfg to physicsNoQWBunny-xpmbased.cfg, and default to the -nexbased again

10 years agomerge some improvements into the -nexbased NoQWBunny physcis
Rudolf Polzer [Fri, 23 Jul 2010 08:28:27 +0000 (10:28 +0200)]
merge some improvements into the -nexbased NoQWBunny physcis

10 years agouse W_SetupShot for electro/laser beams
Rudolf Polzer [Fri, 23 Jul 2010 08:24:42 +0000 (10:24 +0200)]
use W_SetupShot for electro/laser beams