Merge branch 'master' of http://pi.killf.info:9966/git/tetrees

# Conflicts:
#	Config/DefaultEngine.ini
#	Content/__ExternalActors__/treefall/2/0/0N/Z5HIL68TL28A16KWXVNNEV.uasset
#	Content/__ExternalActors__/treefall/2/0/30/WKRIC0A3YTL370X223UKD0.uasset
#	Content/__ExternalActors__/treefall/2/0/3M/3QOA8SAGHGZ1C6JX5VWCLU.uasset
#	Content/__ExternalActors__/treefall/2/1/A4/E0GGSFFKI1WIZG76N4SLBS.uasset
#	Content/__ExternalActors__/treefall/2/1/FE/RJ2OL4OS94LNIJ3VFXI3KS.uasset
#	Content/__ExternalActors__/treefall/2/1/GO/YY0HHADH0CMYHX9NU24O5C.uasset
#	Content/__ExternalActors__/treefall/2/1/GR/K0Z7KW0X412YNCZ1Q8TUFH.uasset
#	Content/__ExternalActors__/treefall/2/2/42/XXCUJCWOKL6C5H6VQA9CUY.uasset
#	Content/__ExternalActors__/treefall/2/2/4Z/8LAH2DFGX5WJPJHTKIG0JL.uasset
#	Content/__ExternalActors__/treefall/2/2/52/VHM0CAYPP2MKCN7N9A6ON5.uasset
#	Content/__ExternalActors__/treefall/2/2/5F/IFLELHM6YSXZREC5AUOFMX.uasset
#	Content/__ExternalActors__/treefall/2/2/WN/2072BZK7G3TU8LZX8AF7JN.uasset
#	Content/__ExternalActors__/treefall/2/3/83/7SFSL3HK0RLP93MF18F08B.uasset
#	Content/__ExternalActors__/treefall/2/3/ZF/GYIBE55TRWD79L311KK587.uasset
#	Content/__ExternalActors__/treefall/2/4/5E/DJDYD76ISJIBNMAF7AUP0I.uasset
#	Content/__ExternalActors__/treefall/2/4/ZG/EZBEZVPF649E8OQPDZ3XY6.uasset
#	Content/__ExternalActors__/treefall/2/5/6Y/3CPZN87AAJ6BXM1LGE049C.uasset
#	Content/__ExternalActors__/treefall/2/5/HH/5YH3FYYFVCRUFWRDQRKAUD.uasset
#	Content/__ExternalActors__/treefall/2/6/I2/QR7MGFJ5MLDOWG5GU2PSGJ.uasset
#	Content/__ExternalActors__/treefall/2/6/PF/QY552212M74C1G88XULPZZ.uasset
#	Content/__ExternalActors__/treefall/2/7/60/TT3DDR38GWLV9U9NUWEK8P.uasset
#	Content/__ExternalActors__/treefall/2/7/7A/5BA1B5BBGZOZERUM2W6587.uasset
#	Content/__ExternalActors__/treefall/2/7/ZR/LFE2BW8R38GNS9GO0Q2EXF.uasset
#	Content/__ExternalActors__/treefall/2/8/BH/6ND0ZL3DVF1UICO8B05GE4.uasset
#	Content/__ExternalActors__/treefall/2/8/DB/N8XOQB43K7GRZ1OHHNEMAC.uasset
#	Content/__ExternalActors__/treefall/2/9/2K/823SNEVHOGAS1T1EX2QBMG.uasset
#	Content/__ExternalActors__/treefall/2/9/6K/KGH9ZSISWP4M6EIK1Q82QD.uasset
#	Content/__ExternalActors__/treefall/2/9/DD/V1QBN66S9EL8EWE3EAG8AH.uasset
#	Content/__ExternalActors__/treefall/2/9/RK/LJ7QNEIR6RQNIZNHKQJ5NV.uasset
#	Content/__ExternalActors__/treefall/2/9/YJ/S713B6DQIZP05F97CQR8UA.uasset
#	Content/__ExternalActors__/treefall/2/A/8J/K8HM8MLGP1AXBHFNC021E8.uasset
#	Content/__ExternalActors__/treefall/2/B/8U/TMN9DSVO5RXH7OEZE2ESHX.uasset
#	Content/__ExternalActors__/treefall/2/B/I2/WFU9REAL59CO7VSTOABJWK.uasset
#	Content/__ExternalActors__/treefall/2/C/2X/LFHUU3EIWGLDXYGX5HQE7N.uasset
#	Content/__ExternalActors__/treefall/2/C/G5/YARVH7MJWX7AOXDMTVP7T2.uasset
#	Content/__ExternalActors__/treefall/2/C/NY/084621GNUJL0NQ07O4VLHW.uasset
#	Content/__ExternalActors__/treefall/2/C/UE/LDTFKKGR35PBBFB9NOQRNH.uasset
#	Content/__ExternalActors__/treefall/2/D/38/8NQXNQDFHLO4W1KM56OLWV.uasset
#	Content/__ExternalActors__/treefall/2/D/C7/GTE7SIIBCQQTYJ0BLUA31P.uasset
#	Content/__ExternalActors__/treefall/2/D/ES/WAYZT4K6F9BHC5JZTXSOL8.uasset
#	Content/__ExternalActors__/treefall/2/D/R4/J4YQYJQHWPF5DERPMRXQZ9.uasset
#	Content/__ExternalActors__/treefall/2/D/UO/RE6ZCCTC16E0FPXRRILYVV.uasset
#	Content/__ExternalActors__/treefall/2/E/04/H99ESR8PJQ785Z3WKQV2UG.uasset
#	Content/__ExternalActors__/treefall/2/E/96/7OZXJN0TQHKEX0D4ZKLL7J.uasset
#	Content/__ExternalActors__/treefall/2/E/EP/6YSB2RXLDXQX1ZNX516OKP.uasset
#	Content/__ExternalActors__/treefall/2/E/HK/9IEDFKPW6NZW7A29PNRRK8.uasset
#	Content/__ExternalActors__/treefall/2/E/L9/GNKSFH1X3M94IQQIEPHNLG.uasset
#	Content/__ExternalActors__/treefall/2/E/V2/4RP8W5FYYH09O37U710294.uasset
#	Content/__ExternalActors__/treefall/2/F/32/QKXCDT2TM45J7IFS01OBOK.uasset
#	Content/treefall/2.umap

