Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 13:28:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel

Browse source
This commit is contained in:
Stephen Birarda 2014-10-02 09:20:08 -07:00
commit e88b3311ad
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
domain-server/resources/web/assignment/scripts/.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

4
domain-server/src/DomainServer.cpp
View file

@ -1084,7 +1084,7 @@ const char ASSIGNMENT_SCRIPT_HOST_LOCATION[] = "resources/web/assignment";
QString pathForAssignmentScript(const QUuid& assignmentUUID) { QString pathForAssignmentScript(const QUuid& assignmentUUID) {
QString newPath(ASSIGNMENT_SCRIPT_HOST_LOCATION); QString newPath(ASSIGNMENT_SCRIPT_HOST_LOCATION);
newPath += "/"; newPath += "/scripts/";
// append the UUID for this script as the new filename, remove the curly braces // append the UUID for this script as the new filename, remove the curly braces
newPath += uuidStringWithoutCurlyBraces(assignmentUUID); newPath += uuidStringWithoutCurlyBraces(assignmentUUID);
return newPath; return newPath;
@ -1123,7 +1123,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
// via correct URL for the script so the client can download // via correct URL for the script so the client can download
QUrl scriptURL = url; QUrl scriptURL = url;
scriptURL.setPath(URI_ASSIGNMENT + "/" scriptURL.setPath(URI_ASSIGNMENT + "/scripts/"
+ uuidStringWithoutCurlyBraces(pendingData->getAssignmentUUID())); + uuidStringWithoutCurlyBraces(pendingData->getAssignmentUUID()));
// have the HTTPManager serve the appropriate script file // have the HTTPManager serve the appropriate script file

6
examples/editModels.js
View file

@ -2395,7 +2395,7 @@ function Tooltip() {
this.x = 285; this.x = 285;
this.y = 115; this.y = 115;
this.width = 500; this.width = 500;
this.height = 180; // 145; this.height = 300; // 145;
this.margin = 5; this.margin = 5;
this.decimals = 3; this.decimals = 3;
@ -2406,8 +2406,8 @@ function Tooltip() {
height: this.height, height: this.height,
margin: this.margin, margin: this.margin,
text: "", text: "",
color: { red: 128, green: 128, blue: 128 }, color: { red: 228, green: 228, blue: 228 },
alpha: 0.2, alpha: 0.5,
visible: false visible: false
}); });
this.show = function (doShow) { this.show = function (doShow) {