tforgione
/
3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected bugs and add timeout

This commit is contained in:
Thomas FORGIONE 2015-08-04 22:18:37 +02:00
parent 3a91a33d74
commit 374421780a
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/prototype/dbrequests.js vendored
View File

@ -914,7 +914,7 @@ DBReq.TutorialCreator.prototype.execute = function() {
this.client.query(
// Generate random coins
"SELECT Scene.id AS scene_id, generate_series AS id\n" +
"FROM Scene, generate_series(1,Scene.coin_number)\n" +
"FROM Scene, generate_series(0,Scene.coin_number-1)\n" +
"WHERE Scene.name = 'peachcastle'\n" +
"ORDER BY RANDOM()\n" +
"LIMIT 8;",

7
js/l3d/apps/prototype/interactive/main.js vendored
View File

@ -27,6 +27,13 @@ window.onbeforeunload = function() {
};
setTimeout(function() {
$('#next').show();
$('#next').click(function() {
window.location = '/prototype/games';
});
}, 3*60*60*1000);
function main() {
// Main container that holds everything

7
js/l3d/apps/prototype/tutorial/TutorialSteps.js vendored
View File

@ -210,6 +210,13 @@ TutorialSteps.prototype.nextStep = function() {
});
break;
case 17:
setTimeout(function() {
$('#next').show();
$('#next').click(function() {
window.location = '/before-begin';
});
}, 3*60*60*1000);
var cams = L3D.createPeachRecommendations(this.container_size.width(), this.container_size.height());
for (var i = 2; i < cams.length; i++) {
this.addRecommendation(cams[i]);