xonotic/xonotic-data.pk3dir.git
11 years agoMerge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
Rudolf Polzer [Thu, 19 Aug 2010 04:21:10 +0000 (06:21 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

11 years agoMerge remote branch 'remotes/origin/terencehill/misc_bugfixes' into terencehill/misc_...
terencehill [Wed, 18 Aug 2010 22:46:37 +0000 (00:46 +0200)]
Merge remote branch 'remotes/origin/terencehill/misc_bugfixes' into terencehill/misc_bugfixes

11 years agoremove some stupid setsize calls from func_breakable, Someple please test this.
Rudolf Polzer [Wed, 18 Aug 2010 18:52:26 +0000 (20:52 +0200)]
remove some stupid setsize calls from func_breakable, Someple please test this.

11 years agofix electro beam drawing through warpzone
Rudolf Polzer [Wed, 18 Aug 2010 18:44:31 +0000 (20:44 +0200)]
fix electro beam drawing through warpzone

11 years agooptimize more warpzone functions if no WZs exist
Rudolf Polzer [Wed, 18 Aug 2010 18:44:54 +0000 (20:44 +0200)]
optimize more warpzone functions if no WZs exist

11 years agofix compile errors
Rudolf Polzer [Wed, 18 Aug 2010 18:44:48 +0000 (20:44 +0200)]
fix compile errors

11 years agofix some hardcoded ticrates
Rudolf Polzer [Wed, 18 Aug 2010 12:49:20 +0000 (14:49 +0200)]
fix some hardcoded ticrates

11 years agooh no! more crlf-mings
Rudolf Polzer [Tue, 17 Aug 2010 16:52:09 +0000 (18:52 +0200)]
oh no! more crlf-mings

11 years agoRemove unnecessary checks...
terencehill [Sun, 15 Aug 2010 22:04:51 +0000 (00:04 +0200)]
Remove unnecessary checks...
Now that match_pattern on the engine works well on *.* patterns too, for now on we can trust search_begin.

11 years agoMinor cleanups:
terencehill [Sun, 15 Aug 2010 21:35:34 +0000 (23:35 +0200)]
Minor cleanups:
- add ... to the Waypoints Setup button label
- remove unneeded TDempty and TR
- place the frequency textlabel in a more "standard" way

11 years agoReflect cvar name change in the menu too: host_sleep --> cl_maxfps_alwayssleep
terencehill [Sun, 15 Aug 2010 21:01:36 +0000 (23:01 +0200)]
Reflect cvar name change in the menu too: host_sleep --> cl_maxfps_alwayssleep

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'
Rudolf Polzer [Sun, 15 Aug 2010 18:51:28 +0000 (20:51 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'

11 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Sun, 15 Aug 2010 18:42:53 +0000 (21:42 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

11 years agouse the cvar values instead of "1" :P
FruitieX [Sun, 15 Aug 2010 18:42:33 +0000 (21:42 +0300)]
use the cvar values instead of "1" :P

11 years agoalways draw the vote panel
FruitieX [Sun, 15 Aug 2010 18:31:08 +0000 (21:31 +0300)]
always draw the vote panel

11 years agodraw voteprogress pics with RGB '1 1 1'
FruitieX [Sun, 15 Aug 2010 18:27:35 +0000 (21:27 +0300)]
draw voteprogress pics with RGB '1 1 1'

11 years agoremove lots of useless Nexuiz junk from the makefile
Rudolf Polzer [Sun, 15 Aug 2010 12:55:45 +0000 (14:55 +0200)]
remove lots of useless Nexuiz junk from the makefile

11 years agoalso properly calc WarpZone_TraceToss_velocity
Rudolf Polzer [Sun, 15 Aug 2010 12:51:52 +0000 (14:51 +0200)]
also properly calc WarpZone_TraceToss_velocity

11 years agofix calculation of WarpZone_TraceToss_time if no warpzones exist
Rudolf Polzer [Sun, 15 Aug 2010 12:48:21 +0000 (14:48 +0200)]
fix calculation of WarpZone_TraceToss_time if no warpzones exist

11 years agotry negative push on CL secondary instead :P
Rudolf Polzer [Sun, 15 Aug 2010 12:40:39 +0000 (14:40 +0200)]
try negative push on CL secondary instead :P

11 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Sun, 15 Aug 2010 12:35:08 +0000 (14:35 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance'

11 years agowoops let the scoreboard fade out the team radar as well
FruitieX [Sun, 15 Aug 2010 11:59:08 +0000 (14:59 +0300)]
woops let the scoreboard fade out the team radar as well

11 years agoadd num_leading back to the old skin, and fix the maximized chat panel bg
FruitieX [Sun, 15 Aug 2010 11:53:34 +0000 (14:53 +0300)]
add num_leading back to the old skin, and fix the maximized chat panel bg

11 years agoold hud skin updates
FruitieX [Sun, 15 Aug 2010 11:38:48 +0000 (14:38 +0300)]
old hud skin updates

11 years agofix another dock related quirk, update the new luminos icons in default
FruitieX [Sun, 15 Aug 2010 11:25:43 +0000 (14:25 +0300)]
fix another dock related quirk, update the new luminos icons in default

11 years agoclear up the dock naming
FruitieX [Sun, 15 Aug 2010 11:18:55 +0000 (14:18 +0300)]
clear up the dock naming

11 years agobugfix
FruitieX [Sun, 15 Aug 2010 11:15:51 +0000 (14:15 +0300)]
bugfix

11 years agosome cleaning up
FruitieX [Sun, 15 Aug 2010 10:59:09 +0000 (13:59 +0300)]
some cleaning up

11 years agoadd fade stuff to the menu, make default fade at 3 sec
FruitieX [Sun, 15 Aug 2010 10:20:57 +0000 (13:20 +0300)]
add fade stuff to the menu, make default fade at 3 sec

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 agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Sun, 15 Aug 2010 06:47:26 +0000 (09:47 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

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 agocrylink nerf
FruitieX [Sat, 14 Aug 2010 18:10:11 +0000 (21:10 +0300)]
crylink nerf

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 agopositive push force on crylink primary
FruitieX [Sat, 14 Aug 2010 15:46:51 +0000 (18:46 +0300)]
positive push force on crylink primary

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 agofix captured dom cp message
terencehill [Fri, 13 Aug 2010 18:20:21 +0000 (20:20 +0200)]
fix captured dom cp message

11 years agoFix wrong cvar name...
terencehill [Fri, 13 Aug 2010 18:06:55 +0000 (20:06 +0200)]
Fix wrong cvar name...
autocvar_hud_color_bg_team  -->  autocvar_scoreboard_color_bg_team

11 years agoUse hud_color_bg_team only in team games
terencehill [Fri, 13 Aug 2010 17:33:44 +0000 (19:33 +0200)]
Use hud_color_bg_team only in team games

Small indentation corrections

11 years agoFix incorrect scoreboard layout with certain configs
terencehill [Fri, 13 Aug 2010 15:27:03 +0000 (17:27 +0200)]
Fix incorrect scoreboard layout with certain configs
Examples:
scoreboard_columns_set  name ping | score   -->  the fields ping and score overlap
scoreboard_columns_set  name ping score |   -->  the field score goes beyond the scoreboard table

This bug was introduced by the utf8 related changes.

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