xonotic/xonotic-data.pk3dir.git
11 years agoserverbench: make it work
Rudolf Polzer [Sat, 4 Dec 2010 12:41:10 +0000 (13:41 +0100)]
serverbench: make it work

11 years agoalso expose the last zone
Rudolf Polzer [Sat, 4 Dec 2010 12:34:48 +0000 (13:34 +0100)]
also expose the last zone

11 years agowarpzonelib: expose WarpZone_trace_firstzone
Rudolf Polzer [Sat, 4 Dec 2010 12:33:16 +0000 (13:33 +0100)]
warpzonelib: expose WarpZone_trace_firstzone

11 years agotry renaming charge_pool to chargepool to make the cvar name a bit shorter
Rudolf Polzer [Sat, 4 Dec 2010 11:51:08 +0000 (12:51 +0100)]
try renaming charge_pool to chargepool to make the cvar name a bit shorter

11 years agomerge some changes from my autocvarizer branch that change nothing but make code...
Rudolf Polzer [Sat, 4 Dec 2010 11:36:37 +0000 (12:36 +0100)]
merge some changes from my autocvarizer branch that change nothing but make code a bit more consistent; also removes some debug stuff and renames a campingrifle cvar to be autocvarizable

11 years agostop firing seeker missiles if the owner switched to another gun
Rudolf Polzer [Sat, 4 Dec 2010 11:14:30 +0000 (12:14 +0100)]
stop firing seeker missiles if the owner switched to another gun

11 years agoseeker: make accel/decel consistent with rocket launcher and ticrate independent
Rudolf Polzer [Sat, 4 Dec 2010 11:13:47 +0000 (12:13 +0100)]
seeker: make accel/decel consistent with rocket launcher and ticrate independent

11 years agoup some projectile speeds
Rudolf Polzer [Sat, 4 Dec 2010 10:50:27 +0000 (11:50 +0100)]
up some projectile speeds

11 years agoCvar list dialog: hitting Enter on the listbox, or clicking a list item, transfers...
Rudolf Polzer [Fri, 3 Dec 2010 21:03:29 +0000 (22:03 +0100)]
Cvar list dialog: hitting Enter on the listbox, or clicking a list item, transfers focus to the cvar value text box

11 years agoincorporate Taoki's adjusted bloom/HDR defaults
Rudolf Polzer [Fri, 3 Dec 2010 19:26:35 +0000 (20:26 +0100)]
incorporate Taoki's adjusted bloom/HDR defaults

11 years agotry a possibly better way to identify changed files in QC source
Rudolf Polzer [Fri, 3 Dec 2010 19:24:15 +0000 (20:24 +0100)]
try a possibly better way to identify changed files in QC source

11 years agoMerge remote branch 'origin/fruitiex/menu-hud_damage'
Rudolf Polzer [Fri, 3 Dec 2010 07:31:23 +0000 (08:31 +0100)]
Merge remote branch 'origin/fruitiex/menu-hud_damage'

11 years agoMerge remote branch 'origin/fruitiex/xpm_stepheight_26'
Rudolf Polzer [Fri, 3 Dec 2010 07:30:55 +0000 (08:30 +0100)]
Merge remote branch 'origin/fruitiex/xpm_stepheight_26'

11 years agoMerge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Fri, 3 Dec 2010 07:30:32 +0000 (08:30 +0100)]
Merge remote branch 'origin/fruitiex/balance'

11 years agoMerge remote branch 'origin/morphed/mine'
Rudolf Polzer [Fri, 3 Dec 2010 07:28:25 +0000 (08:28 +0100)]
Merge remote branch 'origin/morphed/mine'

11 years agoMerge remote branch 'origin/diabolik/glow_erebus_screenie'
Rudolf Polzer [Fri, 3 Dec 2010 07:28:04 +0000 (08:28 +0100)]
Merge remote branch 'origin/diabolik/glow_erebus_screenie'

11 years agoallow tweaking hud_damage from the menu
FruitieX [Thu, 2 Dec 2010 22:25:56 +0000 (00:25 +0200)]
allow tweaking hud_damage from the menu

11 years agoprecache :P
FruitieX [Thu, 2 Dec 2010 21:40:24 +0000 (23:40 +0200)]
precache :P

11 years ago*sigh*
FruitieX [Thu, 2 Dec 2010 20:58:17 +0000 (22:58 +0200)]
*sigh*

11 years agomake it all cvarrable
FruitieX [Thu, 2 Dec 2010 20:28:20 +0000 (22:28 +0200)]
make it all cvarrable