Config/DefaultCrypto.ini

@@ -0,0 +1,11 @@
+[/Script/CryptoKeys.CryptoKeysSettings]
+EncryptionKey=
+bEncryptPakIniFiles=False
+bEncryptPakIndex=False
+bEncryptUAssetFiles=False
+bEncryptAllAssetFiles=False
+SigningPublicExponent=AQAB
+SigningModulus=Se1jzjdgxCsmjTLPggFn257ENYFuLhPAxGhJOzMgsIEtiGlDeF1qYgkb5cyyENk8pNLOXDe8zgd2DgPYdTRUXa9WkIdd28t1WyvnVL276Wo8CAJNDnWiieXEQQ7PSu/hvWGzR+PrFEHooeqdknrgp7ygKqZhUgbs7o2PqSWtXKo9xYnvnXSagmxDLNv9z9gZ167o107IILN98gOdvtnrv3WzcjLvWn6KUS6Ikv1TZZ4IDpOoyoX0Wmm6yueaPnZKHx6SUpZ8ziRkyGvbKDQgaVJYIqoTV7xx1hpAOo4LUD/B6kOIrdcNVAqMKBAVWD7W53T1Wy07uUo/MKFoLQB9L2a2fFcxjeTs8zsxOYEOjCbZ2rv1rxCe1yMIr0ahcqsAXZTaQlckwQH/T3sa2c4GMs4oJB8mPp3Ww6MzzP16fEuO9jCvYB3dKSXu/DzxUx8wK8MHplyqwIMf/JFINwnYmNB8qEusfq0BYufYq0nF/29yQz/n7wVusqVLrK8MsJa0SUs6h7Ax3tUS+M7Cxcdeqd/8BQzT5ZCTxKx103Daq+nwwoqTtak/VJCzpBzXVXEhXPMCbmfSPpd9rqQJR8NTXUqyrHvXOJqoP7grBhDKMZePzU5s4b8w3sYgtxKhMGwMrZB+esXzuWUCslY5YJEB+YpplqsJxuMjf+3EVGyYdt4=
+SigningPrivateExponent=kSuudZ+Z81eVl+CdyV1dPRerSde3hcQDJt4T+4Igwsvdjd0n+LMBFxIvzumN4U0+Rc26G6WCofrOg47zL+53UAIdRDjXT6VN54YdEI3qMRQCf1oY1kAvWX2WZLdGpD8pRpK+yf0iPH2969DZu0Q3aNo/od5cTEPORB6/fnLqL3zvN+s2pJt+YlLGPPvDHejYZCArIa0Q0XfvDp3bjMACLFWg04y0dZTVYTOwFCMLAC42LqgwcdskNUND9sfG1rRB0JqF0YpM6AV2J91dUadfNU2OHeIck4avOfmxDI1Z/xICw6wSsGNYVYRWG3Ahu9bhAKibzf66YqXrZwDOU3vZlptoSv8ISHSE9olHuSlAO+VpnH47shybRhLxVcIcdFuxzdWFKRYTbUcQ9Hz9GxHtqokukIf26lt0WyuYKhRfH3r2Sb729gd3EcoBLdhrfDOA6xTUSWPO39asbTFgobtYzT5nkSas6+b0hek5TDgpfKTxDiuEz0qGOwCxO5rN/k1aP9bEdWjga+Yi0gLlNB7Kr3vR5hkKukSU0Uq2XL40Xd6QrCcM5HT0rlFqVcZ0XSh/nFycOsWRT+/tisJ33mGdUIBhsFGchAF5MS5xkbnkhv9QlX8+LaWXoien7PIq0wjLzVki3teGjSTwgxChzSym/qZfRf/FnGIqi+4SDT2S8YE=
+bEnablePakSigning=False
+

