Merge pull request #1 from ProteusVR/master

Update

Config/DefaultEditorPerProjectUserSettings.ini

@@ -35,4 +35,12 @@ LogTimestampMode=None
 bPromoteOutputLogWarningsDuringPIE=False
 AssetEditorOpenLocation=Default
 
+[/Script/UMGEditor.WidgetDesignerSettings]
+GridSnapEnabled=True
+GridSnapSize=4
+bLockToPanelOnDragByDefault=False
+bShowOutlines=True
+bExecutePreConstructEvent=True
+bRespectLocks=True
+
 

Config/DefaultGame.ini

@@ -1,13 +1,13 @@
 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=EECAC70846F0D561D6CD178F9841D3DA
-Description=Proteus Template 3.2.2
-ProjectName=Proteus 3.2.2
-ProjectVersion=3.2.2
+Description=Proteus Template 3.3beta
+ProjectName=Proteus 3.3
+ProjectVersion=3.3
 CompanyName=Proteus VR
 CompanyDistinguishedName=Proteus VR
 Homepage=proteus-vr.com
-ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "80E36D344D6BAF79E6D37B860470D170", "Proteus 3.2.2")
-ProjectDebugTitleInfo=NSLOCTEXT("[/Script/EngineSettings]", "1EA4E7F14CF4CF7CF1F518A60058910D", "Proteus 3.2.2")
+ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "80E36D344D6BAF79E6D37B860470D170", "Proteus 3.3")
+ProjectDebugTitleInfo=NSLOCTEXT("[/Script/EngineSettings]", "1EA4E7F14CF4CF7CF1F518A60058910D", "Proteus 3.3")
 SupportContact=Mathieu Beaulieu
 
 [/Script/Engine.GameSession]
@@ -16,7 +16,7 @@ bRequiresPushToTalk=false
 [/Script/UnrealEd.ProjectPackagingSettings]
 BuildConfiguration=PPBC_Development
 StagingDirectory=(Path="C:/Users/mathi/Downloads/TEST_C")
-FullRebuild=True
+FullRebuild=False
 ForDistribution=False
 IncludeDebugFiles=False
 BlueprintNativizationMethod=Disabled
@@ -48,3 +48,4 @@ bSkipEditorContent=False
 +MapsToCook=(FilePath="/Game/Proteus_Multi/TravelMap")
 bNativizeBlueprintAssets=False
 bNativizeOnlySelectedBlueprints=False
+

Config/DefaultInput.ini

