updated clients
parent
34ebb6c7c0
commit
5bcc90ab1b
435
bash_history
435
bash_history
|
|
@ -20579,3 +20579,438 @@ ssh gw-3d
|
|||
l
|
||||
ssh gw-3d
|
||||
exit
|
||||
l
|
||||
ssh gw-3d
|
||||
exit
|
||||
ps
|
||||
e1
|
||||
r
|
||||
p
|
||||
git commit -am "last few issues"
|
||||
git push
|
||||
cd ..
|
||||
cd config/
|
||||
git diff
|
||||
git commit -am "clients update"
|
||||
git push
|
||||
git checkout gw-3d
|
||||
git checkout tj-dev -- clients.js
|
||||
vim clients.js
|
||||
git commit -am "updated clients.js"
|
||||
git push
|
||||
git checkout tj-dev
|
||||
ssh gw-3d
|
||||
git checkout gw-3d
|
||||
git push
|
||||
git pull
|
||||
git push
|
||||
git mergetool
|
||||
git commit -am "merge conflicts"
|
||||
git push
|
||||
rm *.orig
|
||||
ls
|
||||
git checkout tj-dev
|
||||
ssh gw-3d
|
||||
exit
|
||||
cd Downloads/WebStorm-145.597.6/
|
||||
cd bin/
|
||||
./webstorm.sh
|
||||
exit
|
||||
cd Downloads/WebStorm-145.597.6/
|
||||
cd bin/
|
||||
./webstorm.sh
|
||||
exit
|
||||
e1
|
||||
ssh gw-3d
|
||||
cd 3d-editor
|
||||
git diff
|
||||
git branch v2_v3
|
||||
git checkout v2_v3
|
||||
ls
|
||||
gulp
|
||||
git diff
|
||||
git merge stable
|
||||
git checkout stable
|
||||
git checkout v2_v3
|
||||
gulp
|
||||
git diff
|
||||
git checkout v2
|
||||
git commit -am "starting merge to v2"
|
||||
git push
|
||||
git push -u origin v2_v3
|
||||
git pull
|
||||
git push
|
||||
git push --set-upstream origin v2_v3
|
||||
git checkout stable
|
||||
git branch v2_v3_stable
|
||||
git checkout v2_v3_stable
|
||||
git merge v2
|
||||
git mergetool
|
||||
git commit -am "merging v2"
|
||||
git push
|
||||
git push --set-upstream origin v2_v3_stable
|
||||
git merge v3
|
||||
git checkout v3
|
||||
git checkout v2_v3_stable
|
||||
git merge v3
|
||||
git mergetool
|
||||
git commit -am "everything in - now get it stable"
|
||||
git push
|
||||
git status
|
||||
find . -name "*.orig" | xargs rm
|
||||
ls
|
||||
gulp
|
||||
ls
|
||||
rm game-lib*
|
||||
ln -s ../game-lib/build/game-lib-editor.js
|
||||
ls
|
||||
gulp build/
|
||||
gulp build
|
||||
gulp
|
||||
ls
|
||||
rm game-lib-editor.js
|
||||
ln -s ../game-lib/build/game-lib-runtime.js
|
||||
gulp
|
||||
exit
|
||||
3d
|
||||
cd src/
|
||||
grep "divCanvas" * -R
|
||||
grep "divCanvas" * -Rl | xargs sed -i "s/divCanvas/divEditorCanvas/g"
|
||||
grep "divEditorCanvas"
|
||||
grep "divEditorCanvas" * -R
|
||||
grep "editorApiEntityManager" * -R
|
||||
grep "editorApiEntityManager" * -Rl | xargs sed -i "s/editorApiEntityManager/apiEditorEntityManager/g"
|
||||
grep "gameApiEntityManager" * -Rl | xargs sed -i "s/gameApiEntityManager/apiGameEntityManager/g"
|
||||
git diff
|
||||
git commit -am "where to store components"
|
||||
git push
|
||||
cd ..
|
||||
cd game-lib
|
||||
git diff
|
||||
git commit -am "where to store components"
|
||||
git push
|
||||
cd ..
|
||||
ls
|
||||
cd blender-node
|
||||
git diff
|
||||
exit
|
||||
p
|
||||
git diff
|
||||
git commit -am "end vr mode label"
|
||||
git push
|
||||
cd ..
|
||||
cd 3d-editor
|
||||
git diff
|
||||
ls
|
||||
cd ..
|
||||
cd game-lib
|
||||
git diff
|
||||
git pull
|
||||
git branch -a
|
||||
git checkout v2_v3
|
||||
ls
|
||||
gulp ubil
|
||||
gulp
|
||||
r
|
||||
cd game-lib
|
||||
ls
|
||||
cd src/
|
||||
ls
|
||||
cd ..
|
||||
ls
|
||||
gulp
|
||||
exit
|
||||
3d
|
||||
grep "scene3d" * -R
|
||||
cd src/
|
||||
grep "scene3d" * -R
|
||||
grep "scene3d" * -Rl | xargs sed -i "s/scene3d/scene/g"
|
||||
grep "scenesList" * -R
|
||||
grep "scenesList" * -Rl | xargs sed -i "s/scenesList/divScenesList/g"
|
||||
grep "threeScene" * -R
|
||||
grep "threeScene" * -Rl | xargs sed -i "s/threeScene/scene.instance/g"
|
||||
grep "divContainerId" * -R
|
||||
cd ..
|
||||
cd api-v1.6/
|
||||
git checkout stable
|
||||
git status
|
||||
vim .gitignore
|
||||
git reset --hard HEAD
|
||||
git pull
|
||||
git status
|
||||
git branch stable_v2_v3
|
||||
git checkout stable_v2_v3
|
||||
git checkout v2
|
||||
git pull
|
||||
git checkout stable_v2_v3
|
||||
git merge v2
|
||||
git checkout v3
|
||||
git pull
|
||||
git checkout stable_v2_v3
|
||||
git merge v3
|
||||
git mergetool
|
||||
git commit -am "api merge conflicts"
|
||||
git push
|
||||
git push -u origin stable_v2_v3
|
||||
find . -name "*.orig" | xargs rm
|
||||
ls
|
||||
git status
|
||||
r
|
||||
cd 3d-editor
|
||||
grep "skeletonHelper" * -R
|
||||
cd src/
|
||||
grep "skeletonHelper" * -R
|
||||
grep "divSystemsList" * -R
|
||||
grep "divSystemsList" * -Rl | xargs sed -i "s/divSystemsList/divSystems/g"
|
||||
grep "inputLogin" * -R
|
||||
grep "rUsername" * -R
|
||||
grep "rUsername" * -Rl | xargs sed -i "s/rUsername/inputRUsername/g"
|
||||
grep "rPassword" * -R
|
||||
grep "rPassword" * -Rl | xargs sed -i "s/rPassword/inputRPassword/g"
|
||||
grep "inputRUsername" * -R
|
||||
grep "inputRUsername" * -Rl | xargs sed -i "s/inputRUsername/inputRegisterUsername/g"
|
||||
grep "inputRPassword" * -Rl | xargs sed -i "s/inputRPassword/inputRegisterPassword/g"
|
||||
ibus restart
|
||||
cd ..
|
||||
gulp
|
||||
exit
|
||||
l
|
||||
cd blender-node
|
||||
git diff
|
||||
git status
|
||||
rm -rf .idea/
|
||||
git status
|
||||
find . -name "*.orig" | xargs rm
|
||||
ls
|
||||
git status
|
||||
git pull
|
||||
git status
|
||||
vim .gitignore
|
||||
rm src/output.log
|
||||
rm src/test
|
||||
rm trackTest3.blend
|
||||
git status
|
||||
git add .gitignore
|
||||
git commit -am "gitignore"
|
||||
git push
|
||||
git branch -a
|
||||
branch v2_v3
|
||||
git branch v2_v3
|
||||
git checkout v2_v3
|
||||
git merge v2
|
||||
git mergetool
|
||||
git commit -am "merge conflicts"
|
||||
git push
|
||||
git push --set-upstream origin v2_v3
|
||||
git status
|
||||
find . -name "*.orig" | xargs rm
|
||||
git push
|
||||
git merge v3
|
||||
git checkout v3
|
||||
git checkout v2
|
||||
git pull
|
||||
git merge v3
|
||||
git mergetool
|
||||
git commit -am "merge conflicts"
|
||||
git push
|
||||
git checkout v2_v3
|
||||
git merge v3
|
||||
git commit -am "merged v3"
|
||||
git push
|
||||
find . -name "*.orig" | xargs rm
|
||||
ls
|
||||
git status
|
||||
git push
|
||||
npm install
|
||||
git status
|
||||
3d
|
||||
cd src/
|
||||
grep "api_v3" * -R
|
||||
grep "api_v3" * -Rl | xargs sed -i "s/api_v3/api16/g"
|
||||
exit
|
||||
ssh gw-3d
|
||||
exit
|
||||
ssh gw-3d
|
||||
ssh gw-3d
|
||||
exit
|
||||
gnome-screenshot -a
|
||||
ssh gw-3d
|
||||
scp -r Desktop/pdf-embedder gw-3d:/srv/salesshuttle.de/www/wp-content/plugins
|
||||
ssh gw-3d
|
||||
exit
|
||||
gnome-screenshot -a
|
||||
exit
|
||||
gnome-screenshot -a
|
||||
gl
|
||||
cd src/
|
||||
grep "linkObjects" * -R
|
||||
git diff
|
||||
git commit -am "entities are components"
|
||||
git push
|
||||
csd ..
|
||||
cd ..
|
||||
cd 3d-editor
|
||||
git commit -am "entities are components"
|
||||
git push
|
||||
exit
|
||||
gnome-screenshot --help
|
||||
gnome-screenshot -d 3 -f=slide_1.png
|
||||
gnome-screenshot -d 3 -f="Cslide_1.png"
|
||||
gnome-screenshot -d 3 -f "slide_1.png"
|
||||
gnome-screenshot -d 3 -f "slide_1.png" --display 1
|
||||
gnome-screenshot -d 3 -f "slide_1.png" --display=1
|
||||
gnome-screenshot -d 3 -f "slide_1.png" --display=0
|
||||
gnome-screenshot -d 3 -f "slide_1.png" --display 0
|
||||
gnome-screenshot -d 3 -f "slide_1.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_2.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_3.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_4.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_5.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_6.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_7.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_8.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_9.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_10.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_11.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_12.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_13.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_14.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_15.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_16.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_17.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_18.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_19.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_20.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_21.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_22.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_23.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_24.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_25.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_26.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_27.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_28.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_1.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_0.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_1.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_21.png" -w
|
||||
gnome-screenshot -d 3 -f "slide_17.png" -w
|
||||
e1
|
||||
r
|
||||
l
|
||||
exit
|
||||
3d
|
||||
gulp
|
||||
exit
|
||||
gl
|
||||
gulp
|
||||
exit
|
||||
r
|
||||
3d
|
||||
cd src/
|
||||
cd ..
|
||||
grep "<<" * -R
|
||||
cd src/
|
||||
grep "<<" * -R
|
||||
|
||||
grep "<<.*HEAD" * -R
|
||||
r
|
||||
d
|
||||
e1
|
||||
r
|
||||
r#
|
||||
cd api-v1.6/
|
||||
git diff
|
||||
grep "<<" * -R
|
||||
grep "<<.*HEAD" * -R
|
||||
r
|
||||
cd api-v1.6/
|
||||
npm install
|
||||
r
|
||||
sudo service nginx restart
|
||||
ps
|
||||
d
|
||||
e1
|
||||
r
|
||||
sudo service nginx restart
|
||||
r
|
||||
sudo service nginx restart
|
||||
cd 3d-pong/
|
||||
git diff
|
||||
git commit -am "increase timeout"
|
||||
git push
|
||||
ssh gw-3d
|
||||
git diff
|
||||
git commit -am "bit slower"
|
||||
git push
|
||||
ssh gw-3d
|
||||
git diff
|
||||
git commit -am "reset ball position"
|
||||
git push
|
||||
ssh gw-3d
|
||||
git diff
|
||||
git commit -am "reset ball position"
|
||||
git push
|
||||
ssh gw-3d
|
||||
git commit -am "reset ball position"
|
||||
git push
|
||||
ssh gw-3d
|
||||
exit
|
||||
dl
|
||||
gl
|
||||
git branch v2_v3_stable
|
||||
git checkout v2_v3_stable
|
||||
git push -u origin v2_v3_stable
|
||||
cd ..
|
||||
cd blender-node
|
||||
git branch v2_v3_stable
|
||||
git checkout v2_v3_stable
|
||||
git push -u origin v2_v3_stable
|
||||
git checkout stable
|
||||
cd ..
|
||||
cd api-v1.6/
|
||||
git diff
|
||||
git commit -am "merge conflicts"
|
||||
git push
|
||||
git branch v2_v3_stable
|
||||
git checkout v2_v3_stable
|
||||
git push -u origin v2_v3_stable
|
||||
git checkout stable
|
||||
l
|
||||
ssh gw-3d
|
||||
r
|
||||
l
|
||||
ssh gw-3d
|
||||
p
|
||||
git commit -am "logging"
|
||||
git push
|
||||
git diff
|
||||
git commit -am "orientation callback"
|
||||
git push
|
||||
git commit -am "orientaiton check"
|
||||
git push
|
||||
git commit -am "invert y log"
|
||||
git push
|
||||
git commit -am "assign orientaiton"
|
||||
git push
|
||||
#
|
||||
git commit -am "invert y"
|
||||
git push
|
||||
git diff
|
||||
git commit -am "test for z"
|
||||
git push
|
||||
git commit -am "pong trails also in waiting mode"
|
||||
git push
|
||||
git commit -am "try to fix z motion"
|
||||
git push
|
||||
git commit -am "clamp Z"
|
||||
git push
|
||||
git commit -am "clamp to width not depth"
|
||||
git push
|
||||
ssh gw-3d
|
||||
r
|
||||
l
|
||||
ssh gw-3d
|
||||
l
|
||||
ssh gw-3d
|
||||
l
|
||||
ssh gw-3d
|
||||
|
|
|
|||
44
clients.js
44
clients.js
|
|
@ -11,9 +11,17 @@ var clients = {
|
|||
subAccount : 'root',
|
||||
nameOfTheGame : 'pong',
|
||||
messageItemStart : 'VR Pong - Invite your friends to play!',
|
||||
messageItemEnd :[
|
||||
messageItemEnd : [
|
||||
'Challenge your friends :)'
|
||||
]
|
||||
],
|
||||
endSceneIndex : {
|
||||
'default': {
|
||||
title : 'Great Job!',
|
||||
message : 'Challenge your friends or learn more about Gamewheel',
|
||||
cta : 'https://www.gamewheel.local',
|
||||
quote : 'VR PONG!'
|
||||
}
|
||||
}
|
||||
},
|
||||
'3doo' : {
|
||||
title : "3doo - VR Pong",
|
||||
|
|
@ -28,11 +36,33 @@ var clients = {
|
|||
nameOfTheGame : 'pong',
|
||||
messageItemStart : '3doo VR Pong - Invite your friends to play!',
|
||||
messageItemEnd : [
|
||||
'Please install our <br/><b>3doo Movie Player App</b><br/> using the following link<br/> to watch <b>your free movie</b>',
|
||||
'<b>Want more?</b><br/>Download our<br/><b>3doo Movie Player App.</b>',
|
||||
'<b>Want even more fun?</b><br/>Invite your friends<br/><b>AND BEAT \'EM!</b>',
|
||||
'<b>Like to win?</b><br/>Challenge more friends<br/><b>AND BEAT \'EM!</b>'
|
||||
]
|
||||
'Please install our<br/> <b>3doo Movie Player App</b> <br/>using the following link<br/> to watch <b>your free movie</b>',
|
||||
'<b>Want more?</b><br/> Download our<br/> <b>3doo Movie Player App.</b>',
|
||||
'<b>Want even more fun?</b><br/> Invite your friends <br/><b>AND BEAT \'EM!</b>',
|
||||
'<b>Like to win?</b><br/> Challenge more friends <br/><b>AND BEAT \'EM!</b>'
|
||||
],
|
||||
endSceneIndex : {
|
||||
'default': {
|
||||
title : 'Great Job!',
|
||||
message : 'Challenge your friends<br/> AND BEAT ‘EM <br/>or learn more about 3doo.<br/>',
|
||||
cta : 'https://app.adjust.com/9lxsna',
|
||||
quote : 'Try this awesome 3doo VR game – and beat me!'
|
||||
},
|
||||
'alternate' : {
|
||||
title : 'Great Job!',
|
||||
message : 'Install our 3doo App now to watch the free movie!',
|
||||
cta : 'https://app.adjust.com/m0ewt7',
|
||||
quote : 'I just won free a 3doo movie by playing a VR game. Check it out'
|
||||
},
|
||||
'app' : {
|
||||
title : 'Great Job!',
|
||||
message : 'Challenge friends <br/>AND BEAT ‘EM <br/>or learn more about 3doo.',
|
||||
cta : 'https://3doo.com',
|
||||
quote : 'Just discovered a cool VR game in the 3doo app. Check it out!'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ var config = {
|
|||
default: {
|
||||
platform: 'gamewheel',
|
||||
account: 'root',
|
||||
subAccount: 'root'
|
||||
subAccount: 'root',
|
||||
nameOfTheGame: 'test'
|
||||
},
|
||||
uploadPath: '/uploads'
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,18 +6,19 @@ server {
|
|||
|
||||
root /usr/share/gamewheel/3d-editor;
|
||||
|
||||
location ~ \.php$ {
|
||||
fastcgi_pass 127.0.0.1:9001;
|
||||
fastcgi_index index.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param SCRIPT_URL $request_uri;
|
||||
fastcgi_param SERVER_NAME $http_host;
|
||||
include fastcgi_params;
|
||||
}
|
||||
location ~/ {
|
||||
|
||||
location / {
|
||||
add_header Access-Control-Allow-Origin $http_origin;
|
||||
autoindex on;
|
||||
if ($request_method = OPTIONS ) {
|
||||
add_header Access-Control-Allow-Origin $http_origin;
|
||||
add_header Access-Control-Allow-Methods "GET, OPTIONS, POST";
|
||||
add_header Access-Control-Allow-Headers "Authorization";
|
||||
add_header Access-Control-Allow-Credentials "true";
|
||||
add_header Content-Length 0;
|
||||
add_header Content-Type text/plain;
|
||||
return 200;
|
||||
}
|
||||
|
||||
add_header Access-Control-Allow-Origin $http_origin;
|
||||
try_files $uri $uri/ @node;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,17 @@ server {
|
|||
root /usr/share/gamewheel/api-v1.6;
|
||||
|
||||
location / {
|
||||
|
||||
if ($request_method = OPTIONS ) {
|
||||
add_header Access-Control-Allow-Origin $http_origin;
|
||||
add_header Access-Control-Allow-Methods "GET, OPTIONS, POST";
|
||||
add_header Access-Control-Allow-Headers "Authorization";
|
||||
add_header Access-Control-Allow-Credentials "true";
|
||||
add_header Content-Length 0;
|
||||
add_header Content-Type text/plain;
|
||||
return 200;
|
||||
}
|
||||
|
||||
add_header Access-Control-Allow-Origin $http_origin;
|
||||
autoindex on;
|
||||
try_files $uri $uri/ @node;
|
||||
|
|
|
|||
Loading…
Reference in New Issue