Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

LAST MINUTE CHANGES

  • Loading branch information...
commit b225e036503093975c4ac74e9adeda301f5caea9 1 parent 219b71e
@leecrossley authored
Showing with 12 additions and 9 deletions.
  1. +1 −0  client/platforms/android/assets/www/css/index.css
  2. +2 −2 client/platforms/android/assets/www/js/appsassin.js
  3. +1 −1  client/platforms/android/assets/www/js/server.js
  4. BIN  client/platforms/android/assets/www/res/icon/ios/icon-57-2x.png
  5. BIN  client/platforms/android/assets/www/res/icon/ios/icon-57.png
  6. BIN  client/platforms/android/assets/www/res/icon/ios/icon-72-2x.png
  7. BIN  client/platforms/android/assets/www/res/icon/ios/icon-72.png
  8. BIN  client/platforms/android/assets/www/res/screen/ios/screen-iphone-portrait-2x.png
  9. BIN  ...forms/ios/Appsassin.xcodeproj/project.xcworkspace/xcuserdata/lee.xcuserdatad/UserInterfaceState.xcuserstate
  10. BIN  client/platforms/ios/Appsassin/Resources/icons/icon-72.png
  11. BIN  client/platforms/ios/Appsassin/Resources/icons/icon-72@2x.png
  12. BIN  client/platforms/ios/Appsassin/Resources/icons/icon.png
  13. BIN  client/platforms/ios/Appsassin/Resources/icons/icon@2x.png
  14. BIN  client/platforms/ios/Appsassin/Resources/splash/Default-568h@2x~iphone.png
  15. +1 −0  client/platforms/ios/www/css/index.css
  16. +2 −2 client/platforms/ios/www/js/appsassin.js
  17. +1 −1  client/platforms/ios/www/js/server.js
  18. BIN  client/platforms/ios/www/res/icon/ios/icon-57-2x.png
  19. BIN  client/platforms/ios/www/res/icon/ios/icon-57.png
  20. BIN  client/platforms/ios/www/res/icon/ios/icon-72-2x.png
  21. BIN  client/platforms/ios/www/res/icon/ios/icon-72.png
  22. BIN  client/platforms/ios/www/res/screen/ios/screen-iphone-portrait-2x.png
  23. +1 −0  client/www/css/index.css
  24. +2 −2 client/www/js/appsassin.js
  25. +1 −1  client/www/js/server.js
  26. BIN  client/www/res/screen/ios/screen-iphone-portrait-2x.png
View
1  client/platforms/android/assets/www/css/index.css
@@ -1,5 +1,6 @@
* {
-webkit-tap-highlight-color: rgba(0,0,0,0); /* make transparent link selection, adjust last value opacity 0 to 1.0 */
+ -webkit-touch-callout: none;
}
@font-face {
View
4 client/platforms/android/assets/www/js/appsassin.js
@@ -242,7 +242,7 @@ var appsassin = (function () {
// Shot data captured
function cameraSuccess(imageData) {
- server.shootTarget(appsassin.user, imageData, appsassin.currentGame._id, shotResult);
+ server.shootTarget(appsassin.userId, imageData, appsassin.currentGame._id, shotResult);
}
// The result of the shot from the server (hit / miss, based on image recognition)
@@ -281,7 +281,7 @@ var appsassin = (function () {
$(".reset").bind("click", function(e) {
e.preventDefault();
e.stopPropagation();
- appsassin.init();
+ appsassin.switchView("main");
});
localStorage.setItem("game", null);
appsassin.currentGame = null;
View
2  client/platforms/android/assets/www/js/server.js
@@ -67,7 +67,7 @@ var server = (function () {
};
server.shootTarget = function (user, photo, gameId, callback) {
- console.log("shooting...");
+ console.log("shooting for user" + user + "...");
var data = {
"user": user,
"picture": photo
View
BIN  client/platforms/android/assets/www/res/icon/ios/icon-57-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/android/assets/www/res/icon/ios/icon-57.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/android/assets/www/res/icon/ios/icon-72-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/android/assets/www/res/icon/ios/icon-72.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/android/assets/www/res/screen/ios/screen-iphone-portrait-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...n.xcodeproj/project.xcworkspace/xcuserdata/lee.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown
View
BIN  client/platforms/ios/Appsassin/Resources/icons/icon-72.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/ios/Appsassin/Resources/icons/icon-72@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/ios/Appsassin/Resources/icons/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/ios/Appsassin/Resources/icons/icon@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/ios/Appsassin/Resources/splash/Default-568h@2x~iphone.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1  client/platforms/ios/www/css/index.css
@@ -1,5 +1,6 @@
* {
-webkit-tap-highlight-color: rgba(0,0,0,0); /* make transparent link selection, adjust last value opacity 0 to 1.0 */
+ -webkit-touch-callout: none;
}
@font-face {
View
4 client/platforms/ios/www/js/appsassin.js
@@ -242,7 +242,7 @@ var appsassin = (function () {
// Shot data captured
function cameraSuccess(imageData) {
- server.shootTarget(appsassin.user, imageData, appsassin.currentGame._id, shotResult);
+ server.shootTarget(appsassin.userId, imageData, appsassin.currentGame._id, shotResult);
}
// The result of the shot from the server (hit / miss, based on image recognition)
@@ -281,7 +281,7 @@ var appsassin = (function () {
$(".reset").bind("click", function(e) {
e.preventDefault();
e.stopPropagation();
- appsassin.init();
+ appsassin.switchView("main");
});
localStorage.setItem("game", null);
appsassin.currentGame = null;
View
2  client/platforms/ios/www/js/server.js
@@ -67,7 +67,7 @@ var server = (function () {
};
server.shootTarget = function (user, photo, gameId, callback) {
- console.log("shooting...");
+ console.log("shooting for user" + user + "...");
var data = {
"user": user,
"picture": photo
View
BIN  client/platforms/ios/www/res/icon/ios/icon-57-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/ios/www/res/icon/ios/icon-57.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/ios/www/res/icon/ios/icon-72-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/ios/www/res/icon/ios/icon-72.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  client/platforms/ios/www/res/screen/ios/screen-iphone-portrait-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1  client/www/css/index.css
@@ -1,5 +1,6 @@
* {
-webkit-tap-highlight-color: rgba(0,0,0,0); /* make transparent link selection, adjust last value opacity 0 to 1.0 */
+ -webkit-touch-callout: none;
}
@font-face {
View
4 client/www/js/appsassin.js
@@ -242,7 +242,7 @@ var appsassin = (function () {
// Shot data captured
function cameraSuccess(imageData) {
- server.shootTarget(appsassin.user, imageData, appsassin.currentGame._id, shotResult);
+ server.shootTarget(appsassin.userId, imageData, appsassin.currentGame._id, shotResult);
}
// The result of the shot from the server (hit / miss, based on image recognition)
@@ -281,7 +281,7 @@ var appsassin = (function () {
$(".reset").bind("click", function(e) {
e.preventDefault();
e.stopPropagation();
- appsassin.init();
+ appsassin.switchView("main");
});
localStorage.setItem("game", null);
appsassin.currentGame = null;
View
2  client/www/js/server.js
@@ -67,7 +67,7 @@ var server = (function () {
};
server.shootTarget = function (user, photo, gameId, callback) {
- console.log("shooting...");
+ console.log("shooting for user" + user + "...");
var data = {
"user": user,
"picture": photo
View
BIN  client/www/res/screen/ios/screen-iphone-portrait-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.