From: Samual <samual@xonotic.org>
Date: Fri, 13 May 2011 00:00:45 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/flyingspectators
X-Git-Tag: xonotic-v0.5.0~109^2~17
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=62b33decfe83f49635c11598c5bcf781f9b26bf1;hp=-c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/flyingspectators
---

62b33decfe83f49635c11598c5bcf781f9b26bf1
diff --combined defaultXonotic.cfg
index 3e7a16d31,73d5d6352..ee475e7e8
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1595,7 -1595,7 +1595,7 @@@ gl_texturecompression_lightcubemaps 
  gl_texturecompression_q3bsplightmaps 0
  gl_texturecompression_sky 1
  
- set menu_mouse_absolute 0	"TODO make this seta if the engine understands this right"
+ seta menu_mouse_absolute 1 "use the OS mouse pointer motion for menu"
  seta menu_mouse_speed 1 "speed multiplier for the mouse in the menu (does not affect in-game aiming)"
  set menu_use_default_hostname 1
  alias sethostname "set menu_use_default_hostname 0; hostname $*"
@@@ -1680,8 -1680,6 +1680,8 @@@ set sv_clones 0	"number of clones a pla
  
  set cl_handicap 1	"the higher, the more damage you will receive (client setting)"
  
 +seta cl_noclipspectating 0 "noclip for spectators so that you can pass through walls and such. (client setting)" 
 +
  // must be at the bottom of this file:
  // alias for switching the teamselect menu
  alias menu_showteamselect "menu_cmd directmenu TeamSelect"
@@@ -2136,9 -2134,3 +2136,3 @@@ exec hud_luminos.cf
  // enable menu syncing
  alias menu_sync "menu_cmd sync"
  alias scoreboard_columns_set  "cl_cmd scoreboard_columns_set $*"
- 
- // BALANCE TESTING (TEMPORARY, PLEASE REMOVE LATER)
- alias balanceSamual   "exec balanceSamual.cfg; restart"
- alias balanceFruitieX "exec balanceXonotic.cfg; restart"
- bind f7 balanceSamual
- bind f8 balanceFruitieX
diff --combined qcsrc/server/cl_client.qc
index 2f6e4858f,bd1149b62..71e2dd401
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -653,13 -653,13 +653,13 @@@ void PutObserverInServer (void
  	accuracy_resend(self);
  
  	self.spectatortime = time;
 -
 +	
  	self.classname = "observer";
  	self.iscreature = FALSE;
  	self.health = -666;
  	self.takedamage = DAMAGE_NO;
  	self.solid = SOLID_NOT;
 -	self.movetype = MOVETYPE_NOCLIP;
 +	self.movetype = (self.cvar_cl_noclipspectating ? MOVETYPE_NOCLIP : MOVETYPE_FLY);
  	self.flags = FL_CLIENT | FL_NOTARGET;
  	self.armorvalue = 666;
  	self.effects = 0;
@@@ -688,9 -688,9 +688,9 @@@
  	self.fixangle = TRUE;
  	self.crouch = FALSE;
  
 -	self.view_ofs = PL_VIEW_OFS;
 +	self.view_ofs = '0 0 0'; // so that you can't go inside walls with MOVETYPE_FLY, previously "PL_VIEW_OFS" - for some reason this is diff from normal players
  	setorigin (self, spot.origin);
 -	setsize (self, '0 0 0', '0 0 0');
 +	setsize (self, '-16 -16 -24', '16 16 24'); // so that you can't go inside walls with MOVETYPE_FLY
  	self.prevorigin = self.origin;
  	self.items = 0;
  	self.weapons = 0;
@@@ -2928,7 -2928,7 +2928,7 @@@ void PlayerPreThink (void
  	}
  
  	if(!zoomstate_set)
- 		SetZoomState(self.BUTTON_ZOOM || (self.BUTTON_ATCK2 && self.weapon == WEP_NEX) || (self.BUTTON_ATCK2 && self.weapon == WEP_SNIPERRIFLE && autocvar_g_balance_sniperrifle_secondary == 0));
+ 		SetZoomState(self.BUTTON_ZOOM || self.BUTTON_ZOOMSCRIPT || (self.BUTTON_ATCK2 && self.weapon == WEP_NEX) || (self.BUTTON_ATCK2 && self.weapon == WEP_SNIPERRIFLE && autocvar_g_balance_sniperrifle_secondary == 0));
  
  	float oldspectatee_status;
  	oldspectatee_status = self.spectatee_status;
diff --combined qcsrc/server/defs.qh
index ca530a991,f6ddad269..4317b0cac
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -2,16 -2,17 +2,17 @@@
  
  float require_spawnfunc_prefix; // if this float exists, only functions with spawnfunc_ name prefix qualify as spawn functions
  
- #define BUTTON_ATCK   button0
- #define BUTTON_JUMP   button2
- #define BUTTON_ATCK2  button3
- #define BUTTON_ZOOM   button4
- #define BUTTON_CROUCH button5
- #define BUTTON_HOOK   button6
- #define BUTTON_INFO   button7
- #define BUTTON_CHAT   buttonchat
- #define BUTTON_USE    buttonuse
- #define BUTTON_DRAG   button8
+ #define BUTTON_ATCK       button0
+ #define BUTTON_JUMP       button2
+ #define BUTTON_ATCK2      button3
+ #define BUTTON_ZOOM       button4
+ #define BUTTON_CROUCH     button5
+ #define BUTTON_HOOK       button6
+ #define BUTTON_INFO       button7
+ #define BUTTON_CHAT       buttonchat
+ #define BUTTON_USE        buttonuse
+ #define BUTTON_DRAG       button8
+ #define BUTTON_ZOOMSCRIPT button9
  
  // Globals
  
@@@ -147,6 -148,7 +148,7 @@@ float maxclients
  .vector anim_forwardleft; // player running forward and left
  .vector anim_backright; // player running backward and right
  .vector anim_backleft; // player running back and left
+ .vector anim_melee; // player doing the melee action
  
  // weapon animation vectors:
  .vector anim_fire1;
@@@ -311,7 -313,6 +313,7 @@@ float default_weapon_alpha
  .float cvar_cl_playerdetailreduction;
  .float cvar_scr_centertime;
  .float cvar_cl_shownames;
 +.float cvar_cl_noclipspectating;
  .string cvar_g_xonoticversion;
  .string cvar_cl_weaponpriority;
  .string cvar_cl_weaponpriorities[10];