diff --git a/InteractiveControl/Content/Main.umap b/InteractiveControl/Content/Main.umap index ecaa9b2..cb24d05 100644 --- a/InteractiveControl/Content/Main.umap +++ b/InteractiveControl/Content/Main.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fe0b0653d6a531d7f89016445b9f54ba87a8c48815bddf5d1dd057f85561262 +oid sha256:6f4e730bdc4fa96cc93b36b24470895aa8555e419dac6c0975d79c174b299ea7 size 8763 diff --git a/InteractiveControl/Content/UI/Main.uasset b/InteractiveControl/Content/UI/Main.uasset index 538f086..804d3c6 100644 --- a/InteractiveControl/Content/UI/Main.uasset +++ b/InteractiveControl/Content/UI/Main.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd53d114a5da1f6a804a5732c15f85d665c8ba5313a2f55f3ca926b28bae2c68 -size 273287 +oid sha256:8a093726f59b676b2be6e8e5916e71bf62cdf356ebbef0eeaa64bbc1d0a54dee +size 273406 diff --git a/InteractiveControl/Content/UI/Page6.uasset b/InteractiveControl/Content/UI/Page6.uasset index 9c43a24..1f5767f 100644 --- a/InteractiveControl/Content/UI/Page6.uasset +++ b/InteractiveControl/Content/UI/Page6.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5db7b3d3241f58511df1430cee1b856cdf6e8123b63901a671b829d854ed8753 -size 79592 +oid sha256:dfafb2e1ed8480cda5e9623ba8aca7e67c1483da03511a10a004b2658bd8fb18 +size 79112 diff --git a/InteractiveControl/Content/UI/Page6_2.uasset b/InteractiveControl/Content/UI/Page6_2.uasset index 47f678e..ec12e14 100644 --- a/InteractiveControl/Content/UI/Page6_2.uasset +++ b/InteractiveControl/Content/UI/Page6_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38531ef3d6ef9a6369d3b235aacfa3878f6b2abd085be9ece7a83c6227d676f0 -size 159716 +oid sha256:ea86afb53d5d0ef5c58aaa78623995029963ecf29f4aad02b6f454b4b71dceba +size 160707 diff --git a/InteractiveControl/Content/texture/chair_A.uasset b/InteractiveControl/Content/texture/chair_A.uasset new file mode 100644 index 0000000..4bb1e6f --- /dev/null +++ b/InteractiveControl/Content/texture/chair_A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87ac728461581de34650193e7cdbb98c675ce0f3d12f93e3db72b07c6fe9fc1c +size 1267178 diff --git a/InteractiveControl/Content/texture/chair_B.uasset b/InteractiveControl/Content/texture/chair_B.uasset new file mode 100644 index 0000000..a39b116 --- /dev/null +++ b/InteractiveControl/Content/texture/chair_B.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbeba8343d67e2e1c7755652b05afe227fbbc2b46d42da65aa6d83d23450d24e +size 1078847 diff --git a/InteractiveControl/Content/texture/chair_C.uasset b/InteractiveControl/Content/texture/chair_C.uasset new file mode 100644 index 0000000..8a56224 --- /dev/null +++ b/InteractiveControl/Content/texture/chair_C.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e18a146819907838fe0516015668cac50b5a1cafb5ee6350a16b9959b47ad691 +size 1182280 diff --git a/InteractiveControl/Content/texture/desk1.uasset b/InteractiveControl/Content/texture/desk1.uasset new file mode 100644 index 0000000..02c39cd --- /dev/null +++ b/InteractiveControl/Content/texture/desk1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20fe9ca87851b40d9c689e27a5eab1a6c401823a8a1aa58e76a2617928d17539 +size 1179462 diff --git a/InteractiveControl/Content/texture/desk2.uasset b/InteractiveControl/Content/texture/desk2.uasset new file mode 100644 index 0000000..9be1986 --- /dev/null +++ b/InteractiveControl/Content/texture/desk2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd8b935b151ae32a0b1dd9e02390f3369eff8b010ec60136d27353a877134b09 +size 1131978 diff --git a/SpaceStudioClient/Content/Blueprints/BP_MediaPlayerController.uasset b/SpaceStudioClient/Content/Blueprints/BP_MediaPlayerController.uasset index d54a9f4..ab8b92f 100644 --- a/SpaceStudioClient/Content/Blueprints/BP_MediaPlayerController.uasset +++ b/SpaceStudioClient/Content/Blueprints/BP_MediaPlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b0b8f29ae665fdf92e55f4b536ee6c9ecdb936cc96a40c5858ad75ca52de6a3 -size 425648 +oid sha256:6e1193b20e4783db4004bcf869ccd86d93d5603e32704ce0a4194398c4818048 +size 467501 diff --git a/SpaceStudioClient/Content/Blueprints/BP_UDPMessageProcessor.uasset b/SpaceStudioClient/Content/Blueprints/BP_UDPMessageProcessor.uasset index ae013dd..877fc8a 100644 --- a/SpaceStudioClient/Content/Blueprints/BP_UDPMessageProcessor.uasset +++ b/SpaceStudioClient/Content/Blueprints/BP_UDPMessageProcessor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccb5979f38f35efc7f31724588908499cd3cdbb85dfdee59fc6104887bdf23b3 -size 472577 +oid sha256:270844c7261b21bb8231586fe420cfcb2d8c577fe134636d25bdc2d6719e774f +size 513210 diff --git a/SpaceStudioClient/Content/Blueprints/BP_Windows.uasset b/SpaceStudioClient/Content/Blueprints/BP_Windows.uasset index 1743031..2145847 100644 --- a/SpaceStudioClient/Content/Blueprints/BP_Windows.uasset +++ b/SpaceStudioClient/Content/Blueprints/BP_Windows.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0956ba9e261ebf45a34a63bd1158ee868379ae3163c785fc87920ca8ef56b66a -size 174946 +oid sha256:3743fd442bab73d4e6591cb979e61978a87abeddd74bc2345d094c8a216fbb94 +size 170128 diff --git a/SpaceStudioClient/Content/Blueprints/NDPawn.uasset b/SpaceStudioClient/Content/Blueprints/NDPawn.uasset index 6796317..8b10f33 100644 --- a/SpaceStudioClient/Content/Blueprints/NDPawn.uasset +++ b/SpaceStudioClient/Content/Blueprints/NDPawn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:847c9e480400360924d110f58c24f62d8e4802d17a4eefac804ff26bfae5dccb -size 136869 +oid sha256:c469dad5dbfec9de4fd2b9c68fedccc32885354913d11d8cf7e8e62077741269 +size 135322 diff --git a/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset b/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset index 57003b1..998398a 100644 --- a/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset +++ b/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60d65e1d0e51f5093469b6e31275a9cd5f3aa06d1225ae6add071c81c4cf3eed -size 122525 +oid sha256:ff839296e99959b63e4b0c47b0e736cbdeaa190d6eaed6c143a1203d557225f5 +size 150287 diff --git a/SpaceStudioClient/Content/config.json b/SpaceStudioClient/Content/config.json index f713222..ef4cc88 100644 --- a/SpaceStudioClient/Content/config.json +++ b/SpaceStudioClient/Content/config.json @@ -1,6 +1,7 @@ { "master":true, "ndisplay":false, + "slaveIp":"127.0.0.1", "windowSize":{ "x":3840, "y":1080