Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 12:28:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into fix_audio_qt59

Browse source
This commit is contained in:
Vladyslav Stelmakhovskyi 2017-06-19 16:17:31 +02:00
commit 9fb947ea3c
28 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmake/externals/quazip/CMakeLists.txt vendored
View file

@ -12,12 +12,19 @@ elseif ($ENV{QT_CMAKE_PREFIX_PATH})
set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH})
endif ()
set(QUAZIP_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${QT_CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib -DZLIB_ROOT=${ZLIB_ROOT} -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
if (APPLE)
else ()
set(QUAZIP_CMAKE_ARGS ${QUAZIP_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=11)
endif ()
ExternalProject_Add(
${EXTERNAL_NAME}
URL https://s3-us-west-1.amazonaws.com/hifi-production/dependencies/quazip-0.7.2.zip
URL_MD5 2955176048a31262c09259ca8d309d19
BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${QT_CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib -DZLIB_ROOT=${ZLIB_ROOT} -DCMAKE_POSITION_INDEPENDENT_CODE=ON
CMAKE_ARGS ${QUAZIP_CMAKE_ARGS}
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
LOG_BUILD 1

2
unpublishedScripts/marketplace/shortbow/bow/bow.js
View file

@ -103,7 +103,7 @@ function getControllerLocation(controllerHand) {
const STRING_PULL_SOUND_URL = Script.resolvePath('Bow_draw.1.L.wav');
const ARROW_HIT_SOUND_URL = Script.resolvePath('Arrow_impact1.L.wav');
const ARROW_MODEL_URL = Script.resolvePath('arrow.fbx');
const ARROW_MODEL_URL = Script.resolvePath('models/arrow.baked.fbx');
const ARROW_DIMENSIONS = {
x: 0.20,
y: 0.19,

BIN
unpublishedScripts/marketplace/shortbow/bow/models/Arrow-texture.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/bow/models/arrow.baked.fbx Normal file
View file

Binary file not shown.

0
unpublishedScripts/marketplace/shortbow/bow/arrow.fbx → unpublishedScripts/marketplace/shortbow/bow/models/arrow.fbx
View file

BIN
unpublishedScripts/marketplace/shortbow/bow/models/bow-deadly.baked.fbx Normal file
View file

Binary file not shown.

0
unpublishedScripts/marketplace/shortbow/bow/bow-deadly.fbx → unpublishedScripts/marketplace/shortbow/bow/models/bow-deadly.fbx
View file

BIN
unpublishedScripts/marketplace/shortbow/bow/models/bow_bump-SM.ktx Normal file
View file

Binary file not shown.

0
unpublishedScripts/marketplace/shortbow/bow/bow_collision_hull.obj → unpublishedScripts/marketplace/shortbow/bow/models/bow_collision_hull.obj
View file

BIN
unpublishedScripts/marketplace/shortbow/bow/models/bow_diff-SM.ktx Normal file
View file

Binary file not shown.

4
unpublishedScripts/marketplace/shortbow/bow/spawnBow.js
View file

@ -37,7 +37,7 @@ var userData = {
var id = Entities.addEntity({
"position": MyAvatar.position,
"collisionsWillMove": 1,
"compoundShapeURL": Script.resolvePath("bow_collision_hull.obj"),
"compoundShapeURL": Script.resolvePath("models/bow_collision_hull.obj"),
"created": "2016-09-01T23:57:55Z",
"dimensions": {
"x": 0.039999999105930328,
@ -50,7 +50,7 @@ var id = Entities.addEntity({
"y": -9.8,
"z": 0
},
"modelURL": Script.resolvePath("bow-deadly.fbx"),
"modelURL": Script.resolvePath("models/bow-deadly.baked.fbx"),
"name": "Hifi-Bow",
"rotation": {
"w": 0.9718012809753418,

BIN
unpublishedScripts/marketplace/shortbow/models/Amber.baked.fbx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/Ball_C_9.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/Metallic.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/Roughness.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/mat.ground Diffuse Color.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/mat.platform Diffuse Color.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/mat.scoreboard Diffuse Color.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/mat.spawner Diffuse Color.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/mat.target Diffuse Color.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/mat.turret Diffuse Color.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/play-area-Diffuse.ktx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/shortbow-button.baked.fbx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/shortbow-platform.baked.fbx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/shortbow/models/shortbow-scoreboard.baked.fbx Normal file
View file

Binary file not shown.

6
unpublishedScripts/marketplace/shortbow/shortbow.js
View file

@ -114,7 +114,7 @@ SHORTBOW_ENTITIES =
"id": "{04288f77-64df-4323-ac38-9c1960a393a5}",
"lastEdited": 1487893058314990,
"lastEditedBy": "{fce8028a-4bac-43e8-96ff-4c7286ea4ab3}",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-button.fbx",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-button.baked.fbx",
"name": "SB.StartButton",
"owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
"parentID": "{0cd1f1f7-53b9-4c15-bf25-42c0760d16f0}",
@ -758,7 +758,7 @@ SHORTBOW_ENTITIES =
"id": "{d4c8f577-944d-4d50-ac85-e56387c0ef0a}",
"lastEdited": 1487892440231278,
"lastEditedBy": "{91f193dd-829a-4b33-ab27-e9a26160634a}",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-platform.fbx",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-platform.baked.fbx",
"name": "SB.Platform",
"owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
"parentID": "{0cd1f1f7-53b9-4c15-bf25-42c0760d16f0}",
@ -794,7 +794,7 @@ SHORTBOW_ENTITIES =
"id": "{0cd1f1f7-53b9-4c15-bf25-42c0760d16f0}",
"lastEdited": 1487892440231832,
"lastEditedBy": "{91f193dd-829a-4b33-ab27-e9a26160634a}",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-scoreboard.fbx",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-scoreboard.baked.fbx",
"name": "SB.Scoreboard",
"owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
"queryAACube": {

6
unpublishedScripts/marketplace/shortbow/shortbow.json
View file

@ -96,7 +96,7 @@
"id": "{04288f77-64df-4323-ac38-9c1960a393a5}",
"lastEdited": 1487893058314990,
"lastEditedBy": "{fce8028a-4bac-43e8-96ff-4c7286ea4ab3}",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-button.fbx",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-button.baked.fbx",
"name": "SB.StartButton",
"owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
"parentID": "{0cd1f1f7-53b9-4c15-bf25-42c0760d16f0}",
@ -740,7 +740,7 @@
"id": "{d4c8f577-944d-4d50-ac85-e56387c0ef0a}",
"lastEdited": 1487892440231278,
"lastEditedBy": "{91f193dd-829a-4b33-ab27-e9a26160634a}",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-platform.fbx",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-platform.baked.fbx",
"name": "SB.Platform",
"owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
"parentID": "{0cd1f1f7-53b9-4c15-bf25-42c0760d16f0}",
@ -776,7 +776,7 @@
"id": "{0cd1f1f7-53b9-4c15-bf25-42c0760d16f0}",
"lastEdited": 1487892440231832,
"lastEditedBy": "{91f193dd-829a-4b33-ab27-e9a26160634a}",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-scoreboard.fbx",
"modelURL": "file:///c:/Users/ryanh/dev/hifi/unpublishedScripts/marketplace/shortbow/models/shortbow-scoreboard.baked.fbx",
"name": "SB.Scoreboard",
"owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
"queryAACube": {

6
unpublishedScripts/marketplace/shortbow/shortbowGameManager.js
View file

@ -131,7 +131,7 @@ var baseEnemyProperties = {
},
"lifetime": 30,
"id": "{ed8f7339-8bbd-4750-968e-c3ceb9d64721}",
"modelURL": Script.resolvePath("models/Amber.fbx"),
"modelURL": Script.resolvePath("models/Amber.baked.fbx"),
"owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
"queryAACube": {
"scale": 1.0999215841293335,
@ -290,7 +290,7 @@ ShortbowGameManager.prototype = {
"position": props.position,
"rotation": props.rotation,
"collisionsWillMove": 1,
"compoundShapeURL": Script.resolvePath("bow/bow_collision_hull.obj"),
"compoundShapeURL": Script.resolvePath("bow/models/bow_collision_hull.obj"),
"created": "2016-09-01T23:57:55Z",
"dimensions": {
"x": 0.039999999105930328,
@ -303,7 +303,7 @@ ShortbowGameManager.prototype = {
"y": -9.8,
"z": 0
},
"modelURL": Script.resolvePath("bow/bow-deadly.fbx"),
"modelURL": Script.resolvePath("bow/models/bow-deadly.baked.fbx"),
"name": "WG.Hifi-Bow",
"script": Script.resolvePath("bow/bow.js"),
"shapeType": "compound",