Config/DefaultEngine.ini

@@ -2,6 +2,7 @@
 GameName=TetreeseDemo
 
 [/Script/EngineSettings.GameMapsSettings]
+<<<<<<< HEAD
 EditorStartupMap=/Game/Maps/Map002.Map002
 LocalMapOptions=
 TransitionMap=None
@@ -14,10 +15,21 @@ GameInstanceClass=/Script/Engine.GameInstance
 GameDefaultMap=/Game/Maps/Map002.Map002
 ServerDefaultMap=/Engine/Maps/Entry.Entry
 GlobalDefaultGameMode=None
+=======
+EditorStartupMap=/Game/Maps/Map007.Map007
+GameDefaultMap=/Game/Maps/Map007.Map007
+TransitionMap=
+bUseSplitscreen=True
+TwoPlayerSplitscreenLayout=Horizontal
+ThreePlayerSplitscreenLayout=FavorTop
+GlobalDefaultGameMode=/Game/BP/VRGameMode.VRGameMode_C
+>>>>>>> fe3e73ccf9f70de20e6a3d3c86c2ae9cd4a6adf0
 GlobalDefaultServerGameMode=None
 
 [/Script/IOSRuntimeSettings.IOSRuntimeSettings]
 MinimumiOSVersion=IOS_12
+RemoteServerName=192.168.1.185
+RSyncUsername=killf
 
 [/Script/HardwareTargeting.HardwareTargetingSettings]
 TargetedHardwareClass=Desktop
@@ -100,3 +112,33 @@ ConnectionType=USBOnly
 bUseManualIPAddress=False
 ManualIPAddress=
 
+[/Script/WindowsTargetPlatform.WindowsTargetSettings]
+DefaultGraphicsRHI=DefaultGraphicsRHI_Default
+-D3D12TargetedShaderFormats=PCD3D_SM5
++D3D12TargetedShaderFormats=PCD3D_SM5
++D3D12TargetedShaderFormats=PCD3D_SM6
+-D3D11TargetedShaderFormats=PCD3D_SM5
++D3D11TargetedShaderFormats=PCD3D_SM5
+Compiler=Default
+AudioSampleRate=48000
+AudioCallbackBufferFrameSize=1024
+AudioNumBuffersToEnqueue=1
+AudioMaxChannels=0
+AudioNumSourceWorkers=4
+SpatializationPlugin=
+SourceDataOverridePlugin=
+ReverbPlugin=
+OcclusionPlugin=
+CompressionOverrides=(bOverrideCompressionTimes=False,DurationThreshold=5.000000,MaxNumRandomBranches=0,SoundCueQualityIndex=0)
+CacheSizeKB=65536
+MaxChunkSizeOverrideKB=0
+bResampleForDevice=False
+MaxSampleRate=48000.000000
+HighSampleRate=32000.000000
+MedSampleRate=24000.000000
+LowSampleRate=12000.000000
+MinSampleRate=8000.000000
+CompressionQualityModifier=1.000000
+AutoStreamingThreshold=0.000000
+SoundCueCookQualityIndex=-1
+

Config/DefaultInput.ini

@@ -141,6 +141,8 @@ DoubleClickTime=0.200000
 +ActionMappings=(ActionName="ChangeShape",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
 +ActionMappings=(ActionName="Teleport",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
 +ActionMappings=(ActionName="TestButton",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=P)
++ActionMappings=(ActionName="ChangeLevel",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Enter)
++ActionMappings=(ActionName="ESC",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Escape)
 +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W)
 +AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S)
 +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=Up)