Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Fri, 31 Jul 2015 09:45:40 +0000 (19:45 +1000)
committerMario <zacjardine@y7mail.com>
Fri, 31 Jul 2015 09:45:40 +0000 (19:45 +1000)
# Conflicts:
# qcsrc/common/stats.qh
# qcsrc/server/autocvars.qh
# qcsrc/server/g_damage.qc
# qcsrc/server/mutators/mutator_buffs.qc
# qcsrc/server/mutators/mutator_buffs.qh

16 files changed:
1  2 
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/common/buffs.qh
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/common/weapons/w_devastator.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/aim.qc
qcsrc/server/g_damage.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_buffs.qh
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponsystem.qc
qcsrc/warpzonelib/mathlib.qc
qcsrc/warpzonelib/mathlib.qh

Simple merge
Simple merge
Simple merge
index bebf5ec59ac2808068a916bfba1da9f6ffc2a999,f3437326365b87fe22d91b1250a90d7019e59498..bf388df65040453c3ea060554962a97228eb47dd
@@@ -1,10 -1,9 +1,13 @@@
  #ifndef BUFFS_H
  #define BUFFS_H
 +// Welcome to the stuff behind the scenes
 +// Below, you will find the list of buffs
 +// Add new buffs here!
 +// Note: Buffs also need spawnfuncs, which are set below
  
+ #include "teams.qh"
+ #include "util.qh"
  entity Buff_Type_first;
  entity Buff_Type_last;
  .entity enemy; // internal next pointer
Simple merge
index 8f68bafbc89bc5992713358468efe8a1d58dab7a,b488df1cfd709edacf36401d42990adbd4f4ed93..e6e93a6608fbd9a89108c3557011f5be2cba8168
@@@ -92,9 -107,9 +107,9 @@@ const int STAT_HEALING_ORB_ALPHA      
  const int STAT_PLASMA                 = 84;
  const int STAT_OK_AMMO_CHARGE         = 85;
  const int STAT_OK_AMMO_CHARGEPOOL     = 86;
- const int STAT_BUFF_TIME              = 87;
- // 88 empty?
- // 89 empty?
+ const int STAT_FROZEN                 = 87;
+ const int STAT_REVIVE_PROGRESS        = 88;
 -// 89 empty?
++const int STAT_BUFF_TIME              = 89;
  // 90 empty?
  // 91 empty?
  // 92 empty?
Simple merge
index e4f02cd90eab5d7dbe1e4e772ccc31e6814d3ff9,51b14aa0812e2c2af73a354b7cd204608beb736c..fdb014710b16d6f513f2c09d57a39c899dfca735
@@@ -849,19 -831,21 +831,22 @@@ bool autocvar_g_overkill_ammo_charge
  float autocvar_g_overkill_ammo_charge_notice;
  float autocvar_g_overkill_ammo_charge_limit;
  float autocvar_g_spawn_near_teammate_distance;
float autocvar_g_spawn_near_teammate_ignore_spawnpoint;
bool autocvar_g_spawn_near_teammate_ignore_spawnpoint;
  float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay;
  float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death;
- float autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health;
- float autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath;
+ int autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health;
+ bool autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath;
+ bool autocvar_g_physics_clientselect;
+ string autocvar_g_physics_clientselect_options;
+ string autocvar_g_physics_clientselect_default;
 +bool  autocvar_g_buffs_effects;
  float autocvar_g_buffs_waypoint_distance;
float autocvar_g_buffs_randomize;
bool autocvar_g_buffs_randomize;
  float autocvar_g_buffs_random_lifetime;
float autocvar_g_buffs_random_location;
float autocvar_g_buffs_random_location_attempts;
float autocvar_g_buffs_spawn_count;
float autocvar_g_buffs_replace_powerups;
bool autocvar_g_buffs_random_location;
int autocvar_g_buffs_random_location_attempts;
int autocvar_g_buffs_spawn_count;
bool autocvar_g_buffs_replace_powerups;
  float autocvar_g_buffs_cooldown_activate;
  float autocvar_g_buffs_cooldown_respawn;
  float autocvar_g_buffs_resistance_blockpercent;
