15 Aug 2012

change.log

@@ -1,4 +1,4 @@
-build ????
+build 2015
 
 Server: fix the sound problem with weapons
 Render: added rendermode kRenderWorldGlow (6) like in HL2
@@ -66,6 +66,17 @@ GameUI: don't draw logo.avi for mods without this file in gamedir
 GameUI: fix buttons loader bug
 GameUI: enable scissor for all ScrollList menus
 GameUI: restore the menu buttons control from keyboard
+Client: get walk animation support for 'wrong' player models that uses different skeleton
+Server: ignore savegame during intermission (used for Quake remake)
+Render: merge mirrors with same plane into one pass (perfomance option)
+Render: fix errors in function GL_CleanupTextureUnits (it was cause problems in XashXT)
+Render: allow decals on 'Solid" surfaces (grates, ladders etc)
+Render: rewrite "r_lighting_extended 2" mode
+Render: add optional texture sorting for models with Additive and Transparent textures (r_studio_sort_textures cvar)
+Engine: makes AABB transform trace an option for switchable engine features
+Engine: allow studiomodel textures up to 4096x4096 (for indexed images)
+Server: merge PVS for looking for client through portal cameras
+Server: fix bug with collect savegame info from basedir (e.g. valve)
 
 
 build 1905

engine/client/cl_main.c

@@ -83,6 +83,11 @@ qboolean CL_IsInConsole( void )
 	return ( cls.key_dest == key_console );
 }
 
+qboolean CL_IsIntermission( void )
+{
+	return cl.refdef.intermission;
+}
+
 qboolean CL_IsPlaybackDemo( void )
 {
 	return cls.demoplayback;

engine/common/build.c

@@ -23,7 +23,7 @@ static char mond[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 int Q_buildnum( void )
 {
 // do not touch this! Only author of Xash3D can increase buildnumbers!
-#if 1 
+#if 0 
 	int m = 0, d = 0, y = 0;
 	static int b = 0;
 
@@ -48,6 +48,6 @@ int Q_buildnum( void )
 
 	return b;
 #else
-	return 1905;
+	return 2015;
 #endif
 }

engine/common/common.h

@@ -728,6 +728,7 @@ qboolean CL_IsInGame( void );
 qboolean CL_IsInMenu( void );
 qboolean CL_IsInConsole( void );
 qboolean CL_IsThirdPerson( void );
+qboolean CL_IsIntermission( void );
 float CL_GetServerTime( void );
 float CL_GetLerpFrac( void );
 void CL_CharEvent( int key );

engine/server/sv_init.c

@@ -435,6 +435,11 @@ void SV_LevelInit( const char *pMapName, char const *pOldLevel, char const *pLan
 		svgame.dllFuncs.pfnResetGlobalState();
 		SV_SpawnEntities( pMapName, SV_EntityScript( ));
 		svgame.globals->frametime = 0.0f;
+
+		if( sv_newunit->integer )
+		{
+			SV_ClearSaveDir();
+		}
 	}
 
 	// always clearing newunit variable

engine/server/sv_save.c

@@ -611,6 +611,12 @@ int SV_IsValidSave( void )
 		return 0;
 	}
 
+	if( CL_IsIntermission( ))
+	{
+		Msg( "Can't save during intermission.\n" );
+		return 0;
+	}
+
 	if( sv_maxclients->integer != 1 )
 	{
 		Msg( "Can't save multiplayer games.\n" );
@@ -1393,7 +1399,7 @@ void SV_LoadClientState( SAVERESTOREDATA *pSaveData, const char *level, qboolean
 		FS_Read( pFile, &position, sizeof( position ));
 
 		BF_WriteByte( &sv.signon, svc_stufftext );
-		BF_WriteString( &sv.signon, va( "music %s %s %i\n", curtrack, looptrack, position ));
+		BF_WriteString( &sv.signon, va( "music \"%s\" \"%s\" %i\n", curtrack, looptrack, position ));
 	}
 
 	FS_Close( pFile );