xonotic/xonotic-data.pk3dir.git
11 years agoMerge branch 'master' into terencehill/misc_bugfixes
terencehill [Fri, 13 Aug 2010 14:56:49 +0000 (16:56 +0200)]
Merge branch 'master' into terencehill/misc_bugfixes

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

11 years agomake use of sv_aircontrol a bit easier again, maybe less "sliding" now?
Rudolf Polzer [Thu, 12 Aug 2010 06:52:42 +0000 (08:52 +0200)]
make use of sv_aircontrol a bit easier again, maybe less "sliding" now?

11 years agowarpzones: optimize tracing if no warpzones exist (less extra work)
Rudolf Polzer [Tue, 10 Aug 2010 07:11:27 +0000 (09:11 +0200)]
warpzones: optimize tracing if no warpzones exist (less extra work)

11 years agoMerge remote branch 'refs/remotes/origin/terencehill/quick_cvar_revert'
Rudolf Polzer [Sun, 8 Aug 2010 19:39:21 +0000 (21:39 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/quick_cvar_revert'

11 years agoname changes ;)
Rudolf Polzer [Sat, 7 Aug 2010 14:09:55 +0000 (16:09 +0200)]
name changes ;)

11 years agoadd MooKow to active contributors list
Rudolf Polzer [Fri, 6 Aug 2010 23:17:14 +0000 (01:17 +0200)]
add MooKow to active contributors list

11 years agomore textures in wrong directory
Rudolf Polzer [Fri, 6 Aug 2010 22:59:52 +0000 (00:59 +0200)]
more textures in wrong directory