@@ -48,19 +48,10 @@ DefaultViewportMouseLockMode=LockOnCapture
 +ActionMappings=(ActionName="AvatarRightFaceButton2",Key=MotionController_Right_FaceButton2,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
 +ActionMappings=(ActionName="Teleport",Key=LeftMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
 +ActionMappings=(ActionName="MenuButton",Key=RightMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
-+AxisMappings=(AxisName="MoveForward",Key=W,Scale=1.000000)
-+AxisMappings=(AxisName="MoveForward",Key=S,Scale=-1.000000)
-+AxisMappings=(AxisName="MoveForward",Key=Down,Scale=-1.000000)
 +AxisMappings=(AxisName="MoveForward",Key=Gamepad_LeftY,Scale=1.000000)
-+AxisMappings=(AxisName="MoveRight",Key=A,Scale=-1.000000)
-+AxisMappings=(AxisName="MoveRight",Key=D,Scale=1.000000)
 +AxisMappings=(AxisName="MoveRight",Key=Gamepad_LeftX,Scale=1.000000)
 +AxisMappings=(AxisName="TurnRate",Key=Gamepad_RightX,Scale=1.000000)
-+AxisMappings=(AxisName="TurnRate",Key=Left,Scale=-1.000000)
-+AxisMappings=(AxisName="TurnRate",Key=Right,Scale=1.000000)
-+AxisMappings=(AxisName="Turn",Key=MouseX,Scale=1.000000)
 +AxisMappings=(AxisName="LookUpRate",Key=Gamepad_RightY,Scale=1.000000)
-+AxisMappings=(AxisName="LookUp",Key=MouseY,Scale=-1.000000)
 +AxisMappings=(AxisName="MoveForward",Key=MotionController_Left_Thumbstick_Y,Scale=-1.000000)
 +AxisMappings=(AxisName="MoveRight",Key=MotionController_Left_Thumbstick_X,Scale=1.000000)
 +AxisMappings=(AxisName="AvatarLeftTrigger",Key=OculusTouch_Left_Trigger,Scale=1.000000)
@@ -73,7 +64,6 @@ DefaultViewportMouseLockMode=LockOnCapture
 +AxisMappings=(AxisName="AvatarRightTriggerAxis",Key=MotionController_Right_Trigger,Scale=1.000000)
 +AxisMappings=(AxisName="AvatarLeftGrip1Axis",Key=MotionController_Left_Grip1,Scale=1.000000)
 +AxisMappings=(AxisName="AvatarRightGrip1Axis",Key=MotionController_Right_Grip1,Scale=1.000000)
-+AxisMappings=(AxisName="MoveForward",Key=Up,Scale=1.000000)
 bAlwaysShowTouchInterface=False
 bShowConsoleOnFourFingerTap=True
 DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks

Config/EditorPrefs.ini

@@ -0,0 +1,9 @@
+[/Script/UMGEditor.WidgetDesignerSettings]
+GridSnapEnabled=True
+GridSnapSize=4
+bLockToPanelOnDragByDefault=False
+bShowOutlines=True
+bExecutePreConstructEvent=True
+bRespectLocks=True
+
+

Config/Oculus/DefaultEngine.ini

@@ -20,6 +20,8 @@ r.DefaultFeature.MotionBlur=False
 r.DefaultFeature.AntiAliasing=3
 vr.InstancedStereo=False
 
+bSupportsDash=true
+
 [/Script/Engine.AudioSettings]
 VoiPSoundClass=/Game/Proteus_Multi/VOIPSoundClass.VOIPSoundClass
 DefaultSoundClassName=/Game/Proteus_Multi/VOIPSoundClass.VOIPSoundClass
@@ -51,9 +53,6 @@ Achievement_0_Id=
 bEnabled=true
 OculusAppId=1200222206710107
 
-[/Script/OnlineSubsystemOculus.OculusNetDriver]
-NetConnectionClassName=OnlineSubsystemOculus.OculusNetConnection
-
 [/Script/Engine.GameEngine]
 !NetDriverDefinitions=ClearArray
 ; Uncomment the next line if you are using the Null Subsystem
@@ -63,6 +62,12 @@ NetConnectionClassName=OnlineSubsystemOculus.OculusNetConnection
 ; Uncomment the next line if you are using the Oculus Subsystem
 +NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="OnlineSubsystemOculus.OculusNetDriver",DriverClassNameFallback="OnlineSubsystemUtils.IpNetDriver")
 
+[/Script/OnlineSubsystemOculus.OculusNetDriver]
+NetConnectionClassName=OnlineSubsystemOculus.OculusNetConnection
+
+[/Script/Oculus.Settings]
+bSupportsDash=true
+
 [/Script/Engine.Player]
 ConfiguredInternetSpeed=500000
 ConfiguredLanSpeed=500000
@@ -202,6 +207,7 @@ bSuppressFaceRemapTable=False
 bSupportUVFromHitResults=False
 bDisableActiveActors=False
 bDisableCCD=False
+bEnableEnhancedDeterminism=False
 MaxPhysicsDeltaTime=0.033333
 bSubstepping=False
 bSubsteppingAsync=False
@@ -210,5 +216,6 @@ MaxSubsteps=6
 SyncSceneSmoothingFactor=0.000000
 AsyncSceneSmoothingFactor=0.990000
 InitialAverageFrameRate=0.016667
+PhysXTreeRebuildRate=10
 
 

Config/Steam/DefaultEngine.ini

@@ -26,7 +26,6 @@ DefaultSoundClassName=/Game/Proteus_Multi/VOIPSoundClass.VOIPSoundClass
 
 [OnlineSubsystem]
 DefaultPlatformService=Steam
-;DefaultPlatformService=Oculus
 bHasVoiceEnabled=true
 PollingIntervalInMs=20
 VoiceNotificationDelta=0.2
@@ -46,22 +45,12 @@ Achievement_0_Id=
 NetConnectionClassName=OnlineSubsystemSteam.SteamNetConnection
 
 [OnlineSubsystemOculus]
-;Enable this if using Oculus Network
-;Then enter you app ID
 bEnabled=false
 OculusAppId=1200222206710107
 
-[/Script/OnlineSubsystemOculus.OculusNetDriver]
-;NetConnectionClassName=OnlineSubsystemOculus.OculusNetConnection
-
 [/Script/Engine.GameEngine]
 !NetDriverDefinitions=ClearArray
-; Uncomment the next line if you are using the Null Subsystem
-;+NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="/Script/OnlineSubsystemUtils.IpNetDriver",DriverClassNameFallback="/Script/OnlineSubsystemUtils.IpNetDriver")
-; Uncomment the next line if you are using the Steam Subsystem
 +NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="OnlineSubsystemSteam.SteamNetDriver",DriverClassNameFallback="OnlineSubsystemUtils.IpNetDriver")
