diff --git a/bash_aliases b/bash_aliases index 1ccb7b0..3bd684a 100644 --- a/bash_aliases +++ b/bash_aliases @@ -4,6 +4,7 @@ alias d='cd /usr/share/gamewheel && ./delete' alias r='cd /usr/share/gamewheel && ./restart' alias st='cd /usr/share/gamewheel && ./stop' alias g='cd /usr/share/gamewheel' +alias p='cd /usr/share/gamewheel/3d-pong' alias 3d='cd /usr/share/gamewheel/3d-editor' alias gl='cd /usr/share/gamewheel/game-lib' alias 3d2='cd /usr/share/gamewheel/3d-editor-v2' diff --git a/bash_history b/bash_history index 2927ae8..2f77547 100644 --- a/bash_history +++ b/bash_history @@ -20423,3 +20423,159 @@ ssh gw-3d git commit -am "try to get send button nice" git push ssh gw-3d +p +vim /usr/share/gamewheel/config/bash_aliases +exit +p +git diff +git reset --hard HEAD +git pull +ssh gw-3d +git diff +git commit -am "exit pointerlock for IOS" +git push +ssh gw-3d +git diff +git commit -am "attempt pointer lock fix 2" +git push +ssh gw-3d +git diff +git commit -am "keep game over static" +git push +ssh gw-3d +exit +g +cd 3d-pong/ +git diff +git commit -am "e" +git push +git checkout master +git merge powerup +git push +ps +r +p +cd config/ +git diff +git commit -am "share stuff" +git push +cd .. +cd config/ +cd .. +cd 3d-pong/ +git diff +git commit -am "sharing ok now" +git push +git diff +r +cd 3d-pong/ +git diff +git commit -am "updated pong image" +git push +# +git diff +git commit -am "quote" +git push +git diff +git commit -am "request pointerlock on replay" +git push +git diff +git commit -am "directly" +git push +git commit -am "dont show status div during gameplay" +git push +git commit -am "request pointer lock on canvas element" +git push +git commit -am "pointer lock again on body" +git push +git commit -am "overflow y hidden" +git push +git commit -am "prevent default" +git push +git diff +git commit -am "div status" +git push +exit +cd Downloads/WebStorm-145.597.6/ +cd bin/ +./webstorm.sh +ps +r +st +d +e1 +r +d +ps +r +st +d +e1 +r +st +e1 +r +cd 3d-pong/ +git diff +git commit -am "fixes" +git push +ssh gw-3d +cd Downloads/WebStorm-145.597.6/bin/ +./webstorm.sh +exit +l +d +ps +r +d +e1 +p +git diff +git commit -am "physics updates - multiplayer updates" +git push +ssh gw-3d +r +d +ps +p +git commit -am "random speed in multiplayer" +git push +git diff +git commit -am "slow down a bit" +git push +r +p +git diff "30" +git push +git diff +git commit -am "copy to clipboard for IOS" +git push +r +p +git commit -am "move ball when running" +git push +git commit -am "ios copy" +git push +cd .. +cd api-v1.6/ +git remote -v +cd .. +ls +cd GW_Runtime/ +ls +git checkout master +ssh gw-3d +cd .. +p +git diff +git commit -am "tracking" +git push +exit +l +ssh gw-3d +ssh gw-runtime +ssh gw-rt +ssh gw-3d +l +ssh gw-3d +exit diff --git a/clients.js b/clients.js index 01fd1b4..46933ec 100644 --- a/clients.js +++ b/clients.js @@ -10,7 +10,10 @@ var clients = { account : 'root', subAccount : 'root', nameOfTheGame : 'pong', - messageItemStart : 'VR Pong - Invite your friends to play!' + messageItemStart : 'VR Pong - Invite your friends to play!', + messageItemEnd :[ + 'Challenge your friends :)' + ] }, '3doo' : { title : "3doo - VR Pong", @@ -23,7 +26,13 @@ var clients = { account : '3doo', subAccount : 'root', nameOfTheGame : 'pong', - messageItemStart : '3doo VR Pong - Invite your friends to play!' + messageItemStart : '3doo VR Pong - Invite your friends to play!', + messageItemEnd : [ + 'Please install our
3doo Movie Player App
using the following link
to watch your free movie', + 'Want more?
Download our
3doo Movie Player App.', + 'Want even more fun?
Invite your friends
AND BEAT \'EM!', + 'Like to win?
Challenge more friends
AND BEAT \'EM!' + ] } }; diff --git a/config.js b/config.js index acb3477..5196e14 100644 --- a/config.js +++ b/config.js @@ -59,7 +59,7 @@ var config = { url: 'http://api.gamewheel.local' }, api_runtime: { - url: 'http://api-runtime.gamewheel.local', + url: 'http://api-runtime.gamewheel.com', version: "1.0.0" }, masker: {