diff --git a/bash_history b/bash_history index 1285f11..d91651b 100644 --- a/bash_history +++ b/bash_history @@ -11701,3 +11701,658 @@ sudo ln -s /usr/share/cybafelo/config/progress-dot-on16.png sudo rm progress-dot-on1.png ls exit +c +cd config/ +git diff +git commit -am "stuff +" +git status +git add progress-dot-on16.png +git add ubuntu-logo* +git commit -am "rename" +git push +exit +c +cd config/ +ls +mv ubuntu_logo16.png ubunty-logo16.png +mv ubuntu_logo.png ubunty-logo.png +mv ubunty-logo.png ubuntu-logo.png +mv ubunty-logo16.png ubuntu-logo16.png +mv progress_dot_on16.png progress-dot-on16.png +ls -l +rm progress_dot_on.png +git diff +exit +cd /usr/share/plymouth/themes/ubuntu-logo/ +ls +pactl unload-module module-loopback +pactl load-module module-loopback latency_msec=1 +pactl unload-module module-loopback +exit +s +m +exit +gnome-calculator +exit +r +exit +mongo +exit +gl +gulp +exit +s +m +exit +p +gulp +exit +3d +gulp +exit +gl +cd src/ +grep "GameLib.D3.API.Mesh.MESH_TYPE" * -R +grep "GameLib.D3.API.Mesh.MESH_TYPE" * -Rl | xargs sed -i "s/GameLib.D3.API.Mesh.MESH_TYPE/GameLib.D3.API.Object.OBJECT_TYPE_MESH/g" +grep "OBJECT_TYPE_MESH_NORMAL" * -R +grep "OBJECT_TYPE_MESH_NORMAL" * -Rl | xargs sed -i "s/OBJECT_TYPE_MESH_NORMAL/OBJECT_TYPE_MESH/g" +grep "GameLib.D3.API.Object.OBJECT_TYPE_LIGHT" * -R +grep "GameLib.D3.API.Object.OBJECT_TYPE_LIGHT" * -Rl | xargs sed -i "s/GameLib.D3.API.Object.OBJECT_TYPE_LIGHT/GameLib/D3.API.Light.LIGHT_TYPE/g" +grep "GameLib.D3.API.Object.OBJECT_TYPE_LIGHT" * -Rl | xargs sed -i "s/GameLib.D3.API.Object.OBJECT_TYPE_LIGHT/GameLib.D3.API.Light.LIGHT_TYPE/g" +git diff +git commit -am "cameras and meshes are now 3d objects" +git push +git push flyingspoon +3d +p +exit +gl +cd src/ +grep "GameLib.D3.API.Light.LIGHT_TYPE" * -R +grep "GameLib.D3.API.Light.LIGHT_TYPE" * -Rl | xargs sed -i "s/GameLib.D3.API.Light.LIGHT_TYPE/GameLib.D3.API.Object.OBJECT_TYPE_LIGHT/g" +exit +gl +cd src/ +grep "GameLib.D3.API.Camera.CAMERA_TYPE_" * -R +grep "GameLib.D3.API.Camera.CAMERA_TYPE_" * -Rl | xargs sed -i "s/GameLib.D3.API.Camera.CAMERA_TYPE/GameLib.D3.API.Object.OBJECT_TYPE_CAMERA/g" +exit +ps -A +st +killall csgo_linux +ps -A | grep go +killall csgo_linux64 +exit +pactl unload-module module-loopback +pactl load-module module-loopback latency_msec=1 +exit +pactl unload-module module-loopback +pactl load-module module-loopback latency_msec=1 +pactl unload-module module-loopback +pactl load-module module-loopback latency_msec=1 +pactl unload-module module-loopback +pactl load-module module-loopback latency_msec=1 +r +exit +3d +s +r +m +exit +r +exit +3d +gulp +exit +r +p +gulp +exit +gl +gulp +git diff +git commit -am "introducing 2d renderer" +exit +gl +cd src/ +grep "Renderer.MODE_CANVAS" * -R +grep "Renderer.MODE_CANVAS" * -Rl | xargs sed -i "s/Render.MODE_CANVAS/Render.MODE_CANVAS_3D/g" +grep "Renderer.MODE_CANVAS" * -Rl | xargs sed -i "s/Renderer.MODE_CANVAS/Renderer.MODE_CANVAS_3D/g" +grep "GameLib.D3.Renderer" * -R +grep "GameLib.D3.Renderer" * -Rl | xargs sed -i "s/GameLib.D3.Renderer/GameLib.Renderer/g" +grep "GameLib.D3.API.Renderer" * -R +grep "GameLib.D3.API.Renderer" * -Rl | xargs sed -i "s/GameLib.D3.API.Renderer/GameLib.API.Renderer/g" +grep "MODE_CANVAS_3D" * -R +grep "MODE_CANVAS_3D" * -Rl | xargs sed -i "s/MODE_CANVAS_3D/MODE_CANVAS/g" +grep "GameLib.D3.Renderer" * -R +grep "new.*GameLib.Renderer" * -R +3d +git diff +git commit -am "2d renderer for impact" +git push +git push flyingspoon +gl +git push flyingspoon +e +r +pactl load-module module-loopback latency_msec=1 +ssh spoon2 +exit +ssh spoon2 +scp spoon2:/home/bittler/playground/Projekt016/i_saver/ -r . +scp -r spoon2:/home/bittler/playground/Projekt016/i_saver/ . +cd iscan-bundle-1.0.4.x64.deb/ +cd i_saver/ +ls +cd lib/ +grep "input.joy" * -R +exit +cd /etc/ +sudo vim hosts +exit +r +sudo service nginx restart +exit +scp spoon2:/home/bittler/playground/Projekt016/i_collector/ ./pacman +mkdir pacman +scp spoon2:/home/bittler/playground/Projekt016/i_collector/ ./pacman -R +scp -R spoon2:/home/bittler/playground/Projekt016/i_collector/ ./pacman +scp -r spoon2:/home/bittler/playground/Projekt016/i_collector/ ./pacman +shutter +exit +cd Pictures/ +ls +scp fn_Tileset.png spoon2:/home/bittler/playground/Projekt016/i_collector/media/ +scp fn_Tileset.png spoon2:/tmp +c +scp -r spoon2:/home/bittler/playground/Projekt016/* . +scp -r spoon2:/home/bittler/playground/DonkeyKong_t_system/ . +cd DonkeyKong_t_system/ +light-server --? +light-server --help +light-server -s . -p 4001 +exit +gl +c +cd DonkeyKong_t_system/ +ls +grep "EntityButton" * -R +grep "touchmove" * -R +cd .. +cd i_saver/ +grep "GameOver" * -R +grep "coins" * -R +grep "EntityPlayer" * -R +grep "StartScreen" * -R +grep "EntityPlayer" * -R +grep "EntityPlayer" * -Rl | xargs sed -i "s/EntityPlayer/ig.EntityPlayer/g" +grep "EntityLadder" * -Rl | xargs sed -i "s/EntityLadder/ig.EntityLadder/g" +grep "EntityEnemywindow" * -Rl | xargs sed -i "s/EntityEnemywindow/ig.EntityEnemywindow/g" +grep "EntityEnemyviking" * -Rl | xargs sed -i "s/EntityEnemyviking/ig.EntityEnemyviking/g" +grep "EntityEnemyammo" * -Rl | xargs sed -i "s/EntityEnemyammo/ig.EntityEnemyammo/g" +grep "EntityCoin" * -R +grep "EntityCoin" * -Rl | xargs sed -i "s/EntityCoin/ig.EntityCoin/g" +grep "type.*Entity" * -R +grep "type.*Entity" * -Rl | xargs sed -i "/type.*ig\.Entity/s/ig.Entity/Entity/" +grep "type.*Entity" * -R +grep "EntityPlayer" * -Rl | xargs sed -i "s/EntityPlayer/ig.EntityPlayer/g" +grep "type.*Entity" * -Rl | xargs sed -i "/type.*ig\.Entity/s/ig.Entity/Entity/" +grep "EntityPlayer" * -R +grep "ig.ig.Entity" -lR | xargs sed -i "s/ig.ig/ig/g" +grep "EntityPlayer" * -R +grep "EntityLadder" * -R +grep "EntityEnemywindow" * -R +grep "type\s*:\s*Entity" * -R +grep "type\s*:\s*Entity" * -Rl | xargs sed -i "s/type\/s*:\s*Entity/type : ig.Entity/g" +grep "type\s*:\s*Entity" * -Rl | xargs sed -i "s/type/s*:\s*Entity/type : ig.Entity/g" +grep "type\s*:\s*Entity" * -Rl | xargs sed -i "s/type\s*:\s*Entity/type : ig.Entity/g" +grep "EntityCoin" * -R +grep "input.joystick" * -R +cd .. +cd DonkeyKong_t_system/ +grep "input.joystick" * -R +cd .. +cd i_saver/ +grep "joystick.*function" * -R +grep "function.*joystick.*" * -R +d +cd +cd i_saver/ +grep "function.*joystick.*" * -R +grep "joystick.*function" * -R +cd lib/impact/ +ls +vim impact.js +gl +ls +cd .. +cd i_saver/ +ls +cd lib/ +ls +mv impact impact.new +cp -R ~/i_saver/lib/impact . +ls +exit +shutter +gnome-calculator +c +cd i_saver/ +ls +git init . +git status +cd lib/ +ls +rm -rf impact +cp ../../api-v1/public/impact_src/lib/impact . +cp ../../api-v1/public/impact_src/lib/impact . -R +cd .. +git status +git add & +git add * +cd .. +cd +php -a +vim /etc/nginx/sites-enabled/cybafelo.conf +c +ls +mkdir weltmeister +cd weltmeister/ +ls +c +cd i_saver/ +ls +grep "ig.Entity\w" * -R +grep "ig.Entity\w" * -Rl | xargs sed -i "s/ig.Entity(\w)/Entity\1/g" +grep "ig.Entity\w" * -Rl | xargs sed -i "s/ig.Entity\(\w\)/Entity\1/g" +grep "ig.Entity\w" * -R + +exit +c +ls +cd i_saver/ +ls +cd lib/ +ls +cd gam +cd game/ +ls +vim main.js +cd .. +ls +cd .. +ls +light-server -s . +pactl load-module module-loopback latency_msec=1 +pactl unload-module module-loopback +meld +c +cd DonkeyKong_t_system/ +grep resetLevel * -R +grep "ending" * -R +grep "\bending\b" * -R +grep "levelLost" * -R +cd .. +cd i_saver/ +grep "levelLost" * -R +grep "sessionStats" * -R +cd .. +cd DonkeyKong_t_system/ +grep "sessionStats" * -R +grep "endScene" * -R +grep "getBootScene" * -R +c +cd i_saver/ +git diff +git status +git add * +git rm lib/impact.new/ +git rm lib/impact.new/ -r +git commit -am "touch" +git push +git status +git commit -am "first commit" +git push +cd .. +cd DonkeyKong_t_system/ +grep "endScene" * -R +grep "actions" * -R +grep "onSceneEnd" * -R +grep "goToScene" * -R +grep "endScene" 8 -R +grep "endScene" * -R +grep "endScene.*function" * -R +grep "goToScene" * -R +grep "ending.*function" * -R +grep "\bending\b.*function" * -R +cd .. +cd i_saver/ +ls +git diff +git commit -am "redirect on end" +git push +ssh spoon2 +cd .. +cd DonkeyKong_t_system/ +grep "TouchButtonCollection" * -R +cd.. +cd .. +cd i_saver/ +grep "TouchButtonCollection" * -R +git diff +git commit -am "touch button update" +gitp ush +git push +cd .. +cp i_saver i_saver.bak +cp i_saver i_saver.bak -R +cd i_saver +git push +ls +git status +git add * +git status +git push +git dfif +git diff +git commit -am "also climb on up" +git push +git dff +git diff +git commit -am "get rid of start scene" +git push +git diff +git commit -am "remove global" +git push +cd .. +scp -r spoon2:/home/bittler/playground/ninja/ . +cd i_saver +git commit -am "resize +" +git push +git commit "delayed resize and orientation trigger" +git commit -am "delayed resize and orientation trigger" +git push +git diff +git commit -am "fix touch buttons" +git pus +git push +git commit -am "fix jump" +git push +git diff +git commit -am "new enemy" +git push +exit +gnome-calculator +c +mv i_collector i_pacman +cd ninja/ +light-server -s . -p 4001 +exit +c +cd i_saver/ +ls +cd .. +cd DonkeyKong_t_system/ +grep "joystick.*function" * -R +cd lib/impact/ +vim impact.js +vim input.js +ssh spoon2 +cd .. +light-server -s . +cd .. +cd i_saver/ +light-server -s . +git remote add origin git@bitbucket.org:flyingspoon/i_saver.git +git push -u origin master +light-server -s . +exit +gl +cd .. +cd DonkeyKong_t_system/ +ls +grep "ig.content" * -R +git commit -am "latest" +cd .. +cd i_saver +git diff +git commit -am "score multiplier 1000" +git push +ls +cd tools/ +ls +chmod +x bake.sh +./bake.sh +ls +vim bake.sh +git commit -am "sounds disable - debug mesg" +gitpush +git push +cd .. +ls +php tools/bake.php +cd lib +ls +rm -rf impact.new +cd plugins/ +ls +rm touch-button-broken.js +ls +cd .. +ls +cd weltmeister/ +ls +cd .. +ls +cd game/ +ls +cd entities/ +ls +cd .. +cd levels/ +ls +cd .. +ls +cd .. +ls +tree . +cd .. +php tools/bake.php lib/impact lib/plugins lib/game i_saver.min.js +php tools/bake.php lib/impact/*.js lib/plugins/*.js lib/game/*.js i_saver.min.js +vim i_saver.min.js +git add i_saver.min.js +git commit -am "baked" +git push +exit +ssh spoon2 +exit +c +cd i_saver +grep "debugMessage" +grep "debugMessage" * -R +cd .. +ls +exit +ssh spoon2 +exit +c +cd i_saver +git push +cat lib/game/main.js +exit +gl +cd .. +cd i_saver +php tools/bake.php lib/impact/*.js lib/plugins/*.js lib/game/*.js i_saver.min.js +git commit -am "really disable sound" +git push +ssh spoon2 +exit +pactl load-module module-loopback latency_msec=1 +r +exit +s +m +exit +gl +grep "setSize" * -R +cd src/ +grep "setSize" * -R +grep "TYPE_THREE_JS" * -R +grep "TYPE_THREE_JS" * -Rl | xargs sed -i "s/TYPE_THREE_JS/GRAPHICS_RUNTIME_THREE/g" +exit +gl +gulp +3d +gulp +r +p +gulp +cd /etc/nginx/ +ls +cd sites-enabled/ +ls +vim cybafelo.conf +sudo service nginx restart +vim cybafelo.conf +exit +sudo service nginx restart +exit +r +d +s +exit +p +s +r +exit +m +exit +3d +gulp +exit +gl +gulp +exit +gl +grep "new.*Canvas" * -R +cd src/ +grep "new.*Canvas" * -R +exit +c +cd api-v1/ +ls +ln -s public/impact impact +ls +exit +c +cd i_saver +light-server -s . +pactl load-module module-loopback latency_msec=1 +pactl unload-module module-loopback +exit +pactl unload-module module-loopback +pactl load-module module-loopback latency_msec=1 +c +cd i_saver +light-server -s . +exit +m +exit +s +r +exit +3d +gulp +exit +gl +gulp +git diff +git commit -am "graphics runtimes" +git push +git push flyingspoon +exit +gl +git diff +cd .. +cd i_Sa +cd i_saver +git diff +git commit -am "bigger buttons" +git push +ssh spoon2 +gl +cd src/ +grep "addComponent" * -R +exit +c +cd i_saver +git commit -am "no outline" +git push +exit +ssh cybafelo.com +exit +cat .ssh/id_rsa.pub +ls +cd config/ +ls +grep "cybafelo.com" * -R +ls +cd .. +c +exit +r +d +st +s +exit +ssh cybafelo.com +vim /etc/hosts +exit +c +cd config/ +grep "cybafelo.com" * -R +grep "cybafelo.com" * -R --exclude=bash_history +grep "cybafelo.com" * -R --exclude=bash_history --exclude=general +grep "cybafelo.com" * -R --exclude=bash_history --exclude=general -lR | xargs sed -i "s/cybafelo.com/cybafelo.local/g" +ls +s +3d +gulp +cd .. +cd api-v1/ +ls +exit +c +cd api-v1/ +git diff +git commit -am "snake" +git push +git push flyingspoon +git status +git add impact/lib/game/entities/snake-head.js +impact/lib/game/levels/ +impact/media/platforms.png +git add impact/lib/game/levels/ impact/media/platforms.png +git commit -am "images" +git push +ls +git status +vim index. +vim index.php +rm index. +rm index.php +rm image_* +ls +cd .. +ls +cd 3d-editor/ +git diff +git status +git commit -am "runtime - also no impact" +git push +git push flyingspoon +gl +git diff +exit diff --git a/clients.js b/clients.js index 2fe7640..11f1da0 100644 --- a/clients.js +++ b/clients.js @@ -1,12 +1,12 @@ var clients = { '3d-pong' : { title : "Gamewheel Multiplayer VR Pong", - ogUrl : "http://3d-pong.cybafelo.com", + ogUrl : "http://3d-pong.cybafelo.local", ogType : "website", ogTitle : "Gamewheel Multiplayer VR Pong", ogDescription : "Games is our game", - ogImage : "http://3d-pong.cybafelo.com/pong_image.png", - ctaUrl : "https://www.cybafelo.com", + ogImage : "http://3d-pong.cybafelo.local/pong_image.png", + ctaUrl : "https://www.cybafelo.local", account : 'root', subAccount : 'root', nameOfTheGame : 'pong', @@ -18,18 +18,18 @@ var clients = { 'default': { title : 'Great Job!', message : 'Challenge your friends or learn more about Gamewheel', - cta : 'https://www.cybafelo.com', + cta : 'https://www.cybafelo.local', quote : 'VR PONG!' } } }, '3doo' : { title : "3doo - VR Pong", - ogUrl : "http://3doo.cybafelo.com", + ogUrl : "http://3doo.cybafelo.local", ogType : "website", ogTitle : "3doo – VR App", ogDescription : "Spiele PONG in 3d und VR mit 3doo", - ogImage : "http://3doo.cybafelo.com/pong_image.png", + ogImage : "http://3doo.cybafelo.local/pong_image.png", ctaUrl : "https://3doo.com", account : '3doo', subAccount : 'root', diff --git a/config.js b/config.js index de87dbd..e3f6a12 100644 --- a/config.js +++ b/config.js @@ -2,7 +2,7 @@ var environment = { path : '/usr/share/cybafelo', protocol : 'http', environment : 'tj', - domain : 'cybafelo.com' + domain : 'cybafelo.local' }; var protocol = environment.protocol; @@ -28,7 +28,8 @@ var config = { api16: { url: protocol + '://' + user + '-api-v1.' + domain, remoteUrl: protocol + '://live-api-v1.flyingspoon.de', - uploadPath: '/uploads' + uploadPath: '/uploads', + impactUrl : 'http://tj-api-v1.cybafelo.local/impact' }, tools: { url: protocol + '://' + user + '-tools.' + domain, diff --git a/hosts b/hosts index 614a58c..fa8aa67 100644 --- a/hosts +++ b/hosts @@ -1,25 +1,26 @@ 127.0.0.1 localhost 127.0.1.1 cybafelo -127.0.1.1 cybafelo.cybafelo.com +127.0.1.1 cybafelo.cybafelo.local # Gamewheel dev endpoints -127.0.1.1 tj-3d-editor.cybafelo.com -127.0.1.1 tj-3d-pong.cybafelo.com -127.0.1.1 tj-3doo.cybafelo.com -127.0.1.1 tj-3d-racing.cybafelo.com -127.0.1.1 tj-api-v1.cybafelo.com -127.0.1.1 tj-tools.cybafelo.com -127.0.1.1 tj-gate.cybafelo.com -127.0.1.1 tj-content.cybafelo.com -127.0.1.1 tj-asset.cybafelo.com -127.0.1.1 tj-port.cybafelo.com -127.0.1.1 tj-app.cybafelo.com -127.0.1.1 tj-api.cybafelo.com -127.0.1.1 tj-cdn.cybafelo.com -127.0.1.1 tj-mail.cybafelo.com -127.0.1.1 tj-cron.cybafelo.com -127.0.1.1 tj-preview.cybafelo.com -127.0.1.1 tj-release.cybafelo.com +127.0.1.1 tj-3d-editor.cybafelo.local +127.0.1.1 tj-3d-pong.cybafelo.local +127.0.1.1 tj-3doo.cybafelo.local +127.0.1.1 tj-3d-racing.cybafelo.local +127.0.1.1 tj-api-v1.cybafelo.local +127.0.1.1 tj-tools.cybafelo.local +127.0.1.1 tj-gate.cybafelo.local +127.0.1.1 tj-content.cybafelo.local +127.0.1.1 tj-asset.cybafelo.local +127.0.1.1 tj-port.cybafelo.local +127.0.1.1 tj-app.cybafelo.local +127.0.1.1 tj-api.cybafelo.local +127.0.1.1 tj-cdn.cybafelo.local +127.0.1.1 tj-mail.cybafelo.local +127.0.1.1 tj-cron.cybafelo.local +127.0.1.1 tj-preview.cybafelo.local +127.0.1.1 tj-release.cybafelo.local +127.0.1.1 tj-weltmeister.cybafelo.local # The following lines are desirable for IPv6 capable hosts ::1 ip6-localhost ip6-loopback diff --git a/nginx/sites-available/cybafelo.conf b/nginx/sites-available/cybafelo.conf index e82672f..7c155d0 100644 --- a/nginx/sites-available/cybafelo.conf +++ b/nginx/sites-available/cybafelo.conf @@ -20,7 +20,7 @@ server { add_header Access-Control-Allow-Credentials true; fastcgi_pass php; - fastcgi_index index.php; + 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; diff --git a/nginx/ssl/ssl.conf b/nginx/ssl/ssl.conf index d4f0b67..3eaaa6c 100644 --- a/nginx/ssl/ssl.conf +++ b/nginx/ssl/ssl.conf @@ -1,5 +1,5 @@ - ssl_certificate ssl/cybafelo.com.crt; - ssl_certificate_key ssl/cybafelo.com.key; + ssl_certificate ssl/cybafelo.local.crt; + ssl_certificate_key ssl/cybafelo.local.key; ssl_session_timeout 5m; ## Don't use SSL v3 because of POODLE vulnerability # ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; diff --git a/secure.js b/secure.js index e62a85d..705e02d 100644 --- a/secure.js +++ b/secure.js @@ -61,7 +61,7 @@ var secure = { // host: "smtp.office365.com", // port: 587, // auth: { - // user: "admin@cybafelo.com", + // user: "admin@cybafelo.local", // pass: "Toypro42!" // }, // secureConnection: false, @@ -70,8 +70,8 @@ var secure = { // rejectUnauthorized: false // }, // emails: { - // founder: "evgeni@cybafelo.com", - // support: "support@cybafelo.com" + // founder: "evgeni@cybafelo.local", + // support: "support@cybafelo.local" // } // }, mailer: { @@ -94,7 +94,7 @@ var secure = { cron: { port: 3116, debugPort: 3216, - apiUser : 'tj@cybafelo.com', + apiUser : 'tj@cybafelo.local', apiPassword : 'test12345' }, db : {