Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

qml doesn't work, .js might not work on osx

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2018-02-02 11:26:21 -08:00
parent 73fde4333e
commit d20ff0955c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
View file

@ -199,7 +199,7 @@ Rectangle {
var SHAPE_TYPE_BOX = 4;
var SHAPE_TYPE_SPHERE = 5;
var SHAPE_TYPES = [];
var SHAPE_TYPES = [];ww
SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";

4
scripts/system/edit.js
View file

@ -540,8 +540,8 @@ var toolBar = (function () {
});
addButton("newImageButton", "web-01.svg", function () {
var IMAGE_MODEL = Script.resolvePath("../../interface/resources/meshes/images/default-image-model.fbx");
var DEFAULT_IMAGE = Script.resolvePath("../../interface/resources/snapshot/img/no-image.jpg");
var IMAGE_MODEL = Script.resourcesPath() + "meshes/images/default-image-model.fbx";
var DEFAULT_IMAGE = Script.resourcesPath() + "snapshot/img/no-image.jpg";
createNewEntity({
type: "Model",
dimensions: {