Merge branch 'ProteusVRpublic:master' into master

.gitignore

@@ -1,47 +1,70 @@
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# =========================
-# Operating System Files
-# =========================
-
-# OSX
-# =========================
-
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+# Visual Studio 2015 user specific files
+.vs/
+
+# Visual Studio 2015 database file
+*.VC.db
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+
+# 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/*
+
+# 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/*

Config/DefaultGame.ini

@@ -1,51 +1,107 @@
 [/Script/EngineSettings.GeneralProjectSettings]
-ProjectID=EECAC70846F0D561D6CD178F9841D3DA
-Description=Proteus Template 3.3beta
-ProjectName=Proteus 3.3
-ProjectVersion=3.3
-CompanyName=Proteus VR
+ProjectID=80BADBD842BAE81B208C22B39F65314D
+ProjectName=Proteus Template
+ProjectVersion=6.1
+CompanyName=Proteus VR inc.
 CompanyDistinguishedName=Proteus VR
 Homepage=proteus-vr.com
-ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "80E36D344D6BAF79E6D37B860470D170", "Proteus 3.3")
-ProjectDebugTitleInfo=NSLOCTEXT("[/Script/EngineSettings]", "1EA4E7F14CF4CF7CF1F518A60058910D", "Proteus 3.3")
 SupportContact=Mathieu Beaulieu
+ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "5032DFCA4A914E868F488292B87AC524", "Proteus VR")
+ProjectDebugTitleInfo=NSLOCTEXT("[/Script/EngineSettings]", "FDE9753043F7E2609A17F9816A4BEDDA", "Proteus VR")
+bAllowWindowResize=True
+Description=Proteus Template
 
 [/Script/Engine.GameSession]
 bRequiresPushToTalk=false
 
+[/Script/EngineSettings.GeneralProjectSettings]
+bStartInVR=True
+
+[Staging]
++WhitelistConfigFiles=Proteus/Config/Engine.ini
++WhitelistConfigFiles=Proteus/Config/TemplateDefs.ini
++WhitelistConfigFiles=Proteus/Config/OCULUS/DefaultEngine.ini
++WhitelistConfigFiles=Proteus/Config/LAN/DefaultEngine.ini
+
 [/Script/UnrealEd.ProjectPackagingSettings]
-BuildConfiguration=PPBC_Development
-StagingDirectory=(Path="C:/Users/mathi/Downloads/TEST_C")
+Build=IfProjectHasCode
+BuildConfiguration=PPBC_Shipping
+StagingDirectory=(Path="Q:/W_PT_DEF_422/P_Rift")
 FullRebuild=False
-ForDistribution=False
+ForDistribution=True
 IncludeDebugFiles=False
 BlueprintNativizationMethod=Disabled
-bWarnIfPackagedWithoutNativizationFlag=True
+bIncludeNativizedAssetsInProjectGeneration=False
+bExcludeMonolithicEngineHeadersInNativizedCode=False
 UsePakFile=True
 bGenerateChunks=False
+bGenerateNoChunks=False
 bChunkHardReferencesOnly=False
+bForceOneChunkPerFile=False
+MaxChunkSize=0
 bBuildHttpChunkInstallData=False
 HttpChunkInstallDataDirectory=(Path="")
+PakFileCompressionFormats=
+PakFileAdditionalCompressionOptions=
 HttpChunkInstallDataVersion=
-IncludePrerequisites=True
+IncludePrerequisites=False
+IncludeAppLocalPrerequisites=False
 bShareMaterialShaderCode=False
 bSharedMaterialNativeLibraries=False
 ApplocalPrerequisitesDirectory=(Path="")
 IncludeCrashReporter=False
 InternationalizationPreset=English
 -CulturesToStage=en
 +CulturesToStage=en
-DefaultCulture=en
 bCookAll=False
 bCookMapsOnly=True
 bCompressed=True
 bEncryptIniFiles=False
 bEncryptPakIndex=False
+GenerateEarlyDownloaderPakFile=False
 bSkipEditorContent=False
-+MapsToCook=(FilePath="/Game/Proteus_Multi/MainMenu")
+bSkipMovies=False
+-EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.icu
+-EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.brk
+-EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.res
+-EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.nrm
+-EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.cfu
+-EarlyDownloaderPakFileFiles=...\Content\Localization\...\*.*
+-EarlyDownloaderPakFileFiles=...\Content\Localization\*.*
+-EarlyDownloaderPakFileFiles=...\Content\Certificates\...\*.*
+-EarlyDownloaderPakFileFiles=...\Content\Certificates\*.*
+-EarlyDownloaderPakFileFiles=-...\Content\Localization\Game\...\*.*
+-EarlyDownloaderPakFileFiles=-...\Content\Localization\Game\*.*
+-EarlyDownloaderPakFileFiles=...\Config\...\*.ini
+-EarlyDownloaderPakFileFiles=...\Config\*.ini
+-EarlyDownloaderPakFileFiles=...\Engine\GlobalShaderCache*.bin
+-EarlyDownloaderPakFileFiles=...\Content\ShaderArchive-Global-*.ushaderbytecode
+-EarlyDownloaderPakFileFiles=...\Content\Slate\*.*
+-EarlyDownloaderPakFileFiles=...\Content\Slate\...\*.*
+-EarlyDownloaderPakFileFiles=...\*.upluginmanifest
+-EarlyDownloaderPakFileFiles=...\*.uproject
+-EarlyDownloaderPakFileFiles=...\global_sf*.metalmap
++EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.icu
++EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.brk
++EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.res
++EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.nrm
++EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.cfu
++EarlyDownloaderPakFileFiles=...\Content\Localization\...\*.*
++EarlyDownloaderPakFileFiles=...\Content\Localization\*.*
++EarlyDownloaderPakFileFiles=...\Content\Certificates\...\*.*
++EarlyDownloaderPakFileFiles=...\Content\Certificates\*.*
++EarlyDownloaderPakFileFiles=-...\Content\Localization\Game\...\*.*
++EarlyDownloaderPakFileFiles=-...\Content\Localization\Game\*.*
++EarlyDownloaderPakFileFiles=...\Config\...\*.ini
++EarlyDownloaderPakFileFiles=...\Config\*.ini
++EarlyDownloaderPakFileFiles=...\Engine\GlobalShaderCache*.bin
++EarlyDownloaderPakFileFiles=...\Content\ShaderArchive-Global-*.ushaderbytecode
++EarlyDownloaderPakFileFiles=...\Content\Slate\*.*
++EarlyDownloaderPakFileFiles=...\Content\Slate\...\*.*
++EarlyDownloaderPakFileFiles=...\*.upluginmanifest
++EarlyDownloaderPakFileFiles=...\*.uproject
++EarlyDownloaderPakFileFiles=...\global_sf*.metalmap
 +MapsToCook=(FilePath="/Game/Proteus_Multi/MultiMap01")
-+MapsToCook=(FilePath="/Game/VR_Essential_Kit/Maps/VREssentialKitMap")
-+MapsToCook=(FilePath="/Game/Proteus_Multi/TravelMap")
++MapsToCook=(FilePath="/Game/Proteus_Multi/entryMap")
 bNativizeBlueprintAssets=False
 bNativizeOnlySelectedBlueprints=False
-