-; Uncomment the next line if you are using the Oculus Subsystem
-;+NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="OnlineSubsystemOculus.OculusNetDriver",DriverClassNameFallback="OnlineSubsystemUtils.IpNetDriver")
 
 [/Script/Engine.Player]
 ConfiguredInternetSpeed=500000
@@ -87,6 +76,24 @@ Compiler=VisualStudio2017
 MinimumOSVersion=MSOS_Vista
 AudioDevice=
 
+[/Script/Engine.RecastNavMesh]
+RuntimeGeneration=Static
+bForceRebuildOnLoad=True
+
+[/Script/EngineSettings.GameMapsSettings]
+EditorStartupMap=/Game/Proteus_Multi/MainMenu.MainMenu
+LocalMapOptions=
+TransitionMap=/Game/Proteus_Multi/TravelMap.TravelMap
+bUseSplitscreen=True
+TwoPlayerSplitscreenLayout=Horizontal
+ThreePlayerSplitscreenLayout=FavorTop
+bOffsetPlayerGamepadIds=False
+GameInstanceClass=/Game/Proteus_Multi/GameInfoInstance.GameInfoInstance_C
+GameDefaultMap=/Game/Proteus_Multi/MainMenu.MainMenu
+ServerDefaultMap=/Game/Proteus_Multi/MainMenu.MainMenu
+GlobalDefaultGameMode=/Game/Proteus_Multi/MainMenuGM.MainMenuGM_C
+GlobalDefaultServerGameMode=None
+
 [/Script/Engine.CollisionProfile]
 -Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False)
 -Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False)
@@ -125,6 +132,7 @@ AudioDevice=
 +Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.",bCanModify=False)
 +Profiles=(Name="UI",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False)
 +Profiles=(Name="VRCollision",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Ignore),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore)),HelpMessage="Collision for VR",bCanModify=True)
++DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,Name="NavMeshCollision",DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False)
 -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall")
 -ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn")
 -ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic")
@@ -144,20 +152,6 @@ AudioDevice=
 +CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle")
 +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn")
 