11 years agotweak the glow
FruitieX [Thu, 2 Dec 2010 19:49:20 +0000 (21:49 +0200)]
tweak the glow

11 years agochange the glow on the nex depending on how charged it is (warning: looks pretty...
FruitieX [Thu, 2 Dec 2010 19:04:41 +0000 (21:04 +0200)]
change the glow on the nex depending on how charged it is (warning: looks pretty ugly currently with the blue colored background (only the glowmap should color it)

11 years agomake nex sound more badass when it's charged up
FruitieX [Thu, 2 Dec 2010 18:31:10 +0000 (20:31 +0200)]
make nex sound more badass when it's charged up

11 years agoMerge remote branch 'origin/master' into fruitiex/balance
FruitieX [Thu, 2 Dec 2010 14:08:05 +0000 (16:08 +0200)]
Merge remote branch 'origin/master' into fruitiex/balance

11 years agouse stepheight 26 also in XPM
FruitieX [Thu, 2 Dec 2010 14:04:43 +0000 (16:04 +0200)]
use stepheight 26 also in XPM

11 years agoScreenshot for glowing Erebus.
ssinghal [Thu, 2 Dec 2010 03:26:24 +0000 (22:26 -0500)]
Screenshot for glowing Erebus.

11 years agomortar_primary_speed += 100
FruitieX [Wed, 1 Dec 2010 21:47:54 +0000 (23:47 +0200)]
mortar_primary_speed += 100

11 years agothis mine is mine!
Morphed [Wed, 1 Dec 2010 20:44:53 +0000 (21:44 +0100)]
this mine is mine!

11 years agoMerge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Wed, 1 Dec 2010 20:14:41 +0000 (21:14 +0100)]
Merge remote branch 'origin/fruitiex/balance'

11 years agoMerge remote branch 'origin/fruitiex/cl_vyes'
Rudolf Polzer [Wed, 1 Dec 2010 20:14:31 +0000 (21:14 +0100)]
Merge remote branch 'origin/fruitiex/cl_vyes'

11 years agoMerge remote branch 'origin/fruitiex/perweap_xhair_centered'
Rudolf Polzer [Wed, 1 Dec 2010 20:13:36 +0000 (21:13 +0100)]
Merge remote branch 'origin/fruitiex/perweap_xhair_centered'

11 years agoMerge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Wed, 1 Dec 2010 20:13:31 +0000 (21:13 +0100)]
Merge remote branch 'origin/fruitiex/balance'

11 years agotweaks
FruitieX [Wed, 1 Dec 2010 19:52:36 +0000 (21:52 +0200)]
tweaks

11 years agouzi secondary = burst, let's try
FruitieX [Wed, 1 Dec 2010 19:41:06 +0000 (21:41 +0200)]
uzi secondary = burst, let's try

11 years agoRL still needs nerfing. edgedmg 33 -> 30, speeddaccel 1600 -> 1400, guiderate 45...
FruitieX [Wed, 1 Dec 2010 17:36:42 +0000 (19:36 +0200)]
RL still needs nerfing. edgedmg 33 -> 30, speeddaccel 1600 -> 1400, guiderate 45 -> 40 deg/s. remote dmg/edgedmg from 50/16.5 to 60/20 (it felt really weak before)

11 years agosame thing for electro, 100 dps -> 92 dps
FruitieX [Wed, 1 Dec 2010 17:31:24 +0000 (19:31 +0200)]
same thing for electro, 100 dps -> 92 dps

11 years agomortar primary speed 1500 -> 1400, it has to be nerfed just a bit according to stats
FruitieX [Wed, 1 Dec 2010 17:30:16 +0000 (19:30 +0200)]
mortar primary speed 1500 -> 1400, it has to be nerfed just a bit according to stats

11 years agohagar damage increased just a bit, radius lowered just a bit
FruitieX [Wed, 1 Dec 2010 17:29:16 +0000 (19:29 +0200)]
hagar damage increased just a bit, radius lowered just a bit

11 years agocrifle primary nerfed a bit
FruitieX [Wed, 1 Dec 2010 17:27:54 +0000 (19:27 +0200)]
crifle primary nerfed a bit

11 years agobeef up HLAC a bit
FruitieX [Wed, 1 Dec 2010 17:24:54 +0000 (19:24 +0200)]
beef up HLAC a bit

11 years agonex mindmg 30 -> 20
FruitieX [Wed, 1 Dec 2010 17:17:03 +0000 (19:17 +0200)]
nex mindmg 30 -> 20

