Beta 1.3

BuildScripts/download_file.lua

@@ -19,7 +19,7 @@ return function( tempLocation, extractLocation, fileName, url )
 	end
 
 	local ok = os.executef(
-		"7z x \"%s\" -o\"%s\" skse64_2_00_17\\src\\* -r",
+		"7z x \"%s\" -o\"%s\" skse64_2_00_19\\src\\* -r",
 		cwd.. "/".. tempLocation.. "/".. fileName,
 		cwd.. "/".. extractLocation
 	)

BuildScripts/project_common_skse64.lua

@@ -1,5 +1,5 @@
 local outputDir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
-local loc = "../Deps/skse64_2_00_17/src/common"
+local loc = "../Deps/skse64_2_00_19/src/common"
 
 project "common_skse64"
 	location( loc )
@@ -43,6 +43,7 @@ project "common_skse64"
 		editandcontinue "On"
 		floatingpoint "Strict"
 		functionlevellinking "On"
+		flags { "MultiProcessorCompile" }
 
 	filter "configurations:Release"
 		defines { "NODEBUG", "NDEBUG" }
@@ -56,5 +57,5 @@ project "common_skse64"
 		omitframepointer "On"
 		flags {
 			"LinkTimeOptimization", "NoBufferSecurityCheck",
-			"NoMinimalRebuild", "NoRuntimeChecks",
+			"NoMinimalRebuild", "NoRuntimeChecks", "MultiProcessorCompile"
 		}

BuildScripts/project_polyhook.lua

@@ -18,13 +18,18 @@ project "PolyHook2"
 		loc.. "/polyhook2/Enums.hpp",
 		loc.. "/polyhook2/IHook.hpp",
 		loc.. "/polyhook2/MemProtector.hpp",
+		loc.. "/polyhook2/MemAccessor.hpp",
 		loc.. "/polyhook2/Misc.hpp",
 		loc.. "/polyhook2/Instruction.hpp",
 		loc.. "/polyhook2/ADisassembler.hpp",
+		loc.. "/polyhook2/ErrorLog.hpp",
 
 		loc.. "/sources/VTableSwapHook.cpp",
 		loc.. "/sources/VFuncSwapHook.cpp",
 		loc.. "/sources/MemProtector.cpp",