-[/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Proteus_Multi/MainMenu.MainMenu
-LocalMapOptions=
-TransitionMap=/Game/Proteus_Multi/TravelMap.TravelMap
-bUseSplitscreen=True
-TwoPlayerSplitscreenLayout=Horizontal
-ThreePlayerSplitscreenLayout=FavorTop
-bOffsetPlayerGamepadIds=False
-GameInstanceClass=/Game/Proteus_Multi/GameInfoInstance.GameInfoInstance_C
-GameDefaultMap=/Game/Proteus_Multi/MainMenu.MainMenu
-ServerDefaultMap=/Game/Proteus_Multi/MainMenu.MainMenu
-GlobalDefaultGameMode=/Game/Proteus_Multi/MainMenuGM.MainMenuGM_C
-GlobalDefaultServerGameMode=None
-
 [/Script/Engine.NavigationSystem]
 bAutoCreateNavigationData=True
 bAllowClientSideNavigation=True
@@ -166,12 +160,8 @@ bSkipAgentHeightCheckWhenPickingNavData=False
 DataGatheringMode=Instant
 bGenerateNavigationOnlyAroundNavigationInvokers=False
 ActiveTilesUpdateInterval=1.000000
-+SupportedAgents=(Name="Default",Color=(B=0,G=255,R=140,A=164),DefaultQueryExtent=(X=500.000000,Y=500.000000,Z=500.000000),NavigationDataClassName=/Script/Engine.RecastNavMesh,AgentRadius=35.000000,AgentHeight=144.000000,AgentStepHeight=-1.000000,NavWalkingSearchHeightScale=0.500000,PreferredNavData=None,bCanCrouch=False,bCanJump=False,bCanWalk=False,bCanSwim=False,bCanFly=False)
 DirtyAreasUpdateFreq=60.000000
 
-[/Script/Engine.RecastNavMesh]
-RuntimeGeneration=Static
-
 [/Script/Engine.PhysicsSettings]
 DefaultGravityZ=-980.000000
 DefaultTerminalVelocity=4000.000000
@@ -202,6 +192,7 @@ bSuppressFaceRemapTable=False
 bSupportUVFromHitResults=False
 bDisableActiveActors=False
 bDisableCCD=False
+bEnableEnhancedDeterminism=False
 MaxPhysicsDeltaTime=0.033333
 bSubstepping=False
 bSubsteppingAsync=False
@@ -210,5 +201,6 @@ MaxSubsteps=6
 SyncSceneSmoothingFactor=0.000000
 AsyncSceneSmoothingFactor=0.990000
 InitialAverageFrameRate=0.016667
+PhysXTreeRebuildRate=10
 
 

Config/TemplateDefs.ini

@@ -1,8 +1,8 @@
 [/Script/GameProjectGeneration.TemplateProjectDefs]
-LocalizedDisplayNames=(Language="en",Text="Proteus 3.2.2")
-LocalizedDescriptions=(Language="en",Text="This is the Proteus Multiplayer 3.2.2 Template.")
+LocalizedDisplayNames=(Language="en",Text="Proteus 3.3")
+LocalizedDescriptions=(Language="en",Text="This is the Proteus Multiplayer 3.3 Template.")
 
-LocalizedDisplayNames=(Language="ko",Text="Proteus 3.2.2")
+LocalizedDisplayNames=(Language="ko",Text="Proteus 3.3")
 LocalizedDescriptions=(Language="ko",Text="")
 
 ClassTypes=Character, GameMode, HUD, Actor, Character, GameMode, HUD, Actor

Proteus.uproject

@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.17",
+	"EngineAssociation": "4.18",
 	"Category": "",
 	"Description": "",
 	"Plugins": [
@@ -19,6 +19,30 @@
 		{
 			"Name": "OnlineSubsystemIOS",
 			"Enabled": false
+		},
+		{
+			"Name": "OculusAudio",
+			"Enabled": true
+		},
+		{
+			"Name": "AdvancedSteamSessions",
+			"Enabled": false
+		},
+		{
+			"Name": "AdvancedSessions",
+			"Enabled": false
+		},
+		{
+			"Name": "LinuxDeviceProfileSelector",
+			"Enabled": false
+		},
+		{
+			"Name": "IOSDeviceProfileSelector",
+			"Enabled": false
+		},
+		{
+			"Name": "AndroidDeviceProfileSelector",
+			"Enabled": false
 		}
 	],
 	"TargetPlatforms": [

README.md

@@ -4,57 +4,20 @@ Simple. No plugins. No fuss.
 
 Video at https://www.youtube.com/watch?v=ml2xgiQ41BY 
 
-# Features #
-* A heavily-modified version of Epic’s VR Template plus:
- * 3 fully animated controllers meshes: Hands (like Oculus Avatar), Oculus Touch controllers and HTC Vive controllers
- * Can be controlled with Oculus Touch or HTC Vive controllers, and support for Oculus remote
- * Full input mapping
- * Control over controllers opacity, scale, HTC Vive controllers skins, Avatar color
- * For the hands, the scale is 1:1 with Epic VR template. Reduce scale to approx. 0.75 to come close to real-life
- * Function to spawn poles at the 4 corners of the Oculus Guardian or SteamVR chaperone limits
- * By default it is mapped to Oculus Touch B and Y buttons, and HTC Vive controllers menu button
- * Optimizations for Oculus Rift and HTC Vive HMDs
- * “Ghost Mode” with gamepad
- * By default it is turned on; can be turned off or mapped to another input
- * Monitor in front of character
- * Can be spawned (turned off by default) to print useful infos / debug
- * Avatar head
- * Rumble functions adapted to work with Touch & Vive
- * UI interactions, VR keyboard
- * Fade out vision when head goes through objects with VRCollision enabled
- * Skeletal socket use when grabbing objects
- * Vive Tracker tracking
- * Network and single player mode
- * Works single player, or multiplayer via LAN, Steam or Oculus Network
- * Direct IP Connect
- * Oculus Direct Connect
- * VOIP
- * Oculus Avatars
+# This template consists of virtual reality compatible pawn and settings, ready to drop in your single or multiplayer app. So what you can do is choose the features you want, and build yourself/modify a pawn based on the functionalities you need. #
 
 # Latest Versions #
 
-# Version 3.2.2 (August 29, 2017) #
-# UNREAL 4.17 VERSION
+# Version 3.3  - STEAM STORE / LAN / DIRECT IP / OCULUS STORE / OCULUS DIRECT (December 14, 2017)
+# UNREAL 4.18.2 VERSION
 
-# Latest changelog #
+# Other templates on GitHub / one Drive #
 
-2 important fixes:
-* “NavModifiersVolume (NavAreaNull) have inconsistent behaviour since Unreal 4.16. For now I ditched the NavMesh and teleport on static mesh, deny teleportation with floor angle and CustomNavArea NavModifierVolume, until Navigation is more stable in Unreal.” [NOW FIXED]
-* “I've had the same teleportation direction issue through all of the versions of the template I've tested. For me the forward direction seems to be the "right->" direction of my playspace. Any luck reproducing the issue with teleport rotation on the vive? There are times it seems like I'm 90-180 degrees from where I'm supposed to end up and its really confusing sometimes. I haven't been able to figure it out myself » [NOW FIXED]
+# Which HMD works with the template / why 4 different versions? #
 
-What I recommend: Try the 4.17 packaged version on the OneDrive (Template 3.2.2). If there is problem there, it’s on your side, probably setup based.
+The Steam/LAN is a blueprint-only template optimized for Oculus/Vive/WMR headsets, compatible with the latest Unreal Engine launcher version. Works with Steam Store, LAN, OculusDirect, DirectIP, Oculus Store (once references to Steam are removed)
+The Oculus Store requires the Avatar plugin, thus requires compiling from Visual Studio; it also removes all references to Steam in order to be published on the Oculus Store.
+The Windows Store is based on a branch of Unreal cured by Microsoft specifically tailored for Windows Mixed Reality headsets. The base template is blueprint only, but the Unreal Engine must be compiled from the Microsoft Dev/Mixed Reality GitHub.
+The DirectIP with VOIP allows to use Direct with VOIP – following some plugin customization
 
-KNOWN BUG WITHOUT A FIX (FOR NOW)
-No VOIP through Direct IP Connection: I’ve tried many tricks / solutions, nothing works (yet). Maybe using Advanced Session Plugin? I’ll try that. If someone has a trick for enabling VOIP through direct IP give me a shout.
-Physics objects: It’s normal to experience client-side lag on physics objects (i.e. Interactive Objects). Many tricks exist to fix that problem; search for “multiplayer physics objects”. This would be an entire different topic and is not specifically related to VR.
-Oculus Avatars Version : Remote Avatar is not controlled by Remote Player : Working on it.
-BUGS WITH NO FIX
-Affecting ONLY Unreal 4.16.3: UE-45908 Widget interaction debug line only shows when hitting a widget https://issues.unrealengine.com/issue/UE-45908 - Bug has been resolved in 4.17
-BUGS REPORTED TO ANSWERHUB
-Affecting ONLY version 4.17, and ONLY Oculus Rift: UE-48260 Play area bounds are offset so that the player's spawn position is at the center of the player start https://issues.unrealengine.com/issue/UE-48260
-
-Affecting Unreal 4.16.3 and 4.17.0: UE-44947 Extra Sphere collision is shown when setting it to not be hidden in game for the MotioncontrollerBP
-https://issues.unrealengine.com/issue/UE-44947 You can resolve this by unchecking "Instanced Stereo" in Project Settings, but doing that could decrease VR performance.
-
-
-Please read the pdf document for the complete instructions. It is found at https://1drv.ms/f/s!Av77lIIxt2OY0XGGW8UDwykohjuT  
+# Please read the pdf document for the complete instructions. It is found here or at https://1drv.ms/f/s!Av77lIIxt2OY0XGGW8UDwykohjuT #