11 years agoMerge remote branch 'origin/master' into fruitiex/balance
FruitieX [Wed, 1 Dec 2010 17:16:31 +0000 (19:16 +0200)]
Merge remote branch 'origin/master' into fruitiex/balance

11 years agofix naming and looped audio files
Rudolf Polzer [Wed, 1 Dec 2010 16:53:03 +0000 (17:53 +0100)]
fix naming and looped audio files

11 years agoMerge remote branch 'origin/samual/newsounds'
Rudolf Polzer [Wed, 1 Dec 2010 16:47:10 +0000 (17:47 +0100)]
Merge remote branch 'origin/samual/newsounds'

11 years agofix message spam and network spam from CTF flags. if we want to animate them, we...
Rudolf Polzer [Wed, 1 Dec 2010 08:47:51 +0000 (09:47 +0100)]
fix message spam and network spam from CTF flags. if we want to animate them, we do that via .framegroups file now.

11 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 1 Dec 2010 08:03:27 +0000 (09:03 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agofix a possible bug with player stats when they are NOT enabled
Rudolf Polzer [Wed, 1 Dec 2010 08:02:53 +0000 (09:02 +0100)]
fix a possible bug with player stats when they are NOT enabled

11 years agoremove center dot from laser crosshair
FruitieX [Tue, 30 Nov 2010 23:41:12 +0000 (01:41 +0200)]
remove center dot from laser crosshair

11 years agocenter RL crosshair
FruitieX [Tue, 30 Nov 2010 23:40:21 +0000 (01:40 +0200)]
center RL crosshair

11 years agostart by making the crosshair dot mirror perfectly around the center (had to expand...
FruitieX [Tue, 30 Nov 2010 23:37:28 +0000 (01:37 +0200)]
start by making the crosshair dot mirror perfectly around the center (had to expand by one pixel in X and Y)

11 years agodecrease secondary nex charge rate just slightly as an attempt to try to nerf it...
FruitieX [Tue, 30 Nov 2010 22:40:33 +0000 (00:40 +0200)]
decrease secondary nex charge rate just slightly as an attempt to try to nerf it... decrease charge pool ammo consumption to account for this

11 years agosome minor crylink improvements (in terms of damage, speed)
FruitieX [Tue, 30 Nov 2010 22:38:48 +0000 (00:38 +0200)]
some minor crylink improvements (in terms of damage, speed)

11 years agoMerge remote branch 'origin/fruitiex/arenafix'
Rudolf Polzer [Tue, 30 Nov 2010 20:37:22 +0000 (21:37 +0100)]
Merge remote branch 'origin/fruitiex/arenafix'

11 years agotypo
FruitieX [Tue, 30 Nov 2010 16:38:42 +0000 (18:38 +0200)]
typo

11 years agofreezetag: DEATH_HURTTRIGGER is still supposed to be lethal in any case
FruitieX [Tue, 30 Nov 2010 16:28:14 +0000 (18:28 +0200)]
freezetag: DEATH_HURTTRIGGER is still supposed to be lethal in any case

11 years agodo that in a bit of a cleaner manner (fixes CA which the previous change broke)
FruitieX [Tue, 30 Nov 2010 16:17:48 +0000 (18:17 +0200)]
do that in a bit of a cleaner manner (fixes CA which the previous change broke)

11 years agofix when to allow arena players to move again, also fix round countdown centerprints...
FruitieX [Tue, 30 Nov 2010 16:11:18 +0000 (18:11 +0200)]
fix when to allow arena players to move again, also fix round countdown centerprints so they are printed to every player (ps. all of this arena code is a HUGE MESS and needs fixing, but I don't want to touch it too much before the beta)

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/balance'
Rudolf Polzer [Tue, 30 Nov 2010 15:19:49 +0000 (16:19 +0100)]
Merge remote branch 'refs/remotes/origin/fruitiex/balance'

11 years agoMerge remote branch 'origin/fruitiex/freezetag_vs_keepaway'
Rudolf Polzer [Tue, 30 Nov 2010 15:07:31 +0000 (16:07 +0100)]
Merge remote branch 'origin/fruitiex/freezetag_vs_keepaway'

11 years agoUse PlayerDamage_Calculate in freezetag code
FruitieX [Tue, 30 Nov 2010 14:55:29 +0000 (16:55 +0200)]
Use PlayerDamage_Calculate in freezetag code

11 years agoMerge branch 'samual/keepaway' into fruitiex/freezetag_vs_keepaway
FruitieX [Tue, 30 Nov 2010 14:51:41 +0000 (16:51 +0200)]
Merge branch 'samual/keepaway' into fruitiex/freezetag_vs_keepaway

Conflicts:
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/common/util.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/server/defs.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc

11 years agoMerge branch 'master' into samual/keepaway
FruitieX [Tue, 30 Nov 2010 14:43:29 +0000 (16:43 +0200)]
Merge branch 'master' into samual/keepaway

11 years agoactually draw the freezetag text too :P
FruitieX [Tue, 30 Nov 2010 14:36:18 +0000 (16:36 +0200)]
actually draw the freezetag text too :P

11 years agomove freezetag specific damage/force code into a PlayerDamage hook, fix the mapinfo...
FruitieX [Tue, 30 Nov 2010 14:33:53 +0000 (16:33 +0200)]
move freezetag specific damage/force code into a PlayerDamage hook, fix the mapinfo display in the menu

11 years agoremove unused flag textures
Rudolf Polzer [Tue, 30 Nov 2010 14:20:42 +0000 (15:20 +0100)]
remove unused flag textures

11 years agomine layer: fix shader path :(
Rudolf Polzer [Tue, 30 Nov 2010 14:17:46 +0000 (15:17 +0100)]
mine layer: fix shader path :(

11 years agoMerge remote branch 'origin/morphed/flag'
Rudolf Polzer [Tue, 30 Nov 2010 14:14:17 +0000 (15:14 +0100)]
Merge remote branch 'origin/morphed/flag'

11 years agoMerge remote branch 'origin/morphed/minelayer'
Rudolf Polzer [Tue, 30 Nov 2010 14:14:02 +0000 (15:14 +0100)]
Merge remote branch 'origin/morphed/minelayer'

11 years agoMerge remote branch 'origin/tzork/projetiles'
Rudolf Polzer [Tue, 30 Nov 2010 14:13:55 +0000 (15:13 +0100)]
Merge remote branch 'origin/tzork/projetiles'

11 years agoMerge remote branch 'origin/master' into fruitiex/gamemode_freezetag
FruitieX [Tue, 30 Nov 2010 13:56:46 +0000 (15:56 +0200)]
Merge remote branch 'origin/master' into fruitiex/gamemode_freezetag

11 years agoadd back the comments
Rudolf Polzer [Tue, 30 Nov 2010 12:23:35 +0000 (13:23 +0100)]
add back the comments

11 years agoactually apply the physics cfg changes
Rudolf Polzer [Tue, 30 Nov 2010 12:21:33 +0000 (13:21 +0100)]
actually apply the physics cfg changes

11 years agoremove // TODO comments, they aren't TODO anymore
FruitieX [Tue, 30 Nov 2010 11:59:35 +0000 (13:59 +0200)]
remove // TODO comments, they aren't TODO anymore

11 years agocheck if cl_allow_uid2name == 1 (it's -1 at first...)
FruitieX [Tue, 30 Nov 2010 11:44:02 +0000 (13:44 +0200)]
check if cl_allow_uid2name == 1 (it's -1 at first...)

11 years agoalso use vyes/vno only when finding the keybind name
FruitieX [Tue, 30 Nov 2010 11:39:30 +0000 (13:39 +0200)]
also use vyes/vno only when finding the keybind name

11 years agojust use the old vyes/vno aliases when binding, but let them instead execute cl_cmd...
FruitieX [Tue, 30 Nov 2010 11:30:29 +0000 (13:30 +0200)]
just use the old vyes/vno aliases when binding, but let them instead execute cl_cmd vyes and vno. CSQC code then either sets the uid2name cvar, or executes "cmd vote yes/no"

11 years agoMerge remote branch 'origin/master' into fruitiex/cl_vyes
FruitieX [Tue, 30 Nov 2010 11:19:13 +0000 (13:19 +0200)]
Merge remote branch 'origin/master' into fruitiex/cl_vyes

11 years agofix & cleanup cl_vyes
FruitieX [Tue, 30 Nov 2010 11:18:55 +0000 (13:18 +0200)]
fix & cleanup cl_vyes

11 years agooops, didn't want to merge this... reverting
Rudolf Polzer [Tue, 30 Nov 2010 11:16:10 +0000 (12:16 +0100)]
oops, didn't want to merge this... reverting

11 years agoMerge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Tue, 30 Nov 2010 11:15:34 +0000 (12:15 +0100)]
Merge remote branch 'origin/fruitiex/balance'

11 years agonew configs by LeeStricklin
Rudolf Polzer [Tue, 30 Nov 2010 11:13:18 +0000 (12:13 +0100)]
new configs by LeeStricklin

11 years agoMerge remote branch 'origin/fruitiex/cuinnton_credits'
Rudolf Polzer [Mon, 29 Nov 2010 21:33:37 +0000 (22:33 +0100)]
Merge remote branch 'origin/fruitiex/cuinnton_credits'

11 years agoMerge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Mon, 29 Nov 2010 21:33:12 +0000 (22:33 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'

11 years agominelayer model with placeholder texture
Morphed [Mon, 29 Nov 2010 20:32:48 +0000 (21:32 +0100)]
minelayer model with placeholder texture

11 years agoshow the dot color correctly in the menu preview as well
FruitieX [Mon, 29 Nov 2010 18:57:22 +0000 (20:57 +0200)]
show the dot color correctly in the menu preview as well

11 years agomake an awesome crosshair default ;)
FruitieX [Mon, 29 Nov 2010 18:51:29 +0000 (20:51 +0200)]
make an awesome crosshair default ;)

11 years agoMerge branch 'fruitiex/custom_xhair_dot_color' into fruitiex/panelhud
FruitieX [Mon, 29 Nov 2010 18:46:28 +0000 (20:46 +0200)]
Merge branch 'fruitiex/custom_xhair_dot_color' into fruitiex/panelhud

11 years agoluminos_xhair hud config, plus bunch of code changes to make it possible
FruitieX [Mon, 29 Nov 2010 18:45:37 +0000 (20:45 +0200)]
luminos_xhair hud config, plus bunch of code changes to make it possible

11 years agoallow hiding text in these cases too
FruitieX [Mon, 29 Nov 2010 17:28:49 +0000 (19:28 +0200)]
allow hiding text in these cases too

11 years agofix typo, allow disabling the border code and just drawing the border image by means...
FruitieX [Mon, 29 Nov 2010 17:17:52 +0000 (19:17 +0200)]
fix typo, allow disabling the border code and just drawing the border image by means of simple stretching (by setting the border size negative)

11 years agoallow changing the progressbar per-panel-item
FruitieX [Mon, 29 Nov 2010 16:46:18 +0000 (18:46 +0200)]
allow changing the progressbar per-panel-item

11 years agoinstead of stretching the status bar image, drawsetclip it. Big cleanup in status...
FruitieX [Mon, 29 Nov 2010 16:24:15 +0000 (18:24 +0200)]
instead of stretching the status bar image, drawsetclip it. Big cleanup in status bar related code

11 years agocustom max values for the health/armor status bars
FruitieX [Mon, 29 Nov 2010 10:10:11 +0000 (12:10 +0200)]
custom max values for the health/armor status bars

11 years agoMerge remote branch 'origin/savagex/assault-centerprint'
Rudolf Polzer [Mon, 29 Nov 2010 09:52:33 +0000 (10:52 +0100)]
Merge remote branch 'origin/savagex/assault-centerprint'

11 years agohud_luminos_minimal.cfg
FruitieX [Mon, 29 Nov 2010 09:47:51 +0000 (11:47 +0200)]
hud_luminos_minimal.cfg

11 years agoMerge remote branch 'origin/tzork/moveturrets-fix'
Rudolf Polzer [Mon, 29 Nov 2010 09:38:44 +0000 (10:38 +0100)]
Merge remote branch 'origin/tzork/moveturrets-fix'

11 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Mon, 29 Nov 2010 08:07:01 +0000 (03:07 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

11 years agoLots and lots of updates, mainly involving spectators (waypoints are now not shown...
unknown [Mon, 29 Nov 2010 08:01:35 +0000 (03:01 -0500)]
Lots and lots of updates, mainly involving spectators (waypoints are now not shown to someone who is spectating the ballcarrier), the HUD (fixed an issue where scoreboard would re-play the ball pickup animation), ball size (It was too large and would get stuck in walls) and powerups (especially powerup effects, don't show a waypoint for ballcarrier who has invisibility) --- Still much more to be done, but this is a huge step forward

11 years agoinitial player stats system (reports total "alive time" and kills to a stats server...
Rudolf Polzer [Sun, 28 Nov 2010 17:39:40 +0000 (18:39 +0100)]
initial player stats system (reports total "alive time" and kills to a stats server via HTTP)

11 years agocenterprint self.message for done objectives to keep players informed
Maik Merten [Sun, 28 Nov 2010 14:12:06 +0000 (15:12 +0100)]
centerprint self.message for done objectives to keep players informed