xonotic/xonotic-data.pk3dir.git
5 years agoMerge branch 'master' into Mario/balance
Mario [Tue, 14 Jun 2016 13:37:15 +0000 (23:37 +1000)]
Merge branch 'master' into Mario/balance

5 years agoMerge branch 'Mario/entrap_nade' into 'master'
Mario [Tue, 14 Jun 2016 13:30:30 +0000 (13:30 +0000)]
Merge branch 'Mario/entrap_nade' into 'master'

Merge branch Mario/entrap_nade (M merge request)

Adds a new nade type; Entrap (slows down enemies that enter the large orb, lasts 10 seconds)

See merge request !324

5 years agoMerge branch 'master' into Mario/entrap_nade 324/head
Mario [Tue, 14 Jun 2016 12:58:50 +0000 (22:58 +1000)]
Merge branch 'master' into Mario/entrap_nade

5 years agoIncrease script portability
TimePath [Mon, 13 Jun 2016 12:03:36 +0000 (22:03 +1000)]
Increase script portability

5 years agoFix capture shield HUD
Mario [Mon, 13 Jun 2016 05:36:13 +0000 (15:36 +1000)]
Fix capture shield HUD

5 years agoAlways show the panel when a flag is shielded
Mario [Mon, 13 Jun 2016 05:20:27 +0000 (15:20 +1000)]
Always show the panel when a flag is shielded

5 years agos/world/NULL/
TimePath [Mon, 13 Jun 2016 04:34:40 +0000 (14:34 +1000)]
s/world/NULL/

5 years agoPrefer using droptofloor over builtin_droptofloor
TimePath [Mon, 13 Jun 2016 03:51:07 +0000 (13:51 +1000)]
Prefer using droptofloor over builtin_droptofloor

5 years agoAdd new nade to the cvar descriptions
Mario [Sun, 12 Jun 2016 18:30:42 +0000 (04:30 +1000)]
Add new nade to the cvar descriptions

5 years agoFix captureshield texture, also make entrap affect monsters
Mario [Sun, 12 Jun 2016 18:29:24 +0000 (04:29 +1000)]
Fix captureshield texture, also make entrap affect monsters

5 years agoMerge branch 'master' into Mario/entrap_nade
Mario [Sun, 12 Jun 2016 18:19:25 +0000 (04:19 +1000)]
Merge branch 'master' into Mario/entrap_nade

5 years agoUse a stock model to remain compatible with old clients
Mario [Sun, 12 Jun 2016 18:19:12 +0000 (04:19 +1000)]
Use a stock model to remain compatible with old clients

5 years agoMake orb visible from the inside, also show a tint to teammates who enter it
Mario [Sun, 12 Jun 2016 18:01:16 +0000 (04:01 +1000)]
Make orb visible from the inside, also show a tint to teammates who enter it

5 years agoFix bumblebee gunners
Mario [Sun, 12 Jun 2016 15:37:15 +0000 (01:37 +1000)]
Fix bumblebee gunners

5 years agoTidy up the setorigin calls a little
Mario [Sun, 12 Jun 2016 13:00:40 +0000 (23:00 +1000)]
Tidy up the setorigin calls a little

5 years agoRevert rollkill fix (breaks warpzones)
Mario [Sun, 12 Jun 2016 10:54:05 +0000 (20:54 +1000)]
Revert rollkill fix (breaks warpzones)

5 years agoReplace some more vlen checks with vdist and vlen2
Mario [Sun, 12 Jun 2016 06:05:43 +0000 (16:05 +1000)]
Replace some more vlen checks with vdist and vlen2

5 years agoApply new texture by -z-
Mario [Sun, 12 Jun 2016 05:49:15 +0000 (15:49 +1000)]
Apply new texture by -z-

5 years agoProfectile
Mario [Sun, 12 Jun 2016 05:15:44 +0000 (15:15 +1000)]
Profectile

5 years agoFix invisible devastator rockets
TimePath [Sun, 12 Jun 2016 04:01:13 +0000 (14:01 +1000)]
Fix invisible devastator rockets

5 years agoRemove uses of WITHSELF
TimePath [Sun, 12 Jun 2016 03:35:42 +0000 (13:35 +1000)]
Remove uses of WITHSELF

