Finished fixing merge conflicts and touched up camera settings.

More merge conflicts. Taking main changes then will integrate mine.

.gitignore

@@ -1,39 +1,78 @@
+BP_Puralink
+BP_Revolute
+
 # Visual Studio 2015 user specific files
 .vs/
+
 # Compiled Object files
 *.slo
 *.lo
 *.o
 *.obj
+
 # Precompiled Headers
 *.gch
 *.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
 # Fortran module files
 *.mod
+
 # Compiled Static libraries
 *.lai
 *.la
 *.a
 *.lib
+
+# Executables
+*.exe
+*.out
+*.app
+*.ipa
+
+# These project files can be generated by the engine
+*.xcodeproj
+*.xcworkspace
+*.sln
+*.suo
+*.opensdf
+*.sdf
+*.VC.db
+*.VC.opendb
+
+# Precompiled Assets
+SourceArt/**/*.png
+SourceArt/**/*.tga
+
+# Binary Files
+Binaries/*
+Plugins/**/Binaries/*
+
 # Builds
 Build/*
-Builds/*
-*.app
+
 # Whitelist PakBlacklist-<BuildConfiguration>.txt files
 !Build/*/
 Build/*/**
 !Build/*/PakBlacklist*.txt
+
 # Don't ignore icon files in Build
 !Build/**/*.ico
+
 # Built data for maps
 *_BuiltData.uasset
+
 # Configuration files generated by the Editor
 Saved/*
+
 # Compiled source files for the engine to use
 Intermediate/*
 Plugins/**/Intermediate/*
+
 # Cache files for the editor to use
 DerivedDataCache/*
-
 .DS_Store
-/RobotData

.idea/.idea.Luckyrobots/.idea/.gitignore

@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/modules.xml
+/projectSettingsUpdater.xml
+/.idea.Luckyrobots.iml
+/contentModel.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/.idea.Luckyrobots/.idea/.name

@@ -0,0 +1 @@
+Luckyrobots

.idea/.idea.Luckyrobots/.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>

.idea/.idea.Luckyrobots/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

Binaries/Win64/UnrealEditor.modules

@@ -0,0 +1,7 @@
+{
+	"BuildId": "827e4aed-aff1-4853-85bd-51def0d581c9",
+	"Modules": 
+	{
+		"Luckyrobots": "UnrealEditor-Luckyrobots.dll"
+	}
+}

Config/DefaultGameplayTags.ini

@@ -5,8 +5,9 @@ ClearInvalidTags=False
 AllowEditorTagUnloading=True
 AllowGameTagUnloading=False
 FastReplication=False
+bDynamicReplication=False
 InvalidTagCharacters="\"\',"
-+GameplayTagTableList=/Game/ElectircDream/Audio/Soundscape/SoundscapeStates.SoundscapeStates
++GameplayTagTableList=/Game/Developers/Bhrama/DT_LuckyStateTreeTags.DT_LuckyStateTreeTags
 NumBitsForContainerSize=6
 NetIndexFirstBitSegment=16