Compare commits
26
Commits
main
...
9120e030f1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9120e030f1 | ||
|
|
0328d97eb6 | ||
|
|
49dd4437b1 | ||
|
|
2b3e3c07e2 | ||
|
|
9745b1b905 | ||
|
|
291f013e7e | ||
|
|
c435231fb5 | ||
|
|
9fe6630dcf | ||
|
|
7fd5ab311a | ||
|
|
aab8aeb95e | ||
|
|
98827bf114 | ||
|
|
4236321353 | ||
|
|
d806d82ac6 | ||
|
|
f565c75cd3 | ||
|
|
9fac76b146 | ||
|
|
350fb9b525 | ||
|
|
28d2d2479b | ||
|
|
b1ecbbbe80 | ||
|
|
3e17bd6950 | ||
|
|
0899083708 | ||
|
|
324898b46f | ||
|
|
42d003ea27 | ||
|
|
1871b734c7 | ||
|
|
4e3bdb3a26 | ||
|
|
5b18b6dcf9 | ||
|
|
d50f2aa13c |
@@ -73,3 +73,7 @@ Plugins/**/Intermediate/*
|
||||
# Cache files for the editor to use
|
||||
DerivedDataCache/*
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 95f315ade3bf74f55a7ff178d6c65dfcb6ece4df
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
SpaceStudioClient/Content/Fab/Megascans/Surfaces/Concrete_Slab_sdvjeioa/High/MI_sdvjeioa_Inst.uasset
LFS
BIN
Binary file not shown.
BIN
Binary file not shown.
LFS
BIN
Binary file not shown.
LFS
BIN
Binary file not shown.
LFS
BIN
Binary file not shown.
BIN
Binary file not shown.
LFS
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -2,7 +2,7 @@
|
||||
"master": true,
|
||||
"ndisplay": true,
|
||||
"slaveIp": "127.0.0.1",
|
||||
"ControllerIp": "192.168.1.157",
|
||||
"ControllerIp": "192.168.1.157",
|
||||
"ControllerPort": 80,
|
||||
"MediaServerIp": "192.168.1.19",
|
||||
"MediaServerPort": 8699,
|
||||
@@ -215,28 +215,28 @@
|
||||
"z": 1.2
|
||||
}
|
||||
},
|
||||
"L_DGJY": {
|
||||
"L_MLZGC": {
|
||||
"StagePos": {
|
||||
"x": -64.04962,
|
||||
"y": -25.995844,
|
||||
"z": 0
|
||||
"x": 1820,
|
||||
"y": 1460,
|
||||
"z": 760
|
||||
},
|
||||
"ViewPointPos": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"z": 160
|
||||
"x": -200,
|
||||
"y": -220,
|
||||
"z": 125
|
||||
},
|
||||
"StageRotation": 90,
|
||||
"StageRotation": 180,
|
||||
"MoveLimit": {
|
||||
"x": 2900,
|
||||
"y": 900,
|
||||
"x": 200,
|
||||
"y": 200,
|
||||
"z": 200
|
||||
},
|
||||
"MoveSpeed": {
|
||||
"x": 1.8,
|
||||
"y": 1.8,
|
||||
"x": 1.2,
|
||||
"y": 1.2,
|
||||
"z": 1.2
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user