Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe

Reel Tweaks
2024-03-01 02:03:41 -05:00 · 2024-03-01 02:03:25 -05:00
6 changed files with 7 additions and 7 deletions
--- a/CapstoneTest.uproject
+++ b/CapstoneTest.uproject
@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "{FD18E76F-4692-E107-31FF-398E500526A5}",
+	"EngineAssociation": "5.1",
 	"Category": "",
 	"Description": "",
 	"Plugins": [
--- a/Content/Maps/L_ConnorTest1.umap
+++ b/Content/Maps/L_ConnorTest1.umap
--- a/Content/Maps/L_ConnorTestAscent.umap
+++ b/Content/Maps/L_ConnorTestAscent.umap
--- a/Content/Materials/M_LaserWall.uasset
+++ b/Content/Materials/M_LaserWall.uasset
--- a/Content/Materials/MaterialFunctions/MF_ProcGrid.uasset
+++ b/Content/Materials/MaterialFunctions/MF_ProcGrid.uasset
--- a/Content/Materials/PostProcess/PP_Rage.uasset
+++ b/Content/Materials/PostProcess/PP_Rage.uasset
Author	SHA1	Message	Date
Connor Elsworth	fa08c13921	Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe	2024-03-01 02:03:41 -05:00
Connor Elsworth	4d35b73da9	Reel Tweaks	2024-03-01 02:03:25 -05:00