xonotic/xonotic-data.pk3dir.git
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 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 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

10 years agostop damaging the world
Rudolf Polzer [Fri, 23 Jul 2010 05:58:24 +0000 (07:58 +0200)]
stop damaging the world

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance
Rudolf Polzer [Fri, 23 Jul 2010 05:53:02 +0000 (07:53 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance

10 years agoRevert "laser force at 300" This breaks CTF :(
FruitieX [Thu, 22 Jul 2010 22:28:24 +0000 (01:28 +0300)]
Revert "laser force at 300" This breaks CTF :(

This reverts commit 4cd0e6fecb19daaaa5bb22ca5a09165e4c7f19c2.

10 years agolaser force at 300
FruitieX [Thu, 22 Jul 2010 22:16:45 +0000 (01:16 +0300)]
laser force at 300

10 years agofix stupid typo
FruitieX [Thu, 22 Jul 2010 21:54:27 +0000 (00:54 +0300)]
fix stupid typo

10 years agoMerge branch 'master' into fruitiex/fruitbalance
FruitieX [Thu, 22 Jul 2010 21:53:38 +0000 (00:53 +0300)]
Merge branch 'master' into fruitiex/fruitbalance

10 years agoMerge branch 'master' into fruitiex/newpanelhud_stable
FruitieX [Thu, 22 Jul 2010 16:55:43 +0000 (19:55 +0300)]
Merge branch 'master' into fruitiex/newpanelhud_stable

10 years agoMerge branch 'master' into fruitiex/newpanelhud
FruitieX [Thu, 22 Jul 2010 16:55:33 +0000 (19:55 +0300)]
Merge branch 'master' into fruitiex/newpanelhud

10 years agoimprove comments
Rudolf Polzer [Thu, 22 Jul 2010 16:54:47 +0000 (18:54 +0200)]
improve comments

10 years agorename physics configs to make the current ones NoQWBunny the XPM based ones
Rudolf Polzer [Thu, 22 Jul 2010 16:53:18 +0000 (18:53 +0200)]
rename physics configs to make the current ones NoQWBunny the XPM based ones

10 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Thu, 22 Jul 2010 16:51:12 +0000 (19:51 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

10 years agojumpvelocity 250 is enough. Total jump height now: 39.0625qu (previously: 56.25qu...
Rudolf Polzer [Thu, 22 Jul 2010 16:48:13 +0000 (18:48 +0200)]
jumpvelocity 250 is enough. Total jump height now: 39.0625qu (previously: 56.25qu). As player height is 69, this makes a total of 108.0625 qu to be able to stand and jump. Make a room at least 109qu high, and it's all good... recommended is 112qu (7 cells in 8qu grid, radiant key "4"), equivalent to 2.85m

10 years agovery tiny change to turn fractions to integers again
Rudolf Polzer [Thu, 22 Jul 2010 16:42:19 +0000 (18:42 +0200)]
very tiny change to turn fractions to integers again

10 years agoNoQWBunny-XPM: fix strafing the lazy man's way
Rudolf Polzer [Thu, 22 Jul 2010 16:40:52 +0000 (18:40 +0200)]
NoQWBunny-XPM: fix strafing the lazy man's way

10 years agoallow "laserclimbing" ;) (HLAC)
FruitieX [Thu, 22 Jul 2010 16:33:58 +0000 (19:33 +0300)]
allow "laserclimbing" ;) (HLAC)

10 years agono spread, it's a LASER right (and they are accurate, no?) ;)
FruitieX [Thu, 22 Jul 2010 16:14:11 +0000 (19:14 +0300)]
no spread, it's a LASER right (and they are accurate, no?) ;)

10 years agohlac nerf (had RIDICULOUS dps)
FruitieX [Thu, 22 Jul 2010 16:09:59 +0000 (19:09 +0300)]
hlac nerf (had RIDICULOUS dps)

10 years agorefire down by 0.05 => can laserclimb again
FruitieX [Thu, 22 Jul 2010 15:45:58 +0000 (18:45 +0300)]
refire down by 0.05 => can laserclimb again

10 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Thu, 22 Jul 2010 15:30:19 +0000 (18:30 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

10 years agoincrease full ammo counts a bit
FruitieX [Thu, 22 Jul 2010 15:29:52 +0000 (18:29 +0300)]
increase full ammo counts a bit

10 years agooops make that a "set"
FruitieX [Thu, 22 Jul 2010 15:23:03 +0000 (18:23 +0300)]
oops make that a "set"

10 years agogive the laser a slightly lower dps...
FruitieX [Thu, 22 Jul 2010 15:11:00 +0000 (18:11 +0300)]
give the laser a slightly lower dps...

10 years agoanti-hitsound spam for electro lightning gun and laser gauntlet
FruitieX [Thu, 22 Jul 2010 14:57:26 +0000 (17:57 +0300)]
anti-hitsound spam for electro lightning gun and laser gauntlet

10 years agoseeker: 3 missiles instead of 4, damage 33 per missile
FruitieX [Thu, 22 Jul 2010 14:21:05 +0000 (17:21 +0300)]
seeker: 3 missiles instead of 4, damage 33 per missile

10 years agonerf crylink primary
FruitieX [Thu, 22 Jul 2010 14:14:49 +0000 (17:14 +0300)]
nerf crylink primary

10 years agofix the campingrifle's trueaim with warpzones
Rudolf Polzer [Thu, 22 Jul 2010 13:59:54 +0000 (15:59 +0200)]
fix the campingrifle's trueaim with warpzones

10 years agomake the second trace hit
Rudolf Polzer [Thu, 22 Jul 2010 13:52:50 +0000 (15:52 +0200)]
make the second trace hit

10 years agosome grenadelauncher changes...
FruitieX [Thu, 22 Jul 2010 13:49:09 +0000 (16:49 +0300)]
some grenadelauncher changes...

10 years agorefire 0 on gauntlet and electro lightning
FruitieX [Thu, 22 Jul 2010 11:54:26 +0000 (14:54 +0300)]
refire 0 on gauntlet and electro lightning

10 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Thu, 22 Jul 2010 10:57:29 +0000 (13:57 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

10 years agofix the picker code
FruitieX [Thu, 22 Jul 2010 10:55:43 +0000 (13:55 +0300)]
fix the picker code

10 years agoupdate the "hud setup" (esc) dialog
FruitieX [Thu, 22 Jul 2010 10:46:46 +0000 (13:46 +0300)]
update the "hud setup" (esc) dialog

10 years agoFruitieX: projectile bounds are not networked. Always update this file too.
Rudolf Polzer [Thu, 22 Jul 2010 10:43:56 +0000 (12:43 +0200)]
FruitieX: projectile bounds are not networked. Always update this file too.

10 years agoyes, FALSE is the same as MOVE_NORMAL, but let's be more explicit about the trace...
Rudolf Polzer [Thu, 22 Jul 2010 10:36:13 +0000 (12:36 +0200)]
yes, FALSE is the same as MOVE_NORMAL, but let's be more explicit about the trace type

10 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Thu, 22 Jul 2010 10:25:02 +0000 (13:25 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

10 years agofix exporter
FruitieX [Thu, 22 Jul 2010 10:23:43 +0000 (13:23 +0300)]
fix exporter

10 years agoproperly draw the hook through warpzones again too; fix interpolation issues
Rudolf Polzer [Thu, 22 Jul 2010 04:41:56 +0000 (06:41 +0200)]
properly draw the hook through warpzones again too; fix interpolation issues

10 years agomostly working code to use csqc entities for hook, electro, gauntlet (currently doesn...
Rudolf Polzer [Wed, 21 Jul 2010 19:24:18 +0000 (21:24 +0200)]
mostly working code to use csqc entities for hook, electro, gauntlet (currently doesn't draw the hook end thingy properly)

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

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance
Rudolf Polzer [Wed, 21 Jul 2010 18:31:12 +0000 (20:31 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance

10 years agoMerge remote branch 'refs/remotes/origin/terencehill/dom_points'
Rudolf Polzer [Wed, 21 Jul 2010 18:27:07 +0000 (20:27 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/dom_points'

10 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/death_unglow'
Rudolf Polzer [Wed, 21 Jul 2010 18:14:01 +0000 (20:14 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/death_unglow'

10 years agoMerge remote branch 'origin/fruitiex/newpanelhud_stable'
Rudolf Polzer [Wed, 21 Jul 2010 17:55:53 +0000 (19:55 +0200)]
Merge remote branch 'origin/fruitiex/newpanelhud_stable'

10 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Wed, 21 Jul 2010 15:41:57 +0000 (18:41 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

10 years agomelee and headshot icons (icon graphic only, code coming later)
FruitieX [Wed, 21 Jul 2010 15:18:09 +0000 (18:18 +0300)]
melee and headshot icons (icon graphic only, code coming later)

10 years agoallow disabling/enabling the hud bg from the menu dialogs now
FruitieX [Wed, 21 Jul 2010 14:36:50 +0000 (17:36 +0300)]
allow disabling/enabling the hud bg from the menu dialogs now

10 years ago_con_chat_maximized ;)
FruitieX [Wed, 21 Jul 2010 14:00:03 +0000 (17:00 +0300)]
_con_chat_maximized ;)

10 years agofix the tag seeker popping out in the scoreboard accuracy table
FruitieX [Wed, 21 Jul 2010 13:06:07 +0000 (16:06 +0300)]
fix the tag seeker popping out in the scoreboard accuracy table

10 years agofix two nasty bugs in the scoreboard
FruitieX [Wed, 21 Jul 2010 12:53:57 +0000 (15:53 +0300)]
fix two nasty bugs in the scoreboard

10 years agofinally see who you are spectating :D
FruitieX [Wed, 21 Jul 2010 12:10:28 +0000 (15:10 +0300)]
finally see who you are spectating :D

10 years agoallow turning on/off the healtharmor/powerups statusbars in a more clean way :)
FruitieX [Wed, 21 Jul 2010 12:03:29 +0000 (15:03 +0300)]
allow turning on/off the healtharmor/powerups statusbars in a more clean way :)

10 years agoMerge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir...
FruitieX [Wed, 21 Jul 2010 11:15:20 +0000 (14:15 +0300)]
Merge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/fruitbalance

10 years agolaser secondary gauntlet, lots of improvements to code
FruitieX [Wed, 21 Jul 2010 11:13:43 +0000 (14:13 +0300)]
laser secondary gauntlet, lots of improvements to code

10 years agolaser secondary = gauntlet, better effects coming soon
FruitieX [Wed, 21 Jul 2010 09:44:29 +0000 (12:44 +0300)]
laser secondary = gauntlet, better effects coming soon