From 5b347466a5af648e283e1ca14683a83131043d48 Mon Sep 17 00:00:00 2001 From: -=yb4f310 Date: Mon, 2 Oct 2017 12:02:07 +0200 Subject: [PATCH] stuff --- bash_aliases | 2 +- bash_history | 1906 ++++++++++++++++++++++++++++++++++++++++++++++++++ config.js | 1 + hosts | 1 + start_api | 2 +- start_app | 2 +- start_cron | 2 +- start_editor | 2 +- start_gate | 2 +- start_pong | 4 +- start_port | 2 +- start_racing | 2 +- start_tools | 2 +- 13 files changed, 1919 insertions(+), 11 deletions(-) diff --git a/bash_aliases b/bash_aliases index 31c94c0..26372c3 100644 --- a/bash_aliases +++ b/bash_aliases @@ -3,7 +3,7 @@ alias s='cd /usr/share/cybafelo && ./start' alias d='cd /usr/share/cybafelo && ./delete' alias st='cd /usr/share/cybafelo && ./stop' alias gl='cd /usr/share/cybafelo/game-lib' -alias p='cd /usr/share/cybafelo/3d-pong' +alias p='cd /usr/share/cybafelo/preview' alias 3d='cd /usr/share/cybafelo/3d-editor' alias api='cd /usr/share/cybafelo && ./start_api' alias app='cd /usr/share/cybafelo && ./start_app' diff --git a/bash_history b/bash_history index 94786a0..3288e7d 100644 --- a/bash_history +++ b/bash_history @@ -3947,3 +3947,1909 @@ git push git remote -ve git remote -v exit +s +m +./status_all +cd config/ +git commit -am "hist" +git push +exit +c +cd config/ +git diff +cd .. +cd 3d-racing +cd .. +cd 3d-racing-server/ +git diff +git push +cd .. +./status_all +exit +gl +gulp +3d +gulp +s +exit +ccsm +exit +s +m +exit +3d +gulp +gl +gulp +npm i -g npm-check-updates +sudo npm i -g npm-check-updates +gl +vim package.json +npm update --save +exit +c +ls +cd game-lib/ +ls +cd .. +cd 3d-editor/ +lss +ls +vim package.json +npm update +npm i -g npm +sudo npm i -g npm +vim package.json +npm install --save threejs +vim package.json +npm update --save +ls +git add package-lock.json +git commit -am "lock" +git push +exit +gl +npm update --save +cd .. +gl +cd src/ +grep "TEXTURE_INSTANCE_CREATED" * -R +r +r# +r +s +m +3d +gulp +gl +gulp +tp[ +top +exit +killall chrom +killall chrome +exit +m +exit +lspci +lsvga +lspci --hel +lspci --v | grep VGA +lspci -v | grep VGA +exit +gl +cd src/ +grep "MATERIAL_TYPE_CHANGED" * -R +3d +npm update --save +npm install +vim package.json +npm update --save +npm update dat.gui --save +npm remove dat.gui +npm install --save dat.gui +vim package +.j +vim package.json +# +git diff +git commit -am "ok - image loading for blender files working again - multi textures enabled" +git push +cd src/ +grep "GameLib.Event.BUILD_GUI" * -R +gl +cd src/ +grep "GameLib.Event.BUILD_GUI" * -R +git diff +git commit -am "move to faster buffergeometries - blender upload working again - gui starts to support multiple selections again" +git push +s +3d +gulp +git diff +git commit -am "move more to game-lib - apply rot pos scale" +git push +git remote -v +vim .git/config +git push origin +git remote remove gamewheel +git push +git status +git push +git push origin +git push --verbose +c +cd blender-node/ +git diff +git commit -am "multiple materials working again" +git push +cd .. +cd blender-files/ +git diff +git status +git add rubix/black.png +git add rubix/rubix.blend +git add rubix/rubix.blend1 +git commit -am "rubix stuff" +git push +git remote -v +git push +git push --verbose +v +c +ls +gl +gulp +./stat +git push +git remote -ve +git remote -v +git remote remove gamewheel +git status +git diff +git push +git remote -v +git push origin +git push --vvvv +git push --vv +cd .. +./status_all +gl +git push +git -v push +git --verbose push +git push --verbose +git diff +git commit -am "affected objects pt. 2" +git push +exit +gl +gulp +cd src/ +grep "GameLib.Utils.Extend" * -R +gulp +c +cd api-v1/ +git diff +git commit -am "image fixes" +git push +git status +rn image_cggnz9100s.unknown +rm image_cggnz9100s.unknown +rm image_lromhdv135.unknown +ls +cd .. +cd blender-node/ +git diff +git push +ls +exit +3d +gulp +git diff +git status +git push +exit +s +m +./status_all +exit +c +cd blender-files/ +git push +exit +ifconfig +m +exit +gl +git pull +git diff +gl +gulp +exit +3d +cd node_modules/dat.gui/ +ls +cd build/ +ls +vim dat.gui.js +ls +vim dat.gui.min.js +ls +cd .. +ls +vim package.json +npm install +3d +gulp +exit +3d +cd src/ +grep "PARENT_SCENE_CHANGE" * -R +gl +cd src/ +grep "PARENT_SCENE_CHANGE" * -R +grep "parentScene\s*null" * -R +grep "parentScene\s*" * -R +grep "parentScene\s*=\s*null" * -R +3d +cd src/ +grep "parentScene\s*=\s*null" * -R +grep "activeCamera" * -R +gl +cd src/ +grep "activeCamera" * -R +grep "COMPONENT_REMOVE" * -R +grep "MESH_DELETED" * -R +exit +3d +cd src/ +cd .. +cd node_modules/dat.gui/ +ls +npm run build +webpack +sudo apt-get install webpack +sudo npm install -g webpack +npm run build +ls +vim package.json +npm install +cat /home/tj/.npm/_logs/2017-08-24T08_40_02_983Z-debug.log +npm install +ls -l +npm run build +cd build/ +ls +vim dat.gui.js +s +gl +gulp +git commit -am "custom components start" +git push +3d +gulp +git commit -am "custom shit !" +git push +r +exit +gl +git diff +git commit -am "storing custom code components and reading them ok" +git push +cd .. +cd api-v1/ +git diff +git push +cd .. +cd blender-node/ +git diff +git push +cd .. +cd blender-files/ +git diff +git push +exit +gl +cd src/ +grep "COMPONENT_REMOVE" * -R +3d +npm remove dat.gui +npm install +cd node_modules/ +ls +cd dat.gui/ +ls +cd .. +rm -rf dat.gui +cd .. +npm install +npm update +npm update dat.gui +cd node_modules/ +ls +cd .. +npm install dat.gui +rpm remove dat.gui +npm remove dat.gui +vim package.json +npm update dat.gui +npm remove --save dat.gui +cd 3rd-party/ +ls +cp ~/Downloads/dat.gui-0.6.5.tar.gz . +tar -xf dat.gui-0.6.5.tar.gz +ls +cd dat.gui-0.6.5/ +ls +cd .. +ls +cp ~/Downloads/dat.gui-0.6.4.tar.gz . +cp ~/Downloads/dat.gui-0.6.3.tar.gz . +cp ~/Downloads/dat.gui-0.6.2.tar.gz . +tar -xf dat.gui-0.6.4.tar.gz +tar -xf dat.gui-0.6.3.tar.gz +tar -xf dat.gui-0.6.2.tar.gz +cp ~/Downloads/dat.gui-0.6.1.tar.gz . +tar -xf dat.gui-0.6.1.tar.gz +git status +git add dat.gui-0.6.* +ls +git status +git add codemirror.zip +git status +cd .. +ls +git diff +git commit -am "scrolling, code mirror stuff" +git push +exit +3d +cd src/ +grep "selectEventType" * -R +grep "selectEventType" * -Rl | xargs sed -i "s/selectEventType/selectCustomCodeComponent/g" +greo "SelectEventType" * -R +gro "SelectEventType" * -R +grep "SelectEventType" * -R +grep "SelectEventType" * -Rl | xargs sed -i "s/SelectEventType/SelectCustomCodeComponent/g" +# +exit +gl +gulp +git diff +exit +3d +gulp +exit +ccsm +s +m +exit +3d +ls +exit +s +m +exit +gl +gulp +exit +3d +gulp +git diff +git commit -am "create textures again" +git push +exit +gl +git diff +git commit -am "start converting between buffer objects and api objects" +git push +cd .. +cd blender-node/ +cd .. +./status_all +exit +gl +cd src/ +grep "IMAGE_UPLOAD_COMPLETE" * -R +grep "LOAD_IMAGE" * -R +exit +r +exit +3d gulp +3d +3d;gulp +exit +gl +gulp +exit +s +m +exit +gl +cd src +grep "TriangleFace" * -R +grep "TriangleFace" * -Rl | xargs sed -i "s/TriangleFace/Face/g" +3d +cd src/ +grep "TriangleFace" * -R +c +cd blender-node/ +grep "TriangleFace" * -R +grep "TriangleFace" * -Rl | xargs sed -i "s/TriangleFace/Face/g" +ls +cd src/ +ls +grep "faceVertexUvs" * -R +cd .. +grep "faceVertexUvs" * -R +gl +cd src/ +grep "faceVertexUvs" * -R +grep "toApiObject.true" * -R +grep "faceVertexUvs" * -R +3d +cd src/ +grep "faceVertexUvs" * -R +cd .. +gl +cd src/ +grep "faceVertexUvs" * -R +exir +exit +gl +gulp +3d +gulp +r +s +m +s +st +3d +cd src +grep "REGISTER_UPDATE" * -R +grep "PARENT_ENTITY_CHANGE" * -R +cd /etc/nginx/ +ls +vim nginx.conf +exit +r +st +s +st +s +st +s +st +r +st +cd api-v1/ +ls +npm install --save mongodb +vim package.json +cp package.json package.json.bak +vim package.json +ls +vim serv +vim bin/start +cd .. +cd api-v1/ +ls +vim server.js +vim index.js +ls +st +s +cd api-v1/ +ls +rm config.js +ls +r +st +r +st +cd api-v1/ +npm install --save lodash +exit +r +exit +api +stop +st +d +c +a +ls +cd api-v1/ +ls +npm install --save body-parser +sudo npm install npm@latest -g +npm update +npm install --save body-parser +npm update +npm --help +npm update -h +npm cache +npm cache clean +npm cache verify +npm cache clean --force +npm install body-parser +git branch api-fucked-up +git checkout api-fucked-up +ls +npm install express +cat /home/tj/.npm/_logs/2017-08-29T09_45_10_790Z-debug.log +npm remove -g npm +npm +npm install express +sudo npm remove -g npm +npm +nodejs +nodejs --version +sudo apt-get install --reinstall nodejs +npm +npm i express +npm install --save body-parser +npm i --save express +npm i --save mongodb +r +s +r +m +r +exit +c +cd api-v1/ +npm install --save lodash +s +st +cd api-v1/ +npm install --save q +st +s +st +npm install --save file-system +npm remove --save file-system +ls +cd api-v1/ +npm install --save file-system +s +st +cd api-v1/ +npm install --save multer +r +cd .. +3d +cd src/ +grep "new.*Image" * -R +gl +grep "new.*Image" * -R +cd src/ +grep "new.*Image" * -R +r +e +r +d +s +r +d +s +r +cd api-v1/ +npm install --save stream-buffers +r +exit +mongo +gl +git diff +git commit -am "buffer and normal geometries" +git push +3d +git diff +git commit -am "no game - gui updates" +git push +cd .. +cd blender-node/ +git diff +git commit -am "Face" +git push +cd .. +./status_all +exit +m +exit +r +c +gl +cd src/ +grep "image.*path.*=" * -R +exi +exit +r +c +exit +gl +gulp +exit +s +m +cd api-v1/ +git diff +git commit -am "migrate to gridfs" +git push +git push -u origin api-fucked-up +git status +exit +3d +gulp +exit +mongo +s +m +gedit +3d +cd src/ +cd .. +cd api-v1/ +npm install --save JSONStream +r +npm install --save event-stream +r +npm install --save ndjson +r +git commit -am "first working serialization stream" +r +gl +cd src/ +grep "backupComponents" * -R +exit +gl +gulp +git diff +git commit -am "helpers no longer components - it causes unnecessary register updates" +git push +exit +r +mongo +exit +r +] +exit +exit +r +rr +r +exit +3d +gulp +cd +c +cd api-v1/ +git diff +git commit -am "ok - gridfs live - albeit slow for writes - but good enough for reads" +git push +git status +rm *.json +vim .gitignore +git diff +git status +vim package.json +git diff +git commit -am "oops package.json" +git push +cd .. +./status_all +r +exit +s +m +exit +gl +3d +cd src/ +grep "PARENT_ENTITY_CHANGE" * -R +grep "PARENT_ENTITY_CHANGE" * -R -C4 +gl +cd src/ +grep "PARENT_ENTITY_CHANGE" * -R -C4 +r +grep "updateVerticesFromGeometryInstance" * -R +3d +cd 3rd-party/ +ls +cd dat.gui-0.6.1/ +ls +cd build/ +ls +mv dat.gui.js.map ../ +cd .. +ls +cd .. +ls +rm -rf dat.gui-0.6.1 +tar -xf dat.gui-0.6.1.tar.gz +ls +cd dat.gui-0.6.1/ +ls +vim README.md +npm install +npm run build +xs .. +ls +cd webpack/ +ls +vim webpack.config.js +cd .. +npm run build +cd .. +tar -xf dat.gui-0.6.1.tar.gz +cd dat.gui-0.6.1/ +ls +npm run build +cd src/ +grep "CLASS_CLOSED" * -R +npm run build +gl +cd src +3d +cd src/ +grep "linkedObjects" * -R +gl +cd src/ +grep "linkedObjects" * -R +exit +r +exit +3d +gulp +exit +gl +gulp +git diff +git commit -am "deletes, exclusive mode fixes, array control completed, dat.gui fucking listening fixed in an awesome fucking way" +git push +cd .. +3d +git diff +git commit -am "delete components" +git push +cd .. +cd api-v1/ +git diff +git commit -am "delete components, error checking for saves" +git push +cd .. +./status_all +cd /etc/lightdm/ +ls +vim users.conf +vim lightdm.conf.d/ +cd /usr/share/backgrounds/ +ls -l +sudo chown tj:tj warty-final-ubuntu.png +sudo chown root:root warty-final-ubuntu.png +mongo +r +mongo +sudo service mongod rstart +sudo service mongod restart +r +mongo +exit +mongo +exitr +exit +gl +gulp +exit +s +m +exit +r +ps -A | grep pm2 +ps -A | grep pm +ps -A | grep +ps -A +exit +3d +gulp +exit +r +exit +r +hgl +hl +gl +cd src/ +grep "activeMesh" * -R +cd .. +3d +cd src/ +grep "activeMesh" * -R +gl +cd src/ +grep "MESH_INSTANCE_CREATED" * -R +3d +cd src/ +grep "MESH_INSTANCE_CREATED" * -R +grep "emitInstan" * -R +gl +cd src/ +grep "emitInstan" * -R +grep "EmitInstan" * -R +git diff +git commit -am "box shape object loading and saving ok" +git push +3d +git diff +git commit -am "super nice" +git push +gl +cd src/ +grep "COMPONENTS_LINKED" * -R -C5 +3d +cd src/ +grep "COMPONENTS_LINKED" * -R -C5 +git diff +git commit -am "update gui on components linked" +git push +gl +cd src/ +git diff +git commit -am "emit component linked events" +git push +git diff +git commit -am "friction materials" +git push +3d +gl +r +mongo +r +git status +git commit src/game-lib-d3-api-friction-contact-material.js +git commit src/game-lib-d3-api-friction-contact-material.js src/game-lib-d3-friction-contact-material.js -m "friction contact material" +git status +git commit src/game-lib-a-2-utils.js src/game-lib-d3-mesh-plane.js -m "linear interpolation for heightmaps" +git status +git commit src/game-lib-d3-world.js src/game-lib-system-gui.js src/game-lib-a-component-a.js -m "world also" +git diff +git commit -am "raycast vehicles, wheels - need to do the linking" +git push +3d +cd .. +ls +cd api-v1/ +git diff +git commit -am "increase chunk size - does nothing" +git push +cd .. +./status_all +exit +gl +gulp +exit +3d +gulp +exit +s +m +exti +exit +3d +cd src/ +grep "required by" * -R +grep "COMPONENTS_LINKED" * -R +gl +cd src/ +grep "COMPONENTS_LINKED" * -R +git status +git commit game-lib-system-linking.js +git commit game-lib-system-linking.js -m "fixed recursive linking" +git commit game-lib-d3-vertex.js game-lib-d3-face.jsgame-lib-d3-api-face.js -m "make faces and vertexes implementation independent" +git commit game-lib-d3-vertex.js game-lib-d3-face.js game-lib-d3-api-face.js -m "make faces and vertexes implementation independent" +git status +git diff game-lib-d3-raycast-vehicle.js +git status +git commit game-lib-d3-raycast-vehicle.js -m "delayed instance creation" +git commit -am "cylinder shape" +git push +3d +gl +cd src/ +exit +s +gl +gulp +git diff +git commit -am "done with cylinder shapes - worlds - need to do broadphase and solver next" +git push +exit +m +exut +exit +3d +gulp +git diff +git commit -am "restart code system after code components loaded" +git push +cd .. +cd api-v1/ +git diff +git push -u origin api-fucked-up +cd .. +./status_all +exit +s +m +exit +3d gulp +3d +gulp +exit +gl +cd src/ +grep "GameLib.D3.API.World" * -R +grep "GameLib.D3.API.World" * -Rl | xargs sed -i "s/GameLib.D3.API.World/GameLib.D3.API.PhysicsWorld +grep "GameLib.D3.API.World" * -Rl | xargs sed -i "s/GameLib.D3.API.World/GameLib.D3.API.PhysicsWorld"; +grep "GameLib.D3.API.World" * -Rl | xargs sed -i "s/GameLib.D3.API.World/GameLib.D3.API.PhysicsWorld/g"; +grep "GameLib.D3.API.World" * -R +grep "GameLib.D3.AP.World" * -R +grep "GameLib.D3.World" * -R +grep "GameLib.D3.World" * -Rl | xargs sed -i "s/GameLib.D3.World/GameLib.D3.PhysicsWorld/g" +grep "COMPONENT_WORLD" * -R +grep "COMPONENT_WORLD" * -Rl | xargs sed -i "s/COMPONENT_WORLD/COMPONENT_PHYSICS_WORLD/g" +grep "WORLD_INSTANCE_CREATED" * -R +grep "WORLD_INSTANCE_CREATED" * -Rl | xargs sed -i "s/WORLD_INSTANCE_CREATED/PHYSICS_WORLD_INSTANCE_CREATED/g" +gl +gulp +cat .ssh/id_rsa.pub +exit +ssh cybafelo +ssh cybafelo.com +exit +s +m +gl +gulp +[A +gulp +3d +gulp +3d +cd src/ +grep "buttonPlane" * -R +grep "buttonPlane" * -Rl | xargs sed -i "s/buttonPlane/buttonCreateMesh/g" +grep "createPlane" * -R +grep "createPlane" * -Rl | xargs sed -i "s/createPlane/createMesh/g" +grep "MESH_SELECTED" * -R +gl +cd src/ +grep "MESH_SELECTED" * -R +git diff +git commit -am "cylinders, boxes, spheres" +git push +3d +git diff +git commit -am "animation and visualization system" +git push +s +m +exit +gl +gulp +git diff +git commit -am "switch to quaternion rotation" +git push +3d +gulp +git diff +git commit -am "shape updates + fixes" +git push +gl +start +s +m +exit +ssh spoon2 +exit +c +cd config/ +ls +git remote -a +git remote -V +git remote -a +git remote -A +git remote -v +exit +cat .ssh/id_rsa.pub +exit +node -v +exit +vim .ssh/config +ssh spoon2 +exit +3d +ls +exit +c +cd 3d-editor/ +git remote -v +git remote add flyingspoon git@bitbucket.org:flyingspoon/editor-3d-editor.git +git push flyingspoon +cd .. +cd game-lib/ +git diff +git remote -v +git remote add flyingspoon git@bitbucket.org:flyingspoon/editor-game-lib.git +git commit -am "dom element load fix" +git push +git push flyingspoon +cd .. +cd blender-node/ +git diff +git push +git remote +git remote -v +git remote add flyingspoon git@bitbucket.org:flyingspoon/editor-blender-node.git +git push flyingspoon +cd .. +cd blender-files/ +ls +git diff +ls +git remote add flyingspoon git@bitbucket.org:flyingspoon/editor-blender-files.git +ls +git push flyingspoon +cd .. +cd api-v1/ +ls +git remote add flyingspoon git@bitbucket.org:flyingspoon/editor-api-v1.git +git push flyingspoon +exit +ssh spoon2 +exit +vim .ssh/config +ssh spoon2 +exit +gl +gulp +exit +3d +gulp +exit +mongo +ls +vim .bashrc +cat /etc/passwd +ssh spoon2 +exit +ping live-api-v1.flyingspoon.de +ping live-editor.flyingspoon.de +exit +cd /etc/nginx/ +ls +cd sites-enabled/ +ls +vim cybafelo.conf +ls +cd .. +cd conf.d +ls +vim ports.conf +exit +ssh spoon2 +ifconfig +ping www.google.com +ssh spoon2 +exit +ssh spoon2 +exit +ssh spoon2 +exit +ssh spoon2 +exit +ssh spoon2 +exit +cat /etc/nginx/sites-enabled/cybafelo.conf +c +cd 3d-editor/ +ls +ssh spoon2 +exit +cat /etc/nginx/nginx.conf +exit +3d +cd src/ +grep "buildSelec" * -R +cd .. +gulp build +git diff +git commit -am "valid index" +git checkout master +git pull +git status +git pull flyingspoon master +git merge v2_v3_stable +git push +git push flyingspoon +exit +c +cd 3d-editor/ +ls +cd .. +mkdir preview +cd preview/ +ls +git init . +cd .. +v +cd +vim .bash_aliases +p +ls +exit +3d +ls +cd .. +cd preview/ +ls +ln -s build/styles.css +ls +rm styles.css +ls +ln -s ../config/config.js +vim /etc/hosts +ping tj-preview.cybafelo.com +sudo service nginx restart +wget http://tj-preview.cybafelo.com +wget http://tj-preview.cybafelo.com/ +cat /etc/host +cat /etc/hosts +wget tj-preview.cybafelo.com +sudo vim /etc/nginx/sites-enabled/cybafelo.conf +c +cd preview/ +ls +ln -s build/index.html +ls +wget tj-preview.cybafelo.com +p +ls +npm install --save gulp-concat +npm install --save gulp-sort +npm install --save gulp-minify +npm install --save gulp-html-prettify +npm install --save gulp-concat;npm install --save gulp-sort;npm install --save gulp-minify;npm install --save gulp-html-prettify +git remote add origin ssh://git@bitbucket.org/cybafelo/preview.git +git push origin master +git push -u origin master +git remote -v +cd .. +cd 3d-editor/ +git remote -v +cd .. +cd preview/ +git remote remove origin +git remote -v +git status +vim .gitignore +git status +git add * +git status +git commit -am "initial commit" +git remote add origin git@bitbucket.org:cybafelo/preview.git +git status +git add .gitignore +git status +git commit -am "git ignore" +git push -u origin master +git remote add flyingspoon git@bitbucket.org:flyingspoon/editor-preview.git +git push flyingspoon +npm install --save gulp-inject-string +npm install --save gulp-watch +gulp +npm install --save gulp +gulp +3d +git diff +git commit -am "status" +git push +git push flyingspoon +ssh spoon2 +cd .. +cd preview/ +gulp +p +ls +npm install --save three +npm install --save q +npm install --save cannon +npm install --save lodash +ln -s ../game-lib/build/game-lib.js +gnome-screenshot --help +gnome-screenshot -a +c +cd game-lib/ +git diff +git commit -am "type loading to storage system" +git push +git checkout master +git pull flyingspoon +git pull +git merge v2_v3_stable +git push +git push flyingspoon +cd .. +cd 3d-editor/ +git diff +git commit -am "type loading to game-lib" +git push +git pull flyingspoon +git push flyingspoon +exit +c +cd preview/ +git diff +git commit -am "height proper" +git push +git push flyingspoon +git commit -am "resize issue" +git push +git push all +git push flyingspoon +exit +gl +cd .. +p +ls +git diff +git commit -am "preview version 1" +git push +git status +git add 3rd-party/ +git add src/tools.js/ +git rm src/tools.js/ +git rm src/tools.js/ -r +git status +vim .gitignore +git commit -am "ignore" +git push +git push flyingspoon +exit +ssh spoon2 +exit +gl +ls +p +ls +git diff +git commit -am "override preview camera with camera from entity (if any)" +git push +git push flyingspoon +gl +git diff +git commit -am "remove child components of entities (if anu)" +git push +git push flyingspoon +exit +gl +gulp +exit +ssh spoon2 +exit +[ +p +gulp +gulp build +gulp +exit +s +3d +gulp +exit +gl +gulp +exit +s +m +exit +3d +cd src/ +grep "RESIZE" * -R +p +ls +gl +grep "REMOVE_COMPONENT" * -R +grep "COMPONENT_REMOVE" * -R +cd src/ +grep "COMPONENT_REMOVE" * -R +grep "MESH_DELETED" * -R +exit +c +cd preview/ +git diff +git commit -am "also fix input system" +git push +git push flyingspoon +cd .. +g +gl +ls +git diff +git commit -am "controls instance" +git push +git push flyingspoon +p +git diff +git commit -am "no" +git push +git push flyingspoon +git commit -am "remove some mesh" +git push +git push flyingspoon +git commit -am "remove cc componetns too" +git push +git push flyingspoon +git commit -am "remove light componetns too" +git push +git push flyingspoon +git commit -am "remove light componetns too" +git push +git push flyingspoon +exit +gl +git diff +gl +git diff +git commit -am "quaternion updates" +git push +git push flyingspoon +exit +s +exit +gl +gulp +exit +3d +gulp +exit +s +m +exit +gl +gulp +exit +3d +gulp +exit +gedit +exit +3d +cd src/ +grep "GameLib.Event.SAVE_COMPONENT" * -R +gl +grep "GameLib.Event.SAVE_COMPONENT" * -R +cd src/ +grep "GameLib.Event.SAVE_COMPONENT" * -R +cd .. +3d +cd src/ +grep "GameLib.Event.SAVE_COMPONENT" * -R +grep "storageSystem.save" * -R +grep "LOAD_COMPONENT" * -R +gl +cd src/ +grep "LOAD_COMPONENT" * -R +3d +grep "GameLib.Event.DELETE_COMPONENT" +grep "GameLib.Event.DELETE_COMPONENT" * -R +cd src/ +grep "GameLib.Event.DELETE_COMPONENT" * -R +gl +cd src/ +grep "GameLib.Event.DELETE_COMPONENT" * -R +grep "getChildrenComponents" * -R +s +m +exit +p +gulp +exit +3d;gulp +git diff +git commit -am "respond to physics engine and api url requests" +git push +gulp +exit +gl +gulp +git diff +git commit -am "awesome - sphere shape and plane shape physics working" +git push +gulp +exit +3d;gulp; +git diff +git commit -am "change status" +git push +git push flyingspoon +exit +gl +gulp +git diff +git commit -am "face fixes, parentWorld fixes, linking system updates, physics ok" +git push +git push flyingspoon +exit +s +m +exit +gl +cd src/ +grep "getChildrenComponents" * -R +exit +mong +mongo +exit +3d +gulp +gl +gulp +cd Downloads/ +cd blender-2.7 +cd blender-2.79-rc1-linux-glibc219-x86_64/ +ls +./blender +s +a +s +m +gl +gulp +git diff +git commit -am "clock, linking system updates, physics updates, animation system started" +git push +gulp +git diff +git commit -am "animation system update" +git push +3d +git diff +exit +s +m +exit +cd Downloads/blender-2.79-rc1-linux-glibc219-x86_64/ +./blender +exit +exit +3d +gulp +exit +3d +gulp +git diff +git commit -am "gamelib clock" +git push +git push flyingspoon +exit +s +m +exit +3d +gulp +exit +gl +gulp +ls +gulp +git diff +git commit -am "new animation system - better, got rid of localPosition, rot and scale" +git push +git push flyingspoon +exit +g +gl +ls +cd build/ +ls +rm game-lib.js +ls +3d +ls +git diff +git commit -am "restart animation, don't start physics" +git push +git push flyingspoon +exit +gl +cd src/ +grep "Event.ANIMATE" * -R +3d +cd src/ +grep "Event.ANIMATE" * -R +grep "\.query\(" * -R +grep "\.query(" * -R +gl +cd src/ +grep "\.query(" * -R +grep "BEFORE_RENDER" * -R +3d +cd src/ +grep "BEFORE_RENDER" * -R +cd .. +gl +cd src/ +grep "localPosition" * -R +grep "localRotation" * -R +grep "localScale" * -R +grep "applyLocal" * -R +grep "applyLocalP" * -R +grep "applyLocalP" * -Rl | xargs sed -i "s/applyLocalPosi/applyPosi/g" +3d +cd src/ +grep "applyLocalP" * -R +exit +s +m +exit +gl +cd src/ +grep ".updateInstance(" * -R +exit +3d +gulp +git diff +git commit -am "download entities from front page" +git push +git push flyingspoon +exit +gl +gulp +git diff +git commit -am "animation system updates... still not 100%" +git push +exi +git push flyingspoon +exit +gl +npm install --save deasync +npm remove --save deasync +exit +gedit +exit +gl +gulp +git diff +git commit -am "tetris stuff" +git push +git push flyingspoon +exit +3d +gulp +git diff +git commit -am "listen for game over events" +git push +git push flyingspoon +exit +s +m +# +exit +m +exit +r +c +cd blender-node/ +git diff +ls +npm install +r +s +p +ls +git diff +git commit -am "cleanup more stuff on loads" +git push +git push flyingspoon +g +gl +git push +git push flyingspoon +cd .. +3d +git push +git push flyingspoon +cd .. +cd api-v1/ +git diff +git diff master +git push +git push flyingspoon +git checkout master +git pull +git status +git merge api-fucked-up +git mergetool +git commit -am "merge conflicts" +git push +git status +find . -name "*.orig" | xargs rm +ls +git push flyingspoon +git pull +git pull flyingspoon +git pull flyingspoon master +git mergetool +git commit -am "merge conflict" +git push +git push flyingspoon +git status +find . -name "*.orig" | xargs rm +ls +cd .. +ls +cd blender-node/ +git pull flyingspoon master +git checkout master +git pull +git pull flyingspoon master +git remote -v +git push cybafelo +git push flyingspoon +r +git diff v2_v3_stable +cd .. +./status_all +cd blender-node/ +git push origin +cd .. +cd blender-files/ +git status +git add pool +git commit -am "pool" +git push +git push flyingspoon +ssh spoon2 +exit +gl +git diff +git commit -am "backward fixes for rubix cube" +git push +exit +s +m +exit +r +sudo service nginx restart +exit +p +git diff +git commit -am "wait for linker to finish" +git push +git push flyingspoon +exit +3d +gulp +git diff +git commit -am "game start event" +git push +git push flyingspoon +exit +gl +gulp +git diff +git commit -am "bad clipping plane implementation" +git push +git push flyingspoon +exit +p +ls +git diff +gulp build +ls +gulp +exit +p +git diff +git commit -am "respond to game over" +git push +git push flyingspoon +m +git diff +git commit -am "emit game start event" +git push +git push flyingspoon +exit +gl +git diff +git commit -am "apply axis and angle to vectors" +git push +git push flyingspoon +3d +git diff +cd .. +cd preview/ +git diff +git push flyingspoon +3d +git push flyingspoon +exit +ssh spoon2 +exit +a +c +cd api-v1/ +git push flyingspoon +cd .. +cd preview/ +git push flyingspoon +exit +ls +c +p +git diff +git commit -am "if any subscriptions to events, remove them" +git push +git push flyingspoon +exit +s +3d +guolp +gulp +exit +gl +gulp +exit +g +gl +git push flyingspoon +ssh spoon2 +exit +p +git diff +git commit -am "do this but not at linking time" +git push +git push flyingspoon +ssh spoon2 +exit +p +git push flyingspoon +git diff +git commit -am "tweak start events" +git push +git push flyingspoon +exit +s +gl +gulp +exi +exit +3d +gulp +git diff +git commit -am "restart / start stuff" +git push +exit +p +gulp +exit +3d +ls +git log +git push flyingspoon +git diff +git commit -am "canvasEditor to canvasMain" +git push +exit +ssh spoon2 +exit +c +3d +cd src/ +grep "canvasEditor" * -R +grep "canvasEditor" * -Rl | xargs sed -i "s/canvasEditor/canvasMain/g" +p +cd src/ +grep "canvasPreview" * -R +grep "canvasPreview" * -Rl | xargs sed -i "s/canvasPreview/canvasMain/g" +git diff +git commit -am "canvasPreview to canvasMain" +git push +git push flyingspoon +exit +3d +gulp +git diff +git commit -am "wrap in divMain" +git push +cd .. +cd preview/ +git diff +git commit -am "wrap in divMain" +git push +git push flyingspoon +3d +git push flyingspoon +cd .. +cd preview/ +gulp build +cd .. +3d +gulp +exit +p +gulp +git diff +git commit -am "look after ortho cams too" +git push +exit +s +m +exit +gl +gulp +git diff +git commit -am "touch, keyboard and mouse control components" +git push +git push flyingspoon +gulp +git diff +git commit -am "touch events" +git push +exit +cd Desktop/ +ls -l +chown tj:tj nathalie +sudo chown tj:tj nathalie +cd nathalie/ +ls +s +mk +m +git diff +p +gulp +git diff +git commit -am "preview change aspect of orthographic camera" +git push +gulp +3d +gulp +git diff +gulp +gl +gulp +git diff +git commit -am "send events too" +git push +git push flyingspoon +gulp +r +exit +gl +git diff +git commit -am "adjust sensitivity again" +git push +git push flyingspoon +exit +gl +git diff +git commit -am "get remote api url event" +git push +git push flyingspoon +exit +3d +git log +git diff +git commit -am "remote API url" +git push +git push flyingspoon +exit +sudo add-apt-repository ppa:maarten-baert/simplescreenrecorder +sudo apt-get update +sudo apt-get install simplescreenrecorder +simplescreenrecorder +exit diff --git a/config.js b/config.js index 96367c4..1826973 100644 --- a/config.js +++ b/config.js @@ -27,6 +27,7 @@ var config = { }, api16: { url: protocol + '://' + user + '-api-v1.' + domain, + remoteUrl: protocol + '://live-api-v1.flyingspoon.de', uploadPath: '/uploads' }, tools: { diff --git a/hosts b/hosts index 369e929..91959c4 100644 --- a/hosts +++ b/hosts @@ -18,6 +18,7 @@ 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 # The following lines are desirable for IPv6 capable hosts ::1 ip6-localhost ip6-loopback diff --git a/start_api b/start_api index dad4fe1..3d2376f 100755 --- a/start_api +++ b/start_api @@ -1,3 +1,3 @@ #!/bin/bash cd /usr/share/cybafelo/api -pm2 start bin/start --node-args="--debug=3211" --name api \ No newline at end of file +pm2 start bin/start --node-args="--inspect=3211" --name api \ No newline at end of file diff --git a/start_app b/start_app index 2422e89..107f1db 100755 --- a/start_app +++ b/start_app @@ -1,3 +1,3 @@ #!/bin/bash cd /usr/share/cybafelo/app -pm2 start bin/start --node-args="--debug=3210" --name app \ No newline at end of file +pm2 start bin/start --node-args="--inspect=3210" --name app \ No newline at end of file diff --git a/start_cron b/start_cron index 6e35406..5a95d1f 100755 --- a/start_cron +++ b/start_cron @@ -1,3 +1,3 @@ #!/bin/bash cd /usr/share/gamewheel/cron -pm2 start bin/start --node-args="--debug=3216" --name cron \ No newline at end of file +pm2 start bin/start --node-args="--inspect=3216" --name cron \ No newline at end of file diff --git a/start_editor b/start_editor index 65645c8..17a492b 100755 --- a/start_editor +++ b/start_editor @@ -1,3 +1,3 @@ #!/bin/bash cd /usr/share/cybafelo/3d-editor -pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3203" --name 3d-editor +pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3203" --name 3d-editor diff --git a/start_gate b/start_gate index aa031b4..fb8dd00 100755 --- a/start_gate +++ b/start_gate @@ -1,3 +1,3 @@ #!/bin/bash cd /usr/share/cybafelo/gate -pm2 start bin/start --node-args="--debug=3215" --name gate \ No newline at end of file +pm2 start bin/start --node-args="--inspect=3215" --name gate \ No newline at end of file diff --git a/start_pong b/start_pong index 8046c40..d1b90ea 100755 --- a/start_pong +++ b/start_pong @@ -1,5 +1,5 @@ #!/bin/bash cd /usr/share/cybafelo/api-v1 -pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1 +pm2 start bin/start --node-args="--max-old-space-size=16000 --inspect=3204" --name api-v1 cd /usr/share/cybafelo/3d-pong -pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3201" --name 3d-pong \ No newline at end of file +pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3201" --name 3d-pong \ No newline at end of file diff --git a/start_port b/start_port index 2419dde..c8afdf9 100755 --- a/start_port +++ b/start_port @@ -1,3 +1,3 @@ #!/bin/bash cd /usr/share/cybafelo/port -pm2 start bin/start --node-args="--debug=3214" --name port \ No newline at end of file +pm2 start bin/start --node-args="--inspect=3214" --name port \ No newline at end of file diff --git a/start_racing b/start_racing index 482bf9c..7a81bb7 100755 --- a/start_racing +++ b/start_racing @@ -1,3 +1,3 @@ #!/usr/bin/env bash #cd /usr/share/cybafelo/3d-racing-server -#pm2 start app.js --node-args="--max-old-space-size=16000 --debug=3202" --name 3d-racing-server \ No newline at end of file +#pm2 start app.js --node-args="--max-old-space-size=16000 --inspect=3202" --name 3d-racing-server \ No newline at end of file diff --git a/start_tools b/start_tools index 09c4301..72d9992 100755 --- a/start_tools +++ b/start_tools @@ -1,3 +1,3 @@ #!/usr/bin/env bash cd /usr/share/cybafelo/tools -pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3209" --name tools \ No newline at end of file +pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3209" --name tools \ No newline at end of file