Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 01:14:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Andrzej Kapolka 2014-10-23 16:15:11 -07:00
commit 003d2f031a
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/web/js/settings.js
View file

@ -529,7 +529,7 @@ function deleteTableRow(delete_glyphicon) {
row.html("<input type='hidden' class='form-control' name='" row.html("<input type='hidden' class='form-control' name='"
+ row.attr('name') + "' data-changed='true' value=''>"); + row.attr('name') + "' data-changed='true' value=''>");
} else { } else {
if (table.find('.' + Settings.DATA_ROW_CLASS).length) { if (table.find('.' + Settings.DATA_ROW_CLASS).length > 1) {
updateDataChangedForSiblingRows(row) updateDataChangedForSiblingRows(row)
// this isn't the last row - we can just remove it // this isn't the last row - we can just remove it

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 // 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" #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 PUBLIC_URL = "http://public.highfidelity.io";
static const QString MODELS_LOCATION = "scripts/"; 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" }; 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 PUBLIC_URL = "http://public.highfidelity.io";
static const QString MODELS_LOCATION = "models/"; static const QString MODELS_LOCATION = "models/";

2
libraries/networking/src/PacketHeaders.cpp
View file

@ -53,7 +53,7 @@ PacketVersion versionForPacketType(PacketType type) {
case PacketTypeSilentAudioFrame: case PacketTypeSilentAudioFrame:
return 4; return 4;
case PacketTypeMixedAudio: case PacketTypeMixedAudio:
return 1; return 2;
case PacketTypeAvatarData: case PacketTypeAvatarData:
return 3; return 3;
case PacketTypeAvatarIdentity: case PacketTypeAvatarIdentity:

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

@ -62,7 +62,7 @@ void EntityTests::entityTreeTests(bool verbose) {
properties.setPosition(positionAtCenterInMeters); properties.setPosition(positionAtCenterInMeters);
// TODO: Fix these unit tests. // TODO: Fix these unit tests.
//properties.setRadius(halfMeter); //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); tree.addEntity(entityID, properties);
@ -269,7 +269,7 @@ void EntityTests::entityTreeTests(bool verbose) {
// TODO: fix these unit tests // TODO: fix these unit tests
//properties.setRadius(halfMeter); //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) { if (extraVerbose) {
qDebug() << "iteration:" << i qDebug() << "iteration:" << i