Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 05:17:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Roxanne Skelly 2018-10-23 11:17:19 -07:00
commit a6fcf79bbd
5 changed files with 908 additions and 1026 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintrc.js
View file

@ -36,6 +36,7 @@ module.exports = {
"GlobalServices": false, "GlobalServices": false,
"GooglePoly": false, "GooglePoly": false,
"Graphics": false, "Graphics": false,
"HifiAbout": false,
"HMD": false, "HMD": false,
"LaserPointers": false, "LaserPointers": false,
"location": true, "location": true,

2
libraries/gl/src/gl/GLShaders.cpp
View file

@ -14,7 +14,7 @@ using namespace gl;
void Uniform::load(GLuint glprogram, int index) { void Uniform::load(GLuint glprogram, int index) {
this->index = index; this->index = index;
if (index > 0) { if (index >= 0) {
static const GLint NAME_LENGTH = 1024; static const GLint NAME_LENGTH = 1024;
GLchar glname[NAME_LENGTH]; GLchar glname[NAME_LENGTH];
memset(glname, 0, NAME_LENGTH); memset(glname, 0, NAME_LENGTH);

1907
server-console/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

11
server-console/package.json
View file

@ -8,8 +8,8 @@
"" ""
], ],
"devDependencies": { "devDependencies": {
"electron-packager": "^12.0.0", "electron": "^3.0.0",
"electron": "1.8.4" "electron-packager": "^12.1.2"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -23,14 +23,15 @@
"packager": "node packager.js" "packager": "node packager.js"
}, },
"dependencies": { "dependencies": {
"always-tail": "0.2.0", "always-tail": "^0.2.0",
"cheerio": "^0.19.0", "cheerio": "^0.22.0",
"debug": "^4.0.1",
"electron-log": "1.1.1", "electron-log": "1.1.1",
"extend": "^3.0.0", "extend": "^3.0.0",
"fs-extra": "^6.0.0", "fs-extra": "^6.0.0",
"node-notifier": "^5.2.1", "node-notifier": "^5.2.1",
"os-homedir": "^1.0.1", "os-homedir": "^1.0.1",
"request": "^2.85.0", "request": "^2.88.0",
"request-progress": "1.0.2", "request-progress": "1.0.2",
"tar-fs": "^1.12.0", "tar-fs": "^1.12.0",
"yargs": "^3.30.0" "yargs": "^3.30.0"

13
server-console/src/main.js
View file

@ -247,15 +247,12 @@ process.on('uncaughtException', function(err) {
log.error(err.stack); log.error(err.stack);
}); });
var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) { const gotTheLock = app.requestSingleInstanceLock()
// Someone tried to run a second instance, focus the window (if there is one)
return true;
});
if (shouldQuit) { if (!gotTheLock) {
log.warn("Another instance of the Sandbox is already running - this instance will quit."); log.warn("Another instance of the Sandbox is already running - this instance will quit.");
app.exit(0); app.exit(0);
return; return;
} }
// Check command line arguments to see how to find binaries // Check command line arguments to see how to find binaries