11 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Fri, 6 Aug 2010 18:46:18 +0000 (20:46 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

11 years agoDDS loading workaround
Rudolf Polzer [Fri, 6 Aug 2010 18:46:07 +0000 (20:46 +0200)]
DDS loading workaround

11 years agodeclared variables work better
Rudolf Polzer [Fri, 6 Aug 2010 12:28:36 +0000 (14:28 +0200)]
declared variables work better

11 years agotexture compression: add a checkbox for the new cvars
Rudolf Polzer [Fri, 6 Aug 2010 12:07:11 +0000 (14:07 +0200)]
texture compression: add a checkbox for the new cvars

11 years agoNEX_BUILDSYSTEM -> XON_BUILDSYSTEM
Rudolf Polzer [Fri, 6 Aug 2010 10:00:05 +0000 (12:00 +0200)]
NEX_BUILDSYSTEM -> XON_BUILDSYSTEM

11 years agodisable grunting noise, at least until we have better sounds for it
Rudolf Polzer [Thu, 5 Aug 2010 18:31:28 +0000 (20:31 +0200)]
disable grunting noise, at least until we have better sounds for it

11 years agosvn -> git
Rudolf Polzer [Thu, 5 Aug 2010 18:14:28 +0000 (20:14 +0200)]
svn -> git

11 years agoversion := 0.1.0 for now (string = "git")
Rudolf Polzer [Thu, 5 Aug 2010 18:11:31 +0000 (20:11 +0200)]
version := 0.1.0 for now (string = "git")

11 years agosimplify the assault fix
Rudolf Polzer [Thu, 5 Aug 2010 17:53:52 +0000 (19:53 +0200)]
simplify the assault fix

11 years agoMerge remote branch 'origin/savagex/assaultfixes'
Rudolf Polzer [Thu, 5 Aug 2010 17:52:43 +0000 (19:52 +0200)]
Merge remote branch 'origin/savagex/assaultfixes'

11 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Thu, 5 Aug 2010 17:43:54 +0000 (19:43 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

11 years agodelete quite some stuff that rather belongs in xonotic-maps and xonotic-nexcompat
Rudolf Polzer [Thu, 5 Aug 2010 17:42:33 +0000 (19:42 +0200)]
delete quite some stuff that rather belongs in xonotic-maps and xonotic-nexcompat

11 years agospeed := 360
Rudolf Polzer [Thu, 5 Aug 2010 17:42:16 +0000 (19:42 +0200)]
speed := 360

11 years agoset classname of assault waypoint sprites to "sprite_waypoint" (instead of having...
Maik Merten [Thu, 5 Aug 2010 16:47:58 +0000 (18:47 +0200)]
set classname of assault waypoint sprites to "sprite_waypoint" (instead of having its own classname). The waypoint code checks for the classname when disowning.

11 years agoset self.team of func_assault_destructible to the defending team, so defenders won...
Maik Merten [Thu, 5 Aug 2010 12:53:17 +0000 (14:53 +0200)]
set self.team of func_assault_destructible to the defending team, so defenders won't inflict damage on something they're supposed to protect.

11 years agomiddle mouse button and ctrl-space in the cvarlist dialog to revert a cvar value...
terencehill [Wed, 4 Aug 2010 19:55:43 +0000 (21:55 +0200)]
middle mouse button and ctrl-space in the cvarlist dialog  to revert a cvar value to its default
Useful when u want to revert a lot of cvars

11 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

11 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

11 years agofix the boxiness code :P
Rudolf Polzer [Wed, 4 Aug 2010 13:34:46 +0000 (15:34 +0200)]
fix the boxiness code :P

11 years agoproperly support "boxy" warpzones (mins/maxs override)
Rudolf Polzer [Wed, 4 Aug 2010 13:33:42 +0000 (15:33 +0200)]
properly support "boxy" warpzones (mins/maxs override)

11 years agoExactTrigger_Init: let map-specified mins/maxs override the setmodel ones, if nonzero
Rudolf Polzer [Wed, 4 Aug 2010 13:28:38 +0000 (15:28 +0200)]
ExactTrigger_Init: let map-specified mins/maxs override the setmodel ones, if nonzero

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/dtghook'
Rudolf Polzer [Wed, 4 Aug 2010 12:02:21 +0000 (14:02 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/dtghook'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/votesounds'
Rudolf Polzer [Wed, 4 Aug 2010 11:41:21 +0000 (13:41 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/votesounds'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/nexcubemap'
Rudolf Polzer [Wed, 4 Aug 2010 11:37:38 +0000 (13:37 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/nexcubemap'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitphys'
Rudolf Polzer [Wed, 4 Aug 2010 11:37:06 +0000 (13:37 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitphys'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/default_menuskin'
Rudolf Polzer [Wed, 4 Aug 2010 11:34:42 +0000 (13:34 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/default_menuskin'

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

11 years agoflip nexgun normalmap, add a reflect map, add normalmap for minstanex
FruitieX [Wed, 4 Aug 2010 11:10:40 +0000 (14:10 +0300)]
flip nexgun normalmap, add a reflect map, add normalmap for minstanex

11 years agodietunichguten hook texture by Fusselkroete
FruitieX [Wed, 4 Aug 2010 09:59:48 +0000 (12:59 +0300)]
dietunichguten hook texture by Fusselkroete

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

11 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

11 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

11 years agovote sounds by Tenshihan
FruitieX [Tue, 3 Aug 2010 13:01:24 +0000 (16:01 +0300)]
vote sounds by Tenshihan

11 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

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

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

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

11 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

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

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

11 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

11 years agoremove the nexuiz menu skins and rename "wickedx" to default. Leave xaw as it is.
FruitieX [Mon, 2 Aug 2010 11:04:10 +0000 (14:04 +0300)]
remove the nexuiz menu skins and rename "wickedx" to default. Leave xaw as it is.

11 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

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

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

11 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

11 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

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

11 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

11 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!

11 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

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

11 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

11 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

11 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

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

11 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

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

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

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

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

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

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

11 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

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

11 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

11 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

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

11 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

11 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

11 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

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

11 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

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

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

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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

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

11 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

11 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

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

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

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

11 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