Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_fixed

Browse source
This commit is contained in:
Atlante45 2014-10-23 13:43:21 -07:00
commit bced402a74
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/libraries/globals.js
View file

@ -8,4 +8,4 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "https://s3.amazonaws.com/hifi-public/";
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";

2
interface/src/ScriptsModel.cpp
View file

@ -21,7 +21,7 @@
#include "ScriptsModel.h"
static const QString S3_URL = "https://s3.amazonaws.com/hifi-public";
static const QString S3_URL = "http://s3.amazonaws.com/hifi-public";
static const QString PUBLIC_URL = "http://public.highfidelity.io";
static const QString MODELS_LOCATION = "scripts/";

2
interface/src/ui/ModelsBrowser.cpp
View file

@ -26,7 +26,7 @@
const char* MODEL_TYPE_NAMES[] = { "entities", "heads", "skeletons", "attachments" };
static const QString S3_URL = "https://s3.amazonaws.com/hifi-public";
static const QString S3_URL = "http://s3.amazonaws.com/hifi-public";
static const QString PUBLIC_URL = "http://public.highfidelity.io";
static const QString MODELS_LOCATION = "models/";

4
tests/octree/src/ModelTests.cpp
View file

@ -62,7 +62,7 @@ void EntityTests::entityTreeTests(bool verbose) {
properties.setPosition(positionAtCenterInMeters);
// TODO: Fix these unit tests.
//properties.setRadius(halfMeter);
//properties.setModelURL("https://s3.amazonaws.com/hifi-public/ozan/theater.fbx");
//properties.setModelURL("http://s3.amazonaws.com/hifi-public/ozan/theater.fbx");
tree.addEntity(entityID, properties);
@ -269,7 +269,7 @@ void EntityTests::entityTreeTests(bool verbose) {
// TODO: fix these unit tests
//properties.setRadius(halfMeter);
//properties.setModelURL("https://s3.amazonaws.com/hifi-public/ozan/theater.fbx");
//properties.setModelURL("http://s3.amazonaws.com/hifi-public/ozan/theater.fbx");
if (extraVerbose) {
qDebug() << "iteration:" << i