5 years agoMerge branch 'master' into Mario/entrap_nade
Mario [Sat, 11 Jun 2016 17:21:16 +0000 (03:21 +1000)]
Merge branch 'master' into Mario/entrap_nade

5 years agoFix a crash with nades
Mario [Sat, 11 Jun 2016 17:19:56 +0000 (03:19 +1000)]
Fix a crash with nades

5 years agoApply rough placeholder nade orb texture
Mario [Sat, 11 Jun 2016 16:40:37 +0000 (02:40 +1000)]
Apply rough placeholder nade orb texture

5 years agoManually rotate it
Mario [Sat, 11 Jun 2016 15:45:46 +0000 (01:45 +1000)]
Manually rotate it

5 years agoAdd defaults to the cvar definitions
Mario [Sat, 11 Jun 2016 15:04:39 +0000 (01:04 +1000)]
Add defaults to the cvar definitions

5 years agoMerge branch 'master' into Mario/entrap_nade
Mario [Sat, 11 Jun 2016 14:55:20 +0000 (00:55 +1000)]
Merge branch 'master' into Mario/entrap_nade

# Conflicts:
# qcsrc/common/mutators/mutator/nades/nades.qc

5 years agoStep 6: complete
TimePath [Sat, 11 Jun 2016 13:55:25 +0000 (23:55 +1000)]
Step 6: complete

5 years agoRemove some more unnecessary WITHSELFs
Mario [Sat, 11 Jun 2016 13:22:32 +0000 (23:22 +1000)]
Remove some more unnecessary WITHSELFs

5 years agoRemove a now unnecessary WITHSELF
Mario [Sat, 11 Jun 2016 13:15:40 +0000 (23:15 +1000)]
Remove a now unnecessary WITHSELF

5 years agoFix gameplay regression
TimePath [Sat, 11 Jun 2016 13:15:54 +0000 (23:15 +1000)]
Fix gameplay regression

5 years agoFix argument number, hopefully fixes crash
Mario [Sat, 11 Jun 2016 10:36:06 +0000 (20:36 +1000)]
Fix argument number, hopefully fixes crash

5 years agoWe still need WITHSELF on PutClientInServer...
Mario [Sat, 11 Jun 2016 09:37:40 +0000 (19:37 +1000)]
We still need WITHSELF on PutClientInServer...

5 years agoFix prediction of jumppads without targets
Mario [Sat, 11 Jun 2016 06:57:58 +0000 (16:57 +1000)]
Fix prediction of jumppads without targets