+		loc.. "/sources/MemAccessor.cpp",
+		loc.. "/sources/Misc.cpp",
+		loc.. "/sources/ErrorLog.cpp",
 	}
 
 	includedirs {
@@ -49,6 +54,7 @@ project "PolyHook2"
 		editandcontinue "On"
 		floatingpoint "Strict"
 		functionlevellinking "On"
+		flags { "MultiProcessorCompile" }
 
 	filter "configurations:Release"
 		defines { "NODEBUG", "NDEBUG" }
@@ -60,6 +66,7 @@ project "PolyHook2"
 		functionlevellinking "Off"
 		runtime "Release"
 		omitframepointer "On"
+		flags { "MultiProcessorCompile" }
 
 		flags {
 			"LinkTimeOptimization", "NoBufferSecurityCheck",

BuildScripts/project_skse64.lua

@@ -1,5 +1,5 @@
 local outputDir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
-local parent = "../Deps/skse64_2_00_17/src/skse64"
+local parent = "../Deps/skse64_2_00_19/src/skse64"
 local loc = parent.. "/skse64"
 
 project "skse64"
@@ -20,7 +20,7 @@ project "skse64"
 		loc.. "/**.cpp",
 	}
 	forceincludes {
-		"../Deps/skse64_2_00_17/src/common/IPrefix.h",
+		"../Deps/skse64_2_00_19/src/common/IPrefix.h",
 		"../SmoothCam/include/addrlib/skse_macros.h",
 	}
 	includedirs {
@@ -54,13 +54,14 @@ project "skse64"
 		editandcontinue "On"
 		floatingpoint "Strict"
 		functionlevellinking "On"
+		flags { "MultiProcessorCompile" }
 
 		libdirs {
 			parent.. "/../common/bin/Debug-windows-x86_64/common_skse64",
-			parent.. "/skse64_common/bin/Debug-windows-x86_64/skse64_common",
+			--parent.. "/skse64_common/bin/Debug-windows-x86_64/skse64_common",
 		}
 		links {
-			"skse64_common.lib",
+			--"skse64_common.lib",
 		}
 
 	filter "configurations:Release"
@@ -80,8 +81,8 @@ project "skse64"
 
 		libdirs {
 			parent.. "/../common/bin/Release-windows-x86_64/common_skse64",
-			parent.. "/skse64_common/bin/Release-windows-x86_64/skse64_common",
+			--parent.. "/skse64_common/bin/Release-windows-x86_64/skse64_common",
 		}
 		links {
-			"skse64_common.lib",
+			--"skse64_common.lib",
 		}

BuildScripts/project_skse64_common.lua

@@ -1,5 +1,5 @@
 local outputDir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
-local parent = "../Deps/skse64_2_00_17/src/skse64"
+local parent = "../Deps/skse64_2_00_19/src/skse64"
 local loc = parent.. "/skse64_common"
 
 project "skse64_common"
@@ -20,7 +20,7 @@ project "skse64_common"
 		loc.. "/**.cpp",
 	}
 	forceincludes {
-		"../Deps/skse64_2_00_17/src/common/IPrefix.h",
+		"../Deps/skse64_2_00_19/src/common/IPrefix.h",
 		"../SmoothCam/include/addrlib/skse_macros.h",
 	}
 	includedirs {

CHANGES.md

@@ -1,3 +1,41 @@
+## Beta 1.3
+* Bumped module and MCM version number to 12
+
+**Fixes:**
+* Fixes for camera rotation getting messed up when using Alternate Conversation Camera.
+* Fixes for settings changing other values in the MCM - oversight in the MCM script design.
+* Patches for Wrath of Nature, Apocalypse and Triumvirate failed to merge in last update, now patched for real(tm).
+  * Spells not yet compatible: Apocalypse - Mind Vision
+* Now looking at a different node for detecting IFPV first-person mode, should be more reliable.
+* Extra sanity checking when trying to obtain an NiCamera reference.
+* Fixed auto-complete errors using D3D10 enums rather than D3D11.
+
+**New Stuff:**
+* Added FOV settings to all offset groups.
+* New offset groups for vampire lord and werewolf.
+* Added back the npc hit-size crosshair option, now working properly.
+* New compat option for Archery Gameplay Overhaul when using 3D crosshair features (You will still need to disable AGO's camera features).
+* New compat option for Alternate Conversation Camera. Removed "Disable during dialog" option.
+* Reduced Improved Camera compat options to a single on/off, using method similar to IFPV for compat checks.
+
+**Changes:**
+* Now only enabling magic offsets for "combat" magic (Ice spike, flames, and so on) - Spells like healing and wards no longer count.
+* Enchanted items no longer count as "magic" combat - unless the item is a staff or you also have a "combat" spell equipped.
+* Worked some more on horse->thirdperson transition
+* Code refactoring and cleanup, general improvements to overall camera behavior.
+* Added a warning message when no bones were able to be loaded - In this case the camera will insert a fallback bone and let the game continue.
+* Added a warning message when the mod fails to hook directX. Now showing D3D hook status in the info page of the MCM.
+* Added extra information to detour failure messages, to indicate more clearly where the problem function is.
+* Added more code generation utilities for the MCM.
+* Missed a few WITH_D2D guards on some files.
+* Added an extra debug overlay for showing in-depth camera state.
+* Updated to SKSE64 2.0.19 (SmoothCam will still work fine for users on older SKSE versions).
+* Updated Microsoft Detours to master.
+* Updated GLM to master.
+* Updated nlohmann/json to master.
+* Updated PolyHook 2 to master.
+* Updated build scripts.
+
 ## Beta 1.2
 * Bumped module and MCM version number to 11