@@@ -886,11 -868,5 +871,12 @@@ float autocvar_g_buffs_vampire_damage_s
  float autocvar_g_buffs_invisible_alpha;
  float autocvar_g_buffs_flight_gravity;
  float autocvar_g_buffs_jump_height;
 +float autocvar_g_buffs_inferno_burntime_factor;
 +float autocvar_g_buffs_inferno_burntime_min_time;
 +float autocvar_g_buffs_inferno_burntime_target_damage;
 +float autocvar_g_buffs_inferno_burntime_target_time;
 +float autocvar_g_buffs_inferno_damagemultiplier;
 +float autocvar_g_buffs_swapper_range;
 +float autocvar_g_buffs_magnet_range_item;
+ float autocvar_sv_player_scale;
  #endif
Simple merge
index 18d58f4eb9b374d38c3176f41f331bb5cea858fe,68e8f4f7325a1795a5e3d744572ab8b57e702153..c5bbfcab55ed0f132ece9d8e55d517afac328338
@@@ -1,34 -1,29 +1,30 @@@
  #include "g_damage.qh"
- #if defined(CSQC)
- #elif defined(MENUQC)
- #elif defined(SVQC)
-     #include "../warpzonelib/common.qh"
-     #include "../common/constants.qh"
-     #include "../common/buffs.qh"
-     #include "../common/teams.qh"
-     #include "../common/util.qh"
-     #include "../common/weapons/weapons.qh"
-     #include "weapons/accuracy.qh"
-     #include "weapons/csqcprojectile.qh"
-     #include "weapons/selection.qh"
-     #include "t_items.qh"
-     #include "autocvars.qh"
-     #include "constants.qh"
-     #include "defs.qh"
-     #include "../common/notifications.qh"
-     #include "../common/deathtypes.qh"
-     #include "mutators/mutators_include.qh"
-     #include "tturrets/include/turrets_early.qh"
-     #include "vehicles/vehicles_def.qh"
-     #include "../csqcmodellib/sv_model.qh"
-     #include "../common/playerstats.qh"
-     #include "g_hook.qh"
-     #include "scores.qh"
-     #include "spawnpoints.qh"
- #endif
- float Damage_DamageInfo_SendEntity(entity to, float sf)
+ #include "_all.qh"
+ #include "g_hook.qh"
+ #include "mutators/mutators_include.qh"
+ #include "scores.qh"
+ #include "waypointsprites.qh"
+ #include "spawnpoints.qh"
+ #include "tturrets/include/turrets_early.qh"
+ #include "t_items.qh"
+ #include "vehicles/vehicle.qh"
+ #include "weapons/accuracy.qh"
+ #include "weapons/csqcprojectile.qh"
+ #include "weapons/selection.qh"
++#include "../common/buffs.qh"
+ #include "../common/constants.qh"
+ #include "../common/deathtypes.qh"
+ #include "../common/notifications.qh"
+ #include "../common/movetypes/movetypes.qh"
+ #include "../common/playerstats.qh"
+ #include "../common/teams.qh"
+ #include "../common/util.qh"
+ #include "../common/weapons/all.qh"
+ #include "../csqcmodellib/sv_model.qh"
+ #include "../warpzonelib/common.qh"
+ float Damage_DamageInfo_SendEntity(entity to, int sf)
  {
        WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEINFO);
        WriteShort(MSG_ENTITY, self.projectiledeathtype);
index 7dfdaca6225f8c6c5c1b0164e1f43d99fa6663ee,315a12099b22bdcc1e666dd6af3b90d6e92f0e21..e8366cd31ee2787dedc99fa358a521b35d8c46a7
@@@ -933,8 -757,6 +941,7 @@@ void buffs_Initialize(
        precache_sound("keepaway/respawn.wav");
  
        addstat(STAT_BUFFS, AS_INT, buffs);
-       addstat(STAT_MOVEVARS_JUMPVELOCITY, AS_FLOAT, stat_jumpheight);
 +      addstat(STAT_BUFF_TIME, AS_FLOAT, buff_time);
  
        InitializeEntity(world, buffs_DelayedInit, INITPRIO_FINDTARGET);
  }
Simple merge
Simple merge
Simple merge
Simple merge