xonotic/xonotic-data.pk3dir.git
10 years agofix the finish CTS kill delay
FruitieX [Wed, 8 Dec 2010 13:50:31 +0000 (15:50 +0200)]
fix the finish CTS kill delay

10 years agotry fixing g_campaign_forceteam too (off by default)
Rudolf Polzer [Tue, 7 Dec 2010 10:19:38 +0000 (11:19 +0100)]
try fixing g_campaign_forceteam too (off by default)

10 years agoMerge remote branch 'origin/fruitiex/campaign'
Rudolf Polzer [Tue, 7 Dec 2010 10:08:31 +0000 (11:08 +0100)]
Merge remote branch 'origin/fruitiex/campaign'

10 years agomake team/invert logic identical to most other ents for trigger_multiple
Rudolf Polzer [Mon, 6 Dec 2010 11:28:26 +0000 (12:28 +0100)]
make team/invert logic identical to most other ents for trigger_multiple

10 years agosimplify a bit
Rudolf Polzer [Mon, 6 Dec 2010 10:49:26 +0000 (11:49 +0100)]
simplify a bit

10 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Mon, 6 Dec 2010 08:42:02 +0000 (09:42 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

10 years agoMerge remote branch 'origin/terencehill/crosshair_colors'
Rudolf Polzer [Mon, 6 Dec 2010 08:41:56 +0000 (09:41 +0100)]
Merge remote branch 'origin/terencehill/crosshair_colors'

10 years agowhat the crap? WHY OH WHY are the teams even forced in campaign?
FruitieX [Sun, 5 Dec 2010 22:29:28 +0000 (00:29 +0200)]
what the crap? WHY OH WHY are the teams even forced in campaign?

10 years agoRevert "This seems to fix team modes in campaign. Yay." - No it didn't
FruitieX [Sun, 5 Dec 2010 22:23:50 +0000 (00:23 +0200)]
Revert "This seems to fix team modes in campaign. Yay." - No it didn't

This reverts commit 14800edad1a4c4e2e08ec6a2257184ea2f396d23.

10 years agoThis seems to fix team modes in campaign. Yay.
FruitieX [Sun, 5 Dec 2010 21:39:15 +0000 (23:39 +0200)]
This seems to fix team modes in campaign. Yay.

10 years agoremove the CTF win mode autocvar, not needed
Rudolf Polzer [Sun, 5 Dec 2010 20:47:23 +0000 (21:47 +0100)]
remove the CTF win mode autocvar, not needed

10 years agofix mess from last commit
Rudolf Polzer [Sun, 5 Dec 2010 20:45:08 +0000 (21:45 +0100)]
fix mess from last commit

10 years agoeliminate the g_ctf_win_mode global; campaign uses default win mode now
Rudolf Polzer [Sun, 5 Dec 2010 20:44:02 +0000 (21:44 +0100)]
eliminate the g_ctf_win_mode global; campaign uses default win mode now

10 years agofix "delay" not copying target2 to target4
Rudolf Polzer [Sun, 5 Dec 2010 20:12:02 +0000 (21:12 +0100)]
fix "delay" not copying target2 to target4

10 years agosupport ready-restart with the toggling speaker target
Rudolf Polzer [Sun, 5 Dec 2010 17:29:42 +0000 (18:29 +0100)]
support ready-restart with the toggling speaker target

10 years agoclean up SetMovedir related code a little
Rudolf Polzer [Sun, 5 Dec 2010 16:12:19 +0000 (17:12 +0100)]
clean up SetMovedir related code a little

10 years agofix a compile error
Rudolf Polzer [Sun, 5 Dec 2010 15:44:12 +0000 (16:44 +0100)]
fix a compile error

10 years agobetter target_speaker support
Rudolf Polzer [Sun, 5 Dec 2010 14:01:35 +0000 (15:01 +0100)]
better target_speaker support

10 years agomake similar balance changes to tZork's as I did to FruitieX's (namely, faster HLAC...
Rudolf Polzer [Sat, 4 Dec 2010 21:15:31 +0000 (22:15 +0100)]
make similar balance changes to tZork's as I did to FruitieX's (namely, faster HLAC and slightly faster seeker missiles)

10 years agonow REALLY stop bullets on weapclip
Rudolf Polzer [Sat, 4 Dec 2010 19:14:13 +0000 (20:14 +0100)]
now REALLY stop bullets on weapclip

10 years agoMerge branch 'master' into terencehill/crosshair_colors
terencehill [Sat, 4 Dec 2010 19:11:03 +0000 (20:11 +0100)]
Merge branch 'master' into terencehill/crosshair_colors

10 years agonothing uses cl_userid any more, so remove the cvar
Rudolf Polzer [Sat, 4 Dec 2010 18:35:40 +0000 (19:35 +0100)]
nothing uses cl_userid any more, so remove the cvar

10 years agofix MIME type
Rudolf Polzer [Sat, 4 Dec 2010 18:27:58 +0000 (19:27 +0100)]
fix MIME type

10 years agotemporary hack: a cvar "popcon" - transmits info to our server about which cvars...
Rudolf Polzer [Sat, 4 Dec 2010 17:32:09 +0000 (18:32 +0100)]
temporary hack: a cvar "popcon" - transmits info to our server about which cvars have been changed from default and which not. Should help with later tuning the menu option choice.

10 years agoMerge remote branch 'origin/fruitiex/glowmodreset'
Rudolf Polzer [Sat, 4 Dec 2010 15:23:38 +0000 (16:23 +0100)]
Merge remote branch 'origin/fruitiex/glowmodreset'

Conflicts:
qcsrc/server/w_nex.qc

10 years agoAutocvarize SVQC and CSQC. 20% less CPU usage of dedicated servers with bots. Large...
Rudolf Polzer [Sat, 4 Dec 2010 15:21:48 +0000 (16:21 +0100)]
Autocvarize SVQC and CSQC. 20% less CPU usage of dedicated servers with bots. Large changes, although none in behaviour. Please test! (Better to do this BEFORE the alpha...)

10 years agoremove unused/unneeded stuff
Rudolf Polzer [Sat, 4 Dec 2010 14:26:53 +0000 (15:26 +0100)]
remove unused/unneeded stuff

10 years agoimport more changes from the autocvars branch
Rudolf Polzer [Sat, 4 Dec 2010 14:20:04 +0000 (15:20 +0100)]
import more changes from the autocvars branch

10 years agorename teamplay_default to teamplay_mode, stop using the "teamplay" cvar (more cleanu...
Rudolf Polzer [Sat, 4 Dec 2010 14:10:27 +0000 (15:10 +0100)]
rename teamplay_default to teamplay_mode, stop using the "teamplay" cvar (more cleanup), use "teams_matter" where needed

10 years agochange many uses of the teamplay cvar to teams_matter
Rudolf Polzer [Sat, 4 Dec 2010 13:53:53 +0000 (14:53 +0100)]
change many uses of the teamplay cvar to teams_matter

10 years agoremove "poor man's autocvars" in sv_main.qc
Rudolf Polzer [Sat, 4 Dec 2010 13:50:21 +0000 (14:50 +0100)]
remove "poor man's autocvars" in sv_main.qc

10 years agoclean up some cvar uses
Rudolf Polzer [Sat, 4 Dec 2010 13:38:25 +0000 (14:38 +0100)]
clean up some cvar uses

10 years agoconfig fixes
Rudolf Polzer [Sat, 4 Dec 2010 12:44:53 +0000 (13:44 +0100)]
config fixes

10 years agoserverbench: make it work
Rudolf Polzer [Sat, 4 Dec 2010 12:41:10 +0000 (13:41 +0100)]
serverbench: make it work

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

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

10 years agoreset the weapon glowmod each frame before the WR_THINK function, let WR_THINK functi...
FruitieX [Sat, 4 Dec 2010 12:11:54 +0000 (14:11 +0200)]
reset the weapon glowmod each frame before the WR_THINK function, let WR_THINK function eventually set it

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

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

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

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

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

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

10 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

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

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

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

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

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

10 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

10 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

10 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

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

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

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

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

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

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

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

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

10 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

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

10 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

10 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

10 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

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

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

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

10 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

10 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

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

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

10 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

10 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

10 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

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

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

10 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

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

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

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

10 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

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

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

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

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

10 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

10 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

10 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

10 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

10 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

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

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