Commits

Nexii Malthus committed 0c18ab6

Updated scripted camera. + Other stuff.

Comments (0)

Files changed (11)

indra/llcommon/llversionviewer.h

 
 const S32 LL_VERSION_MAJOR = 2;
 const S32 LL_VERSION_MINOR = 0;
-const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 20645;
+const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Combat Cubed";
 

indra/llcrashlogger/llcrashlogger.cpp

 
 		mCrashInPreviousExec = mDebugLog["CrashNotHandled"].asBoolean();
 
-		mFileMap["CombatCubedLog"] = mDebugLog["C3Log"].asString();
+		mFileMap["CombatCubedLog"] = mDebugLog["SLLog"].asString();
 		mFileMap["SettingsXml"] = mDebugLog["SettingsFilename"].asString();
 		if(mDebugLog.has("CAFilename"))
 		{

indra/newview/Info-SecondLife.plist

 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.0.20645</string>
+	<string>2.0.1.0</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>

indra/newview/installers/windows/installer_template.nsi

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function un.DocumentsAndSettingsFolder
 
-; Delete files in Documents and Settings\<user>\CombatCubed
+; Delete files in Documents and Settings\<user>\Combat Cubed
 Push $0
 Push $1
 Push $2
 	; Otherwise (preview/dmz etc) just remove cache
     StrCmp $INSTFLAGS "" RM_ALL RM_CACHE
       RM_ALL:
-        RMDir /r "$2\Application Data\CombatCubed"
+        RMDir /r "$2\Application Data\Combat Cubed"
       RM_CACHE:
         # Local Settings directory is the cache, there is no "cache" subdir
-        RMDir /r "$2\Local Settings\Application Data\CombatCubed"
+        RMDir /r "$2\Local Settings\Application Data\Combat Cubed"
         # Vista version of the same
-        RMDir /r "$2\AppData\Local\CombatCubed"
-        Delete "$2\Application Data\CombatCubed\user_settings\settings_windlight.xml"
+        RMDir /r "$2\AppData\Local\Combat Cubed"
+        Delete "$2\Application Data\Combat Cubed\user_settings\settings_windlight.xml"
 
   CONTINUE:
     IntOp $0 $0 + 1
 Push $0
   ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"
   StrCmp $0 "" +2
-  RMDir /r "$0\CombatCubed"
+  RMDir /r "$0\Combat Cubed"
 Pop $0
 
 ; Delete filse in C:\Windows\Application Data\SecondLife
 ; If the user is running on a pre-NT system, Application Data lives here instead of
 ; in Documents and Settings.
-RMDir /r "$WINDIR\Application Data\CombatCubed"
+RMDir /r "$WINDIR\Application Data\Combat Cubed"
 
 FunctionEnd
 
 DetailPrint "Removing Second Life password"
 
 SetShellVarContext current
-Delete "$APPDATA\CombatCubed\user_settings\password.dat"
+Delete "$APPDATA\Combat Cubed\user_settings\password.dat"
 SetShellVarContext all
 
 FunctionEnd

indra/newview/llappviewer.cpp

 
 void LLAppViewer::writeSystemInfo()
 {
-	gDebugInfo["C3Log"] = LLError::logFileName();
+	gDebugInfo["SLLog"] = LLError::logFileName();
 
 	gDebugInfo["ClientInfo"]["Name"] = LLVersionInfo::getChannel();
 	gDebugInfo["ClientInfo"]["MajorVersion"] = LLVersionInfo::getMajor();

indra/newview/llfollowcam.cpp

 	{
 		mRelativeFocus = (focus_pt_agent - mSubjectPosition) * ~mSubjectRotation;
 	}
+	else if ( mUseFocus ) // focus may not be locked, but we still might want to use it! -- Nexii Malthus
+	{
+		mRelativeFocus = lerp(mRelativeFocus, (focus_pt_agent - mSubjectPosition) * ~mSubjectRotation, LLCriticalDamp::getInterpolant(mFocusLag));
+	}
 	else
 	{
 		LLVector3 focusOffset = offsetSubjectPosition - focus_pt_agent;
 	{
 		mRelativePos = (whereCameraPositionWantsToBe - mSubjectPosition) * ~mSubjectRotation;
 	}
+	else if ( mUsePosition ) // position may not be locked, but we still might want to use it! -- Nexii Malthus
+	{
+		mRelativePos = lerp(mRelativePos, (simulated_pos_agent - mSubjectPosition) * ~mSubjectRotation, LLCriticalDamp::getInterpolant(mPositionLag));
+	}
 	else
 	{
 		//####################################################################################

indra/newview/llmaniptranslate.cpp

 
 	// Project the cursor onto that plane
 	LLVector3d relative_move;
-	getMousePointOnPlaneGlobal(relative_move, x, y, current_pos_global, mManipNormal);\
+	getMousePointOnPlaneGlobal(relative_move, x, y, current_pos_global, mManipNormal);
 	relative_move -= mDragCursorStartGlobal;
 
 	// You can't move more than some distance from your original mousedown point.
 		default:
 			break;
 		}
+		
+		//u -= fmod(u + usc * 0.5f, usc) - usc * 0.5f;
+		//v -= fmod(v + vsc * 0.5f, vsc) - vsc * 0.5f;
 
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 		highlightIntersection(normal, selection_center, grid_rotation, inner_color);
 		{
 			vsc *= 0.5f;
 		}
-
-		glScalef(usc, vsc, 1.0f);
+		
+		gGL.scalef(usc, vsc, 1.0f);
 		gGL.translatef(u, v, 0);
 		
 		float a = line_alpha;

indra/newview/llwindebug.cpp

 void LLWinDebug::generateMinidump(struct _EXCEPTION_POINTERS *exception_infop)
 {
 	std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-												"SecondLifeException");
+												"CombatCubedException");
 	if (exception_infop)
 	{
 		// Since there is exception info... Release the hounds.
 		ExInfo.ThreadId = ::GetCurrentThreadId();
 		ExInfo.ExceptionPointers = exception_infop;
 		ExInfo.ClientPointers = NULL;
-		writeDumpToFile((MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithIndirectlyReferencedMemory), &ExInfo, "SecondLife.dmp");
+		writeDumpToFile((MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithIndirectlyReferencedMemory), &ExInfo, "CombatCubed.dmp");
 	}
 }
Add a comment to this file

indra/newview/res/viewerRes.aps

Binary file modified.

indra/newview/res/viewerRes.rc

 // Dialog
 //
 
-SPLASHSCREEN DIALOGEX 32, 32, 266, 137
+SPLASHSCREEN DIALOGEX 32, 32, 267, 146
 STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN
 EXSTYLE WS_EX_TRANSPARENT | WS_EX_COMPOSITED | WS_EX_LAYERED
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    CONTROL         "Loading Combat Cubed...",666,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,28,125,207,9,WS_EX_TRANSPARENT
-    CONTROL         177,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,0,0,267,123
+    CONTROL         "Loading Combat Cubed...",666,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,28,131,207,9,WS_EX_TRANSPARENT
+    CONTROL         177,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,0,0,267,129
 END
 
 
 BEGIN
     "SPLASHSCREEN", DIALOG
     BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 259
+        RIGHTMARGIN, 266
         VERTGUIDE, 34
         TOPMARGIN, 7
-        BOTTOMMARGIN, 129
+        BOTTOMMARGIN, 143
     END
 END
 #endif    // APSTUDIO_INVOKED
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,20645
- PRODUCTVERSION 2,0,0,20645
+ FILEVERSION 2,0,1,0
+ PRODUCTVERSION 2,0,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "2.0.0.20645"
+            VALUE "FileVersion", "2.0.1.0"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright � 2001-2010, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "2.0.0.20645"
+            VALUE "ProductVersion", "2.0.1.0"
         END
     END
     BLOCK "VarFileInfo"

indra/newview/viewer_manifest.py

                 """
         else:
             # some other channel on some grid
-            installer_file = "Combat_Cubed_%(version_dashes)s_%(channel_oneword)s_Setup.exe"
+            installer_file = "Combat_Cubed_%(version_dashes)s_Setup.exe"
             grid_vars_template = """
             OutFile "%(installer_file)s"
             !define INSTFLAGS "%(flags)s"
-            !define INSTNAME   "CombatCubed%(channel_oneword)s"
+            !define INSTNAME   "CombatCubed"
             !define SHORTCUT   "%(channel)s"
             !define URLNAME   "combatcubed"
             !define UNINSTALL_SETTINGS 1
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.