From 8ce42f4d6b8db779c24b9387934fa6e3f98d68dc Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Thu, 16 Feb 2017 14:55:20 +0100 Subject: [PATCH] share stuff --- bash_history | 279 +++++++++++++++++++++++++++++++++++++++++++++++++++ clients.js | 6 +- 2 files changed, 283 insertions(+), 2 deletions(-) diff --git a/bash_history b/bash_history index 194b34d..2927ae8 100644 --- a/bash_history +++ b/bash_history @@ -20144,3 +20144,282 @@ cd Downloads/WebStorm-145.597.6/ cd bin/ ./webstorm.sh exit +ssh gw-3d +exit +ssh gw-3d +exit +gnome-calculator +g +cd vr_po +cd 3d-pong/ +grep "currentPowerup" * -R +grep "currentPowerup" * -Rl | xargs sed -i "s/currentPowerup/currentPowerups/g" +git commit -am "start powerup" +git checkout facebook +grep "vr_pong" * -R +git diff +git commit -am "getting ready for release" +git push +git diff +git commit -am "url fixes - bringing it live" +git push +cd .. +cd config/ +git diff +git checkout gw-3d +git diff tj-dev +git checkout tj-dev +cd 3d-po +cd .. +cd 3d-pong +grep "labelGameUrl" * -R +grep "labelGameUrl" * -Rl | xargs sed -i "s/labelGameUrl/labelCopyToClipboard/g" +git commit -am "stuff" +git push +exit +gnome-calculator +g +cd 3d-pong/ +git diff +git commit -am "styles for devices" +git push +ssh gw-3d +r +e1 +r +cd Downloads/WebStorm-145.597.6/bin/ +./webstorm.sh +c +cd 3d-pong/ +git pull +cd .. +cd 3d-editor +git status +git pull +git checkout stable +git pull +git status +rm output.log +rm sorted.log +vim .gitignore +rm tiny-ecs.js +ls +git status +rm -rf .idea +ls +git commit -am "gitignore update" +git push +cd .. +ls +cd config/ +git status +git pull +git commit -am "stuff" +git push +git pull +cd .. +ls +cd 3d-editor +gulp build +cd .. +cd game-lib +git pull +gulp build +r +cd config/ +git status +vim config.js +r +l +ps +e1 +l +d +ps +cd 3d-pong/ +git branch powerup +git checkout powerup +r +cd 3d-pong/ +git diff +git commit -am "disable powerups for now" +git push +git push -u origin powerup +d +ps +r +d +t +ps +cd /etc/nginx/ +ls +cd sites-enabled/ +ls +ln -s ../sites-available/3doo.conf +sudo ln -s ../sites-available/3doo.conf +ls +sudo service nginx restart +g +cd config/ +git diff +git status +git commit -am "3doo config" +git push +git checkout gw-3d +git pull +git checkout tj-dev +git log +git checkout gw-3d +git cherry-pick 4f952afff1a055d304e5e9b44fa262075e52f383 +ls +git mergetool +git commit -am "hosts update" +cd nginx/ +git status +cd .. +rm hosts.orig +cd nginx/ +ls +vim 3doo.conf +grep "gamewheel.local" * -R +grep "gamewheel.local" * -Rl | xargs sed -i "s/gamewheel.local/gamewheel.com/g" +git diff +git commit -am "3doo nginx setup" +git push +git diff +git commit -am "fixed config for vr pong" +git push +git checkout tj-dev +cd .. +r +cd config/ +ls +git diff +git commit -am "clients move to config" +git push +git checkout gw-3d +git checkout tj-dev -- bash_aliases +git checkout tj-dev -- bash_rc +git checkout tj-dev -- bashrc +r# +r +cd config/ +git checkout tj-dev -- clients.js +grep "gamewheel.local" * -R +grep "gamewheel.local" * -Rl | xargs sed -i "s/gamewheel.local/gamewheel.com/g" +git diff +git commit -am "clients into config" +git push +git pull +git push +git checkout tj-dev +r +sudo service nginx restart +d +ps +r +d +ps +cd 3d-pong/ +git diff +git commit -am "viewport attempt fix" +git push +git diff +git commit -am "aparently old" +git push +git commit -am "typo" +git push +r +cd 3d-pong/ +git commit -am "more" +git push +git commit -am "more" +git push +git commit -am "more" +git push +r +cd 3d-pong/ +grep "pFriendStatus" * -R +grep "pFriendStatus" * -Rl | xargs sed -i "s/pFriendStatus/divFriendStatus/g" +grep "pLoadStatus" * -R +grep "divFriendStatus" * -R +grep "divFriendStatus" * -Rl | xargs sed -i "s/divFriendStatus/divStatus/g" +npm install -g weinre +sudo npm install -g weinre +ifconfig +ssh gw-3d +c +cd 3d-pong/ +grep "pEndScene" * -R +grep "pEndScene" * -Rl | xargs sed -i "s/pEndScene/divEndScene/g" +grep "pStartScene" * -Rl | xargs sed -i "s/pStartScene/divStartScene/g" +git commit -am "also landscape" +git push +ssh gw-3d +c +cd 3d-pong/ +git commit -am "display touch" +git push +ssh gw-3d +git commit -am "normal start scene" +git push +ssh gw-3d +git diff +git commit -am "remove display touch" +git push +ssh gw-3d +git commit -am "remove target densitydpi" +git push +ssh gw-3d +exit +r +t +r +cd 3d-pong/ +git commit -am "reponsive design" +git push +r +cd 3d-pong/ +git commit -am "fix z index" +git push +git commit -am "pointer lock" +git push +git diff +git commit -am "app id" +git push +git diff +git commit -am "redirect" +git push +exit +l +exit +ps +r +exit +cd Downloads/WebStorm-145.597.6/ +ls +cd bin/ +ls +./webstorm.sh +exti +exit +r +cd 3d- +cd 3d-pong/ +git diff +git commit -am "fixed css for end scene" +git push +ssh gw-3d +git diff +git commit -am "fb restore" +git push +ssh gw-3d +c +cd 3d-pong/ +git diff +git commit -am "fb send fix 1" +git push +ssh gw-3d +git commit -am "try to get send button nice" +git push +ssh gw-3d diff --git a/clients.js b/clients.js index f16a936..01fd1b4 100644 --- a/clients.js +++ b/clients.js @@ -9,7 +9,8 @@ var clients = { ctaUrl : "https://www.gamewheel.local", account : 'root', subAccount : 'root', - nameOfTheGame : 'pong' + nameOfTheGame : 'pong', + messageItemStart : 'VR Pong - Invite your friends to play!' }, '3doo' : { title : "3doo - VR Pong", @@ -21,7 +22,8 @@ var clients = { ctaUrl : "https://3doo.com", account : '3doo', subAccount : 'root', - nameOfTheGame : 'pong' + nameOfTheGame : 'pong', + messageItemStart : '3doo VR Pong - Invite your friends to play!' } };