5 years agoNetwork movedir (should fix jumppads that don't use targets)
Mario [Sat, 11 Jun 2016 06:44:29 +0000 (16:44 +1000)]
Network movedir (should fix jumppads that don't use targets)

5 years agoFix a crash with sandbox
Mario [Sat, 11 Jun 2016 06:16:07 +0000 (16:16 +1000)]
Fix a crash with sandbox

5 years agoAdd a few more bulldozer levels
Mario [Sat, 11 Jun 2016 05:25:24 +0000 (15:25 +1000)]
Add a few more bulldozer levels

5 years agoAllow placing and controlling more than one dozer
Mario [Sat, 11 Jun 2016 04:44:42 +0000 (14:44 +1000)]
Allow placing and controlling more than one dozer

5 years agoPrevent save and fill commands from working when not in edit mode
Mario [Sat, 11 Jun 2016 04:20:44 +0000 (14:20 +1000)]
Prevent save and fill commands from working when not in edit mode

5 years agoCleanse PlayerRegen
Mario [Fri, 10 Jun 2016 18:33:41 +0000 (04:33 +1000)]
Cleanse PlayerRegen

5 years agoMake sure event_damage is set before calling it
Mario [Fri, 10 Jun 2016 18:12:46 +0000 (04:12 +1000)]
Make sure event_damage is set before calling it

5 years agoHopefully fix monster model detection
Mario [Fri, 10 Jun 2016 17:30:28 +0000 (03:30 +1000)]
Hopefully fix monster model detection

5 years agoAllow changing other/toucher from item and buff touch mutator hooks
Mario [Fri, 10 Jun 2016 16:32:50 +0000 (02:32 +1000)]
Allow changing other/toucher from item and buff touch mutator hooks

5 years agoAdd player argument to FixPlayermodel
Mario [Fri, 10 Jun 2016 15:54:55 +0000 (01:54 +1000)]
Add player argument to FixPlayermodel

5 years agoGive Weapon_ImpactEffect an argument for the effect entity
Mario [Fri, 10 Jun 2016 15:32:39 +0000 (01:32 +1000)]
Give Weapon_ImpactEffect an argument for the effect entity

5 years agoRemove a couple of missed WITHSELFs
Mario [Fri, 10 Jun 2016 14:55:14 +0000 (00:55 +1000)]
Remove a couple of missed WITHSELFs

5 years agoKill off some now useless WITHSELF cases
Mario [Fri, 10 Jun 2016 14:51:55 +0000 (00:51 +1000)]
Kill off some now useless WITHSELF cases

5 years agowr_resetplayer no longer needs WITHSELF
Mario [Fri, 10 Jun 2016 14:35:42 +0000 (00:35 +1000)]
wr_resetplayer no longer needs WITHSELF

5 years agoStep 5: complete
Mario [Fri, 10 Jun 2016 14:32:38 +0000 (00:32 +1000)]
Step 5: complete

5 years agoStep 4: complete
Mario [Fri, 10 Jun 2016 13:25:29 +0000 (23:25 +1000)]
Step 4: complete

5 years agoMake setself extinct
Mario [Fri, 10 Jun 2016 13:22:33 +0000 (23:22 +1000)]
Make setself extinct

5 years agoRemove unnecessary returns
Mario [Fri, 10 Jun 2016 13:18:32 +0000 (23:18 +1000)]
Remove unnecessary returns

5 years agoFix some mistakes
Mario [Fri, 10 Jun 2016 12:28:31 +0000 (22:28 +1000)]
Fix some mistakes

5 years agoFix compile
Mario [Fri, 10 Jun 2016 12:21:32 +0000 (22:21 +1000)]
Fix compile

5 years agoPurge WITHSELF from all non-engine functions
Mario [Fri, 10 Jun 2016 12:17:39 +0000 (22:17 +1000)]
Purge WITHSELF from all non-engine functions

5 years agoClean out some more SELFPARAMs
Mario [Fri, 10 Jun 2016 12:07:16 +0000 (22:07 +1000)]
Clean out some more SELFPARAMs

5 years agoEnable a Quake entity long since forgotten
Mario [Fri, 10 Jun 2016 11:59:40 +0000 (21:59 +1000)]
Enable a Quake entity long since forgotten

5 years agoRemove some more SELFPARAMs
Mario [Fri, 10 Jun 2016 11:58:37 +0000 (21:58 +1000)]
Remove some more SELFPARAMs

5 years agoCleanse vehicles of SELFPARAM
Mario [Fri, 10 Jun 2016 11:36:23 +0000 (21:36 +1000)]
Cleanse vehicles of SELFPARAM

5 years agoPurge SELFPARAM from the turret code
Mario [Fri, 10 Jun 2016 10:44:11 +0000 (20:44 +1000)]
Purge SELFPARAM from the turret code

5 years agoFinish off turret SELFPARAMs
Mario [Fri, 10 Jun 2016 10:37:33 +0000 (20:37 +1000)]
Finish off turret SELFPARAMs

5 years agoClean up some of the turret code's self uses
Mario [Fri, 10 Jun 2016 10:33:10 +0000 (20:33 +1000)]
Clean up some of the turret code's self uses

5 years agoClean out some waypoint sprite SELFPARAMs
Mario [Fri, 10 Jun 2016 10:05:27 +0000 (20:05 +1000)]
Clean out some waypoint sprite SELFPARAMs

5 years agoClean up some SELFPARAMs
Mario [Fri, 10 Jun 2016 09:57:48 +0000 (19:57 +1000)]
Clean up some SELFPARAMs

5 years agoCleanse GetPressedKeys
Mario [Fri, 10 Jun 2016 09:45:29 +0000 (19:45 +1000)]
Cleanse GetPressedKeys

5 years agoCleanse server client commands
Mario [Fri, 10 Jun 2016 09:35:31 +0000 (19:35 +1000)]
Cleanse server client commands

5 years agoFix up some #ifdef'd code
Mario [Fri, 10 Jun 2016 09:13:31 +0000 (19:13 +1000)]
Fix up some #ifdef'd code

5 years agoCleanse PlayerUseKey and PlayerPreThink
Mario [Fri, 10 Jun 2016 09:12:19 +0000 (19:12 +1000)]
Cleanse PlayerUseKey and PlayerPreThink

5 years agoCleanse the physics hooks
Mario [Fri, 10 Jun 2016 08:54:05 +0000 (18:54 +1000)]
Cleanse the physics hooks

5 years agoCleanse the last of the server side mutator hooks
Mario [Fri, 10 Jun 2016 08:34:27 +0000 (18:34 +1000)]
Cleanse the last of the server side mutator hooks

5 years agoKill the ret_string global
Mario [Fri, 10 Jun 2016 08:14:51 +0000 (18:14 +1000)]
Kill the ret_string global

5 years agoFix up even more mutators
Mario [Fri, 10 Jun 2016 07:11:01 +0000 (17:11 +1000)]
Fix up even more mutators

5 years agoFix up more mutator hooks
Mario [Fri, 10 Jun 2016 06:51:57 +0000 (16:51 +1000)]
Fix up more mutator hooks

5 years agoCleanse more of the mutator hooks
Mario [Fri, 10 Jun 2016 06:19:27 +0000 (16:19 +1000)]
Cleanse more of the mutator hooks

5 years agoPurge self from the damage/death mutator hooks
Mario [Fri, 10 Jun 2016 04:10:00 +0000 (14:10 +1000)]
Purge self from the damage/death mutator hooks

5 years agoPurify PutClientInServer and PlayerSpawn mutator hooks
Mario [Fri, 10 Jun 2016 02:30:42 +0000 (12:30 +1000)]
Purify PutClientInServer and PlayerSpawn mutator hooks

5 years agoFix output of announcer option mutator hook
Mario [Fri, 10 Jun 2016 02:12:16 +0000 (12:12 +1000)]
Fix output of announcer option mutator hook

5 years agoPort client mutator hooks to new arguments system
Mario [Fri, 10 Jun 2016 02:08:14 +0000 (12:08 +1000)]
Port client mutator hooks to new arguments system

5 years agoPurify PlayerDamage_Calculate
Mario [Thu, 9 Jun 2016 13:05:41 +0000 (23:05 +1000)]
Purify PlayerDamage_Calculate

5 years agoCleanse GetCvars
Mario [Thu, 9 Jun 2016 12:34:31 +0000 (22:34 +1000)]
Cleanse GetCvars

5 years agoRe-number mutator args to be more like varargs
TimePath [Thu, 9 Jun 2016 12:12:59 +0000 (22:12 +1000)]
Re-number mutator args to be more like varargs

5 years agoRemove even more self
Mario [Thu, 9 Jun 2016 11:45:49 +0000 (21:45 +1000)]
Remove even more self

5 years agoRemove selfparam from triggers
TimePath [Thu, 9 Jun 2016 11:44:22 +0000 (21:44 +1000)]
Remove selfparam from triggers

5 years agoFix a few more selfparam's randomly
Mario [Thu, 9 Jun 2016 11:34:36 +0000 (21:34 +1000)]
Fix a few more selfparam's randomly

5 years agoRemove unused function
Mario [Thu, 9 Jun 2016 11:21:26 +0000 (21:21 +1000)]
Remove unused function

5 years agoPurge self from playerdemo.qc
Mario [Thu, 9 Jun 2016 11:10:35 +0000 (21:10 +1000)]
Purge self from playerdemo.qc

5 years agoWrap customizeentityforclient
TimePath [Thu, 9 Jun 2016 10:54:19 +0000 (20:54 +1000)]
Wrap customizeentityforclient

5 years agoFix vaporizer missing its muzzle flash if the particle beam mode is enabled
Mario [Wed, 8 Jun 2016 10:11:23 +0000 (20:11 +1000)]
Fix vaporizer missing its muzzle flash if the particle beam mode is enabled

5 years agoMerge branch 'terencehill/dynamic_hud' into 'master'
Mario [Wed, 8 Jun 2016 09:31:19 +0000 (09:31 +0000)]
Merge branch 'terencehill/dynamic_hud' into 'master'

Dynamic hud

- hud_dynamic_follow: HUD moves around following player's movement (effect shared with cl_followmodel, can be enabled independently from it though)
- hud_dynamic_shake: shake the HUD when hurt

See merge request !293

5 years agoDon't do exact trigger checks if the activator is not a trigger, fixes button-activat...
Mario [Wed, 8 Jun 2016 09:25:43 +0000 (19:25 +1000)]
Don't do exact trigger checks if the activator is not a trigger, fixes button-activated target_items

5 years agoMerge branch 'terencehill/hud_smooth_weapon_switch' into 'master'
Mario [Wed, 8 Jun 2016 08:46:33 +0000 (08:46 +0000)]
Merge branch 'terencehill/hud_smooth_weapon_switch' into 'master'

Smooth selection change in the weapons panel, optionally with a nice lens effect

See merge request !321

5 years agoMerge branch 'terencehill/v_deathtilt_fix' into 'master'
Mario [Wed, 8 Jun 2016 08:39:57 +0000 (08:39 +0000)]
Merge branch 'terencehill/v_deathtilt_fix' into 'master'

v_deathtilt fix

See merge request !315

5 years agoMerge branch 'terencehill/respawn_timer_fix' into 'master'
Mario [Wed, 8 Jun 2016 08:38:41 +0000 (08:38 +0000)]
Merge branch 'terencehill/respawn_timer_fix' into 'master'

Respawn timer fix

Improve respawn timer when max respawn delay is higher than respawn delay

Example:
g_forced_respawn 1
g_respawn_delay_max 10
g_respawn_delay_small 7

* Current timer behaviour:

"You are dead, wait 10 seconds before respawning" (and counting down)
if you press the jump key after 4 seconds it changes to:
"Respawning in 6 seconds..."  (and counting down)
but you respawn when it shows:
"Respawning in 3 seconds..."

* New behaviour (fixed):

"You are dead, wait 7 seconds before respawning" (and counting down)
if you press the jump key after 4 seconds it changes to:
"Respawning in 3 seconds..."  (and counting down)
and you respawn when the countdown ends, as expected
if you let pass 7 seconds without pressing the jump key, it shows:
"Respawning in 3 seconds..." (and counting down)
and you respawn when the countdown ends, as expected

See merge request !319

5 years agoMerge branch 'terencehill/hud_no_joypad_keys' into 'master'
Mario [Wed, 8 Jun 2016 08:33:39 +0000 (08:33 +0000)]
Merge branch 'terencehill/hud_no_joypad_keys' into 'master'

Don't show joypad keys in the HUD if no joypad has been detected

See merge request !320

5 years agoRemove a now useless WITHSELF
Mario [Fri, 3 Jun 2016 08:53:16 +0000 (18:53 +1000)]
Remove a now useless WITHSELF

5 years agoFix func_pointparticles (draw function referencing self), solution found by Maddin
Mario [Thu, 2 Jun 2016 00:06:06 +0000 (10:06 +1000)]
Fix func_pointparticles (draw function referencing self), solution found by Maddin

5 years agoMove nexball eventchase handling into nexball file
Mario [Wed, 1 Jun 2016 04:39:43 +0000 (14:39 +1000)]
Move nexball eventchase handling into nexball file

5 years agoFix a reference to a nexball function outside nexball folder
Mario [Wed, 1 Jun 2016 04:34:36 +0000 (14:34 +1000)]
Fix a reference to a nexball function outside nexball folder

5 years agoRemove various SELFPARAM
TimePath [Sat, 28 May 2016 11:06:01 +0000 (21:06 +1000)]
Remove various SELFPARAM

5 years agoRemove weapon SELFPARAM
TimePath [Sat, 28 May 2016 09:58:43 +0000 (19:58 +1000)]
Remove weapon SELFPARAM