xonotic/xonotic-data.pk3dir.git
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 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 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 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 agoI HATE THIS CRLF MESS
Rudolf Polzer [Fri, 13 Aug 2010 13:00:56 +0000 (15:00 +0200)]
I HATE THIS CRLF MESS

11 years agolet's try Q3A's stepheight and see what breaks
Rudolf Polzer [Fri, 13 Aug 2010 12:03:33 +0000 (14:03 +0200)]
let's try Q3A's stepheight and see what breaks

11 years agomenu track := rising-of-the-phoenix
Rudolf Polzer [Fri, 13 Aug 2010 10:05:54 +0000 (12:05 +0200)]
menu track := rising-of-the-phoenix

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 agoremove unused cvar
FruitieX [Mon, 9 Aug 2010 13:04:32 +0000 (16:04 +0300)]
remove unused cvar

11 years agoremove debug print
FruitieX [Mon, 9 Aug 2010 12:54:21 +0000 (15:54 +0300)]
remove debug print

11 years agovarious improvements
FruitieX [Mon, 9 Aug 2010 12:53:00 +0000 (15:53 +0300)]
various improvements

11 years agoallow "dodging" at a multijump
FruitieX [Mon, 9 Aug 2010 12:01:25 +0000 (15:01 +0300)]
allow "dodging" at a multijump

11 years agoMerge branch 'master' into mirceakitsune/multijump
FruitieX [Mon, 9 Aug 2010 11:27:26 +0000 (14:27 +0300)]
Merge branch 'master' into mirceakitsune/multijump

Conflicts:
qcsrc/server/cl_physics.qc

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 agoMerge branch 'terencehill/newpanelhud' into fruitiex/newpanelhud
FruitieX [Wed, 4 Aug 2010 16:18:40 +0000 (19:18 +0300)]
Merge branch 'terencehill/newpanelhud' into fruitiex/newpanelhud

11 years agoMerge remote branch 'origin/master' into terencehill/newpanelhud
FruitieX [Wed, 4 Aug 2010 16:17:07 +0000 (19:17 +0300)]
Merge remote branch 'origin/master' into terencehill/newpanelhud

11 years agofix team score
FruitieX [Wed, 4 Aug 2010 16:16:18 +0000 (19:16 +0300)]
fix team score

11 years agoupdate hud_default.cfg as well
FruitieX [Wed, 4 Aug 2010 16:02:28 +0000 (19:02 +0300)]
update hud_default.cfg as well

11 years agoshow the infomessages panel at all times, move it a little bit in luminos
FruitieX [Wed, 4 Aug 2010 16:01:41 +0000 (19:01 +0300)]
show the infomessages panel at all times, move it a little bit in luminos

11 years agono newline for the ping status to fit it all on 2 lines
FruitieX [Wed, 4 Aug 2010 15:43:33 +0000 (18:43 +0300)]
no newline for the ping status to fit it all on 2 lines

11 years agoactually, fit in 2 lines of centerprint in the scoreboard since the new info wont...
FruitieX [Wed, 4 Aug 2010 15:29:43 +0000 (18:29 +0300)]
actually, fit in 2 lines of centerprint in the scoreboard since the new info wont fit in otherwise

11 years agoprint notifications to con_notify by default
FruitieX [Wed, 4 Aug 2010 15:22:27 +0000 (18:22 +0300)]
print notifications to con_notify by default

11 years agoput centerprints at bottom of scoreboard if more than 1 lines are being drawn
FruitieX [Wed, 4 Aug 2010 15:21:32 +0000 (18:21 +0300)]
put centerprints at bottom of scoreboard if more than 1 lines are being drawn

11 years agofix a load of things concerning the scoreboard, leftalign scoreboard, make centerprin...
FruitieX [Wed, 4 Aug 2010 14:57:55 +0000 (17:57 +0300)]
fix a load of things concerning the scoreboard, leftalign scoreboard, make centerprints static, move centerprints to another static position when the scoreboard is open. TODO: MOTD must be moved

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 agofix a weird bug
FruitieX [Wed, 4 Aug 2010 12:20:33 +0000 (15:20 +0300)]
fix a weird bug

11 years agotelefrag notify code + placeholder telefrag icon
FruitieX [Wed, 4 Aug 2010 12:03:16 +0000 (15:03 +0300)]
telefrag notify code + placeholder telefrag icon

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 agofix powerups panel showing no border in hud conf mode
terencehill [Sun, 1 Aug 2010 20:34:14 +0000 (22:34 +0200)]
fix powerups panel showing no border in hud conf mode

11 years agoMake weapons panel automatically disappear
terencehill [Sun, 1 Aug 2010 20:24:09 +0000 (22:24 +0200)]
Make weapons panel automatically disappear
hud_panel_weapons_timeout "10" "panel disappears if you don't switch weapon for this amount of seconds"
hud_panel_weapons_timeout_effect "1" "disappearance effect: 0) no effect; 1) panel moves out of screen; 2) panel fades out"

Note: I had to use panel_pos and panel_size instead of pos and mySize to make properly work HUD_Panel_DrawBg(1);. Actually, it's even a good thing as pos and mySize aren't really needed... (like in every other panel, btw).

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