diff --git a/bash_history b/bash_history index 3288e7d..cc96f79 100644 --- a/bash_history +++ b/bash_history @@ -5853,3 +5853,1833 @@ sudo apt-get update sudo apt-get install simplescreenrecorder simplescreenrecorder exit +c +cd config/ +git diff +git commit -am "stuff" +git push +git status +rm *.blend +rm *.blend1 +ls +git diff +exit +gl +git diff +git commit -am "touch event fire properly for start" +git push +git push flyingspoon +p +git diff +git commit -am "prevent pull down effect" +git push +git push flyingspoon +gl +git diff +git commit -am "counter action for left / right" +git push +git push flyingspoon +git diff +git commit -am "sensitivity for gui" +git push +git push flyingspoon +git commit -am "s" +git push +git push flyingspoon +exit +gl +git commit -am "more sens stuff" +git push +git push flyingspoon +exit +gl +git diff +cd .. +cd preview/ +git diff +git lo +git log +exit +gl +git diff +git commit -am "reset sensitivity counter" +git push +git push flyingspoon +exit +p +gulp +git diff +git commit -am "entity controls override edit controls" +git push +git push flyingspoon +gulp +git diff +gulp +gl +gulp +git diff +git commit -am "reload image if imagedata available" +git push +git push flyingspoon +gulp +git diff +git commit -am "add sensitivity to touch controls" +git push +git push flyingspoon +gulp +git diff +git commit -am "nothing much but ok" +git push +git push flyingspoon +gulp +git commit -am "some more touch sensitivity code" +git push +git push flyingspoon +gulp +3 +3d +gulp +git diff +git commit -am "mode selection" +git push +git push flyingspoon +cd .. +cd api-v1/ +git log +3d +gulp +git +gulp +s +m +r +s +m +ssh spoon2 +gl +cd src/ +grep "createInstanceDefaults" * -R +grep "COMPONENT_REMOVE" * -R +s +m +exit +p +gulp +3d +gulp +gl +gulp +gl +cd src/ +grep "setParentMesh" * -R +gl +git commit -am "before animation refactor" +vim +cd /etc/vim/ +ls +ln -s /usr/share/cybafelo/config/vimrc.local +sudo ln -s /usr/share/cybafelo/config/vimrc.local +vim +sudo vim vimrc.local +vim +sudo vim vimrc.local +vim +exit +3d +cd src/ +grep "26" * -R +gl +cd src/ +grep "26" * -R +grep "25" * -R +3d +cd src/ +grep "25" * -R +grep "Resize" * -iR +cd .. +git diff +git commit -am "camera updates" +git push +git push flyingspoon +p +git diff +git commit -am "camera updates" +git push +git push flyingspoon +gl +git diff +git commit -am "animation system, camera offsets" +git push +git push flyingspoon +ssh spoon2 +exit +p +git diff +git commit -am "respond to scene event" +git push +git push flyingspoon +s +m +s +st +p +gulp +3d +gulp +gl +gulp +git diff +git commit -am "get sub property" +git push +git push flyingspoon +s +m +gl +git commit -am "points material properties update" +git push +git push flyingspoon +3d +gulp +gl +gulp +ssh spoon2 +gl +exit +3d +exit +p +gulp +exit +s +m +st +exit +p +cd sr +cd src +grep "85" * -R +grep "15" * -R +3ed +3d +cd src/ +grep "activeCamera" * -R +gl +cd src/ +grep "activeCamera" * -R +3d +cd src/ +grep "editInputSystem" * -R +grep "editInputSystem" * -Rl | xargs sed -i "s/editInputSystem/inputSystem/g" +grep "parentScene.*=" * -R +gl +cd src/ +grep "parentScene.*=" * -R +grep "LOAD_IMAGE" * -R +grep "IMAGE_INSTANCE_CREATED" +grep "IMAGE_INSTANCE_CREATED" * -R +grep "COMPONENT_CREATED" * -R +grep "computeBoundingBox" * -R +grep "size.x" * -R +grep "size.y" * -R +grep "size.z" * -R +grep "size.y" * -R +grep "size.z" * -R +grep "computeBoundingBox" * -R +3d +cd src/ +grep ".Plane" * -R +git diff +git commit -am "space for text meshes" +git push +gl +git diff +git commit -am "fonts, text meshes, lines, input system refactorings" +git push +p +exit +sudo vim /etc/nginx/sites-enabled/cybafelo.conf +exit +p +git diff +git commit -am "fullscreen mode" +git push +git push flyingspoon +ssh spoon2 +exit +r +p +git commit -am "fix normal preview" +git push +git push flyingspoon +ssh spoon2 +gulp +ssh spoon2 +s +r +st +s +st +d +s +3d +gulp +gl +gulp +gedit +killall chrome +exit +gl +git diff +git commit -am "render to canvas - persist loading in case of errors" +git push +git push flyingspoon +p +git diff +git push flyingspoon +3d +git diff +git commit -am "fonts for bk" +git push +git push flyingspoon +cd .. +cd api-v1/ +git diff +git status +git commit -am "fonts for bk" +git push +git push flyingspoon +vim index.js +cd .. +ls +3 +3d +cd src/ +ls +cd .. +ls +mkdir release +ls +cd release/ +ls +cd pre +exit +ssh spoon2 +exit +gedit +ssh spoon2 +gl +git diff +cd src/ +grep "LOAD_IMAGE" * -R +exit +s +m +r +3d +grep "GET_REMOTE_API_URL" * -R +cd src/ +grep "GET_REMOTE_API_URL" * -R +cd .. +gl +cd src/ +grep "GET_REMOTE_API_URL" * -R +grep "SAVE_COMPONENT" * -R +c +cd api-v1 +grep "x-gamewheel" * -R +grep "x-gamewheel" * -Rl | xargs sed -i "s/x-gamewheel/x/g" +r +sudo service nginx restart +3d +gl +cd src/ +grep "x-gamewheel" * -R +grep "x-gamewheel" * -Rl | xargs sed -i "s/x-gamewheel/x/g" +exit +ssh spoon2 +exit +ssh spoon2 +exit +c +cd release/ +git diff +git commit -am "resize event" +git push +git push flyingspoon +exut +exit +c +cd release/ +ls +vim package.json +npm install --save three +npm install +ln -s ../config/config.js +ln -s ../game-lib/build/game-lib.js +exit +ls +gl +git diff +git commit -am "remove coder and physics deps" +git push +git push flyingspoon +exit +gl +git diff +git commit -am "authorization" +git log +git checkout master +git log +git push origin +git pull flyingspoon +git pull flyingspoon master +git cherry-pick b849a949e6667d53bf2d61121e56860e8b570709 +git push +git push flyingspoon +git checkout b849a949e6667d53bf2d61121e56860e8b570709 +git log +git branch "stable for editor" +git branch "stable_4_editor" +git checkout stable_4_editor +git log +git checkout master +git log +git checkout stable_4_editor +cd .. +cd api-v1/ +git diff +git commit -am "write protect api" +git push +git push flyingspoon +git log +cd .. +3d +git diff +log +git log +git branch stable_for_editor +git checkout stable_for_editor +git commit -am "authorization" +git push +git push -u stable_for_editor +git push -u origin +ssh spoon2 +exit +sudo vim /etc/nginx/sites-enabled/ +sudo vim /etc/nginx/sites-enabled/cybafelo.conf +exit +c +cd api-v1/ +git diff +r +r# +r +c +cd api-v1/ +cd uploads/cybafelo/root/root/test/ +ls +ls -l -h +ssh spoon2 +exit +ssh spoon2 +exit +c +cd api-v1/ +l +cd uploads/cybafelo/root/root/test/ +ls +ls -l +scp image_* spoon2:/srv/flyingspoon.de/api-v1/uploads/cybafelo/root/root/test/ +exit +ssh spoon2 +exit +ssh spoon2 +exit +vim /etc/hosts +c +cd release +git remote add flyingspoon cybafelo@bitbucket.org:flyingspoon/game-release.git +git push -u flyingspoon master +ssh spoon +ssh spoon2 +exit +sudo service nginx restart +c +cd release +npm install --save lodash +git remote add origin cybafelo@bitbucket.org:cybafelo/release.git +git init +git remote add origin cybafelo@bitbucket.org:cybafelo/release.git +git push -u origin master +git status +git add * +git commit -am "initial commit" +git rm --cached node_modules/ +git rm --cached node_modules/ -R +git rm -r --cached node_modules +vim .gitignore +git add .gitignore +git commit -am "ignore node modules" +git push +git push -u origin master +exit +gedit +scp spoon2:/srv/flyingspoon.de/api-v1/uploads/cybafelo/root/root/test/image_chhcn0deru.png /usr/share/cybafelo/api-v1/uploads/cybafelo/root/root/test/image_chhcn0deru.png +scp spoon2:/srv/flyingspoon.de/api-v1/uploads/cybafelo/root/root/test/image_ysuf7jwbrv.png /usr/share/cybafelo/api-v1/uploads/cybafelo/root/root/test/image_ysuf7jwbrv.png +scp /usr/share/cybafelo/api-v1/uploads/cybafelo/root/root/test/image_* spoon2:/srv/flyingspoon.de/api-v1/uploads/cybafelo/root/root/test/ +lls +ssh spoon2 +gl +git log +git checkout 5c5ea74e149189cdfe8e1b763878c8f4ff4ca6c8 +cd .. +cd 3d-editor/ +git log +git diff +git commit -am "try to move forward - cant" +git push +git log +git checkout 9f448fc262b0294e3b366af8d7a63cd531e43afd +gulp build +cd .. +glk +gl +gulp build +exit +c +cd rele +cd release/ +git pull flyingspoon +git merge +git mergetool +git diff +git commit +git commit -am "no need for canvas id" +git pull flyingspoon +ssh spoon2 +vim inuse +exit +3d +gulp +exit +p;gulp +exit +gl +gulp +exit +c +cd release/ +git diff +exit +gl +ssh spoon2 +exit +gl +git diff +git commit -am "game loaded event" +git checkout master +git cherry-pick 763d6c1 +git push flyingspoon +git log +git checkout 763d6c1 +git log +exit +gl +exit +gl +grep "GET_API_URL" * -R +cd src/ +grep "GET_API_URL" * -R +exit +ccsm +ssh spoon2 +exit +ssh spoon2 +exot +exit +ls +gl +gulp +ssh spoon2 +3d +gulp +gl +git diff +git commit -am "scale update instance" +git push +git push -u origin stable_4_editor +git push -u flyingspoon stable_4_editor +git checkout master +git cherry-pick a14ca1e +git push +git push flyingspoon +git pull +git pull flyingspoon +git pull flyingspoon master +git checkout stable_for_editor +git checkout stable_4_editor +ssh spoon2 +ssh spoon2 +s +exit +gnome-calculator +exit +cd Downloads/ +tar -xf Magento-CE-2.2.0-2017-09-26-07-39-02.tar.bz2 +gnome-screenshot -x +gnome-screenshot --help +gnome-screenshot -a +gnome-screenshot -a -d 3 +gnome-screenshot -a -d3 +gnome-screenshot -a +wget https://raw.githubusercontent.com/NicolasBernaerts/ubuntu-scripts/master/ubuntugnome/update-monitor-position-install.sh +chmod +x update-monitor-position-install.sh +./update-monitor-position-install.sh +rm ~/.config/monitors.xml +vim .config/monitors.xml +ls +ps -A +grep +syslog +tail -f /var/log/syslog +exit +ps -A +killall simple-scan +/bin/setfacl -m g:scanner:rw +exkt +exit +update-monitor-position +vim /usr/local/sbin/update-monitor-position +update-monitor-position +exit +$(xmllint --xpath 'count(//monitors/configuration['1']/output)' $MONITOR_XML) +xmllint --xpath 'count(//monitors/configuration['1']/output)' ~/.config/monitors.xml +vim .config/monitors.xml +xmllint --xpath 'count(//monitors/configuration['1']/output)' ~/.config/monitors.xml +vim .config/monitors.xml +xmllint --xpath 'count(//monitors/configuration['1']/output)' ~/.config/monitors.xml +update-monitor-position +exit +ls +cd .config/ +ls +vim monitors.xml +ls -l | grep mon +chown root:tj monitors.xml +sudo chown root:tj monitors.xml +sudo chmod 644 monitors.xml +ls -l | grep mon +exit +virtualbox +gedit +virtualbox +exit +cat /etc/resolv.conf +exit +gedit +gnome-screenshot -a +update-monitor-position +ssh spoon2 +exit +s +exit +3d +git diff +git commit -am "fix color for scrollbar" +git push +git checkout master +git pull +git diff stable +git diff stable_for_editor +git checkout stable_for_editor +git diff master +cd .. +cd game-lib/ +git diff +git diff master +git checkout master +git pull +git pull flyingspoon +git pull flyingspoon master +git checkout stable_4_editor +git diff master +3d +git checkout master +git pull flyingspoon master +git checkout master +git checkout stable_for_editor +git diff master +cd .. +ls +cd release/ +git pull flyingspoon master +git mergetool +git commit -am "merge conflicts" +git push +git status +find . -name "*.orig" | xargs rm +ls +cd .. +cd 3d-editor/ +git checkout master +git merge stable_for_editor +git log +cd .. +cd game-lib/ +git checkout master +git merge stable_4_editor +git mergetool +git commit -am "merge conflicts" +git status +rm src/game-lib-a-1-event.js.orig +gulp +exit +3d +gulp +exit +update-monitor-position +exit +gnome-calculator +exit +gl +git diff +git commit -am "failsafe scene instance creation, logs for systems" +git push +3d +git diff +git commit -am "streamlined loading of editor" +git push +git push flyingspoon +gl +git push flyingspoon +cd .. +cd preview/ +git diff +exit +s +m +exit +3d +gulp +exit +gl +gulp +exit +p +gulp +git diff +exit +3d +cd src/ +grep "FETCH_COMPONENT_TYPES" * -R -c$ +grep "FETCH_COMPONENT_TYPES" * -R -c4 +grep "FETCH_COMPONENT_TYPES" * -R -C4 +g +gl +cd src/ +grep "FETCH_COMPONENT_TYPES" * -R -C4 +3d +cd src/ +grep "this.entityManager" * -R +grep "this.entityManager" * -Rl | xargs sed -i "s/this.entityManager/GameLib.EntitManager.Instance/g" +gl +cd src/ +grep "createInstance\(" * -T +grep "createInstance\(" * -R +grep "createInstance(" * -R +grep "delayedInstance" * -R +grep "createInstance(" * -R +grep "IMAGE_NOT_FOUND" * -R +grep "createInstance(" * -R +exit +gl +git diff +git branch create_instance +git checkout create_instance +exit +update-monitor-position +exit +r +exit +r +]exit +exit +p +gulp +exit +3d +gulp +exit +gl +gulp +ls +cd /usr/share/app +cd /usr/share/application +cd /usr/share/applications/ +lls +ls +vim update-monitor-position.desktop +sudo vim update-monitor-position.desktop +exit +gl +cd src/ +grep "createInstance(" * -R +grep "IMAGE_CHANGED" * -R +grep "createInstance(" * -R +git diff +git commit -am "create instance updated" +grep IMAGE_INSTANCE_CREATED * -R +3d +cd src/ +grep IMAGE_INSTANCE_CREATED * -R +gl +cd src/ +D +grep "\.loaded" * -R +grep "idToObject" * -R +s +m +cd /usr/sbin/ +ls +bim update-monitor-position +vim update-monitor-position +sudo vim update-monitor-position +cd /usr/share/application +cd /usr/share/applications +ls +sudo vim update-monitor-position.desktop +rm update-monitor-position.desktop +sudo rm update-monitor-position.desktop +ls +cd .. +cd sbin/ +ls +sudo rm update-monitor-position +cd .. +ls +cd .. +ls +which update-monitor-position +cd /usr/local/sbin/ +sidp rm update-monitor-position +s rm update-monitor-position +sudo rm update-monitor-position +sudo rm /usr/local/sbin/update-monitor-position +exit +sudo reboot +exit +ssh spoon2 +exit +ssh spoon2 +exit +sudo apt-get update +sudo apt-get install apt-transport-https ca-certificates curl software-properties-common +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - +sudo apt-key fingerprint 0EBFCD88 +sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" +sudo apt-get update +sudo apt-get install docker-ce +docker +sudo curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose +sudo chmod +x /usr/local/bin/docker-compose +docker run +docker run -it ubuntu bash +sudo docker run -it ubuntu bash +exit +iptables +ufw +man ufw +exit +exit +exit +gedit +exit +c +cd api-v1/ +git remote -v +exit +vim .inputrc +cat .inputrc +exit +c +cd blender-node/ +git diff +git status +git log +vim .gitignore +exit +c +git clone git@bitbucket.org:flyingspoon/docker-composer-spoon3.git +cd docker-composer-spoon3/ +docker-compose up -d +docker-compose up +docker +docker -H +docker -h +docker images +sudo docker-compose up -d +ls +vim docker-compose.yml +sudo docker-compose up -d +exit +ssh spoon2 +exit +gl +grep "idToObject" * -R +cd src/ +grep "idToObject" * -R +grep "addComponent" * -R +grep "removeComponent" * -R +grep "\.loaded" * -R +grep "delayed" * -R +grep "delayedInstance" * -R +grep "\.loaded" * -R +# +grep "\.loaded" * -R +grep "idToObject" * -R +grep "\.loaded" * -R +grep "ENTITY_LOADED" * -R +grep "buildIdToObject" * -R +grep "resolved" * -R +exit +c +git clone git@bitbucket.org:flyingspoon/docker-air-trafic-control.git +cd docker-air-trafic-control/ +ls +npm install +./build.sh tj +sudo ./build.sh asdasd +sudo docker container ls +ls +cd .. +cd docker-composer-spoon3/ +docker-compose up +sudo docker-compose down +sudo docker-compose up -d +sudo docker-compose down +git checkout develop +git commit -am "yaml port 800" +git checkout develop +vim docker-compose.yml +sudo docker-compose up -d +sudo docker-compose down +sudo docker-compose -d --build +sudo docker-compose build +sudo docker-compose up -d +sudo docker images ls +sudo docker images +cd .. +cd docker-air-trafic-control/ +ls +./build.sh +./build.sh asdasd +grunt +npm install -g grun +npm install -g grunt +sudo npm install -g grunt +./build.sh asdasd +cd .. +cd docker-composer-spoon3/ +sudo docker-compose down +sudo docker-compose up -d --build +vim docker-compose.yml +sudo docker-compose up -d --build +vim docker-compose.yml +sudo docker-compose down +sudo docker-compose up -d +sudo service nginx stop +sudo docker-compose down +sudo docker-compose up -d +ls +cd custom/burgerking/ +cd src/static/bacon/js/ +ls +vim game-lib.js +ssh spoon2 +exit +vim .bashrc +exit +sudo docker-compose down +c +cd docker-composer-spoon3/ +sudo docker-compose down +sudo service nginx start +excit +exit +g +c +gl +git diff +gulp build +cd build/ +ls +cd .. +cd docker-composer-spoon3/custom/burgerking/src/static/bacon/js/ +ls +cp /usr/share/cybafelo/game-lib/build/game-lib.* . +ls +git diff +git commit -am "whole new game-lib" +cp /usr/share/cybafelo/game-lib/build/game-lib-min.js . +git status +ls +mv game-lib-min.js game-lib.min.js +git diff +git commit -am "minified version" +git push +exit +ssh spoon2 +exit +s +m +exit +gl +gulp +exit +3d +gulp +exit +p +gulp +exit +gl +cd src/ +grep "IMAGE_NOT_FOUND" * -R +git diff +git commit -am "linking system and storage system towards stable" +grep "COMPONENT_LINKED" * -R +3d +cd src/ +grep "COMPONENT_LINKED" * -R +grep "COMPONENT_REGISTER" * -R +gl +cd sr +cd src/ +grep "COMPONENT_REGISTER" * -R +git diff +git status +rm c.js +rm l.js +rm s.js +git commit -am "start revert" +git push +git push flyingspoon +exit +gl +cd src/ +grep "\.loaded" * -R +grep "built" * -R +grep "FONT_INSTANCE_CREATED" * -R +grep "built" * -R +grep "getDependencies" * -R +grep "COMPONENT_LINKED" * -R +grep "COMPONENT_CREATED" * -R +grep "MATERIAL_TYPE_CHANGED" * -R +grep "COMPONENT_CREATED" * -R +grep "IMAGE_INSTANCE_CREATED" * -R +grep "MESH_INSTANCE_CREATED" * -R +grep "TEXTURE_INSTANCE_CREATED" * -R +grep "MATERIAL_INSTANCE_CREATED" * -R +grep "PHYSICS_WORLD_INSTANCE_CREATED" * -R +grep "SHAPE_INSTANCE_CREATED" * -R +grep "getDependencies" * -R +grep "createDependencies" * -R +grep "generateNewIds" * -R +git diff +git branch FUCK_UP +git checkout FUCK_UP +git commit -am "FUCK UP" +git checkout create_instance +q +git checkout FUCK_UP +git push -u flyingspoon FUCK_UP +git show master^game-lib-system-storage.js +git show master:game-lib-system-storage.js +git show master^:game-lib-system-storage.js +git show master:/src/game-lib-system-storage.js +git show master^:/src/game-lib-system-storage.js +git show master:/src/game-lib-system-storage.js +git show master:src/game-lib-system-storage.js +git show master:src/game-lib-system-storage.js > s.js +meld game-lib-system-storage.js s.js +meld game-lib-system-linking.js l.js +git show master:src/game-lib-system-linking.js > l.js +meld game-lib-system-linking.js l.js +git show master:src/game-lib-a-component-a.js > c.js +meld game-lib-a-component-a.js c.js +exit +gl +gulp +exit +p +gulp +exit +3d +gulp +exit +s +m +exit +c +cd api-v1/ +exit +gl +git diff +git commit -am "force build" +git branch +git checkout create_instance +s +p +npm install --save gulp-replace +git +git diff +git commit -am "replace hardcoded url" +git push +git push flyingspoon +exitr +exit +ssh spoon2 +? +ssh spoon2 +gl +git diff +git commit -am "remove extra subscription" +git push +git push -u origin create_instance +git checkout master +git pull flyingspoon master +git diff create_instance +git checkout create_instance +git diff +git diff FUCK_UP +git show FUCK_UP:src/game-lib-entity-manager.js > e.js +meld src/game-lib-entity-manager.js e.js +meld src/game-lib-api-entity-manager.js e-api.js +git show FUCK_UP:src/game-lib-api-entity-manager.js > e-api.js +meld src/game-lib-api-entity-manager.js e-api.js +git commit -am "fix entity manager with default instance" +git push +git show FUCK_UP:src/game-lib-d3-api-renderer.js > r-api.js +meld src/game-lib-d3-api-renderer.js r-api.js +git show FUCK_UP:src/game-lib-d3-renderer.js >r.js +meld src/game-lib-d3-renderer.js r.js +git commit -am "default scene for renderer" +git push +git push flyingspoon create_instance +git diff FUCK_UP +git show /src/game-lib-a-1-event.js > e.js +git show FUCK_UP:/src/game-lib-a-1-event.js > e.js +git show FUCK_UP:src/game-lib-a-1-event.js > e.js +meld src/game-lib-a-1-event.js e.js +git diff FUCK_UP +cd .. +gl +3d +git diff +git branch +git checkout stable_for_editor +git diff +git commit -am "middle of revert" +git push +git checkout stable_for_editor +git diff fuck_up +git diff +gl +git dif +git diff +git commit -am "proper linked and loading flags" +git push +git status +rm e-api.js e.js r-api.js r.js src/ce.js src/c.js src/g.js src/i.js src/s.js src/t.js +git diff +git push +cd src/ +grep "IMAGE_NOT_FOUND" * -R +git diff +git commit -am "cleanup subscriptions" +git push +git push flyingspoon +grep "\.loaded" * -R +git diff +git commit -am "update getDependencies" +git push flyingspoon +grep "\.loaded" * -R +git diff +git commit -am "revert to original" +git push +git diff +git commit -am "remember to delay instance" +git push +git push flyingspoon +grep "REGISTER_DEPENDENCIES" * -R +grep "COMPONENT_CREATED" * -R +git diff +git commit -am "linking system fixed" +git push +git push flyingspoon +git commit -am "linking system really fixed" +git push +grep "COMPONENT_REMOVE" * -R +grep "MESH_DELETED" * -R +grep "MESH_DELETED" * -Rl | xargs sed -i "s/MESH_DELETED/REMOVE_MESH/g" +grep "COMPONENT_REMOVE" * -R +grep "REMOVE_MESH" * -r +grep "COMPONENT_REMOVE" * -R +grep "COMPONENT_REMOVE" * -Rl | xargs sed -i "s/COMPONENT_REMOVE/REMOVE_COMPONENT/g" +grep "REMOVE_COMPONENT" * -R +grep "removeComponent" * -R +grep "removeEntity" * -R +git diff +git commit -am "component remove" +git push +git checkout master +git diff +git merge create_instance +git push +git push flyingspoon +grep "GET_PHYSICS_ENGINE" * -R +grep "GET_PHYSICS_ENGINE" * -Rl | xargs sed -i "s/GET_PHYSICS_ENGINE/GET_PHYSICS_IMPLEMENTATION/g" +3d +cd src/ +grep "GET_PHYSICS_ENGINE" * -Rl | xargs sed -i "s/GET_PHYSICS_ENGINE/GET_PHYSICS_IMPLEMENTATION/g" +git diff +git commit -am "IMPLEMENTATION" +git pus +git push +git push flyingspoon +p +grep "GET_PHYSICS_ENGINE" * -Rl | xargs sed -i "s/GET_PHYSICS_ENGINE/GET_PHYSICS_IMPLEMENTATION/g" +git diff +gl +cd src/ +grep "GET_PHYSICS_IMPLEMENTATION" * -R +git diff +git commit -am "get physics better" +git push +git push flyingspoon +git +cd .. +3d +git +cd .. +p +git diff +git commit -am "preview updated" +git push +git push flyingspoon +git diff +gl +cd src/ +p +gl +cd src/ +grep "delayed =" * -R +git diff +git commit -am "housekeeping for delayed instance" +git push flyingspoon +git diff +git commit -am "fix bug for edit controls" +git push flyingspoon +git push +3d +git diff +git commit -am "start fixes" +git push +git push flyingspoon +git diff +git commit -am "restart input system" +git push +git push flyingspoon +gl +git diff +git commit -am "delayed instance encounterer" +git push +git push flyingspoon +3d +git push flyingspoon +git log +gl +git push flyingspoon +git log +g +po +p +git diff +git commit -am "start all systems" +git push +git push flyingspoon +gl +git diff +git commit -am "event management update" +git push +git push flyingspoon +git diff +git commit -am "parent update" +git push +git push flyingspoon +git diff +git commit -am "components can be delayed" +git push +git push flyingspoon +grep "built" * -R +cd src/ +grep "built" * -R +grep "built" * -Rl | xargs sed -i "s/built/building/g" +git diff +git commit -am "building" +git push +git push flyingspoon +git diff +git commit -am "process component for buildId" +git push +git push flyingspoon +git diff +git commit -am "clone numbers for components" +git push +git push flyingspoon +git show FUCK_UP:src/game-lib-d3-controls-0 > c.js +git show FUCK_UP:src/game-lib-d3-controls-0.js > c.js +meld game-lib-d3-controls-0.js c.js +git show FUCK_UP:src/game-lib-d3-controls-editor.js > ce.js +meld game-lib-d3-controls-editor.js ce.js +git diff +git commit -am "delayed controls for edit" +git push +git show FUCK_UP:src/game-lib-d3-image.js > i.js +meld game-lib-d3-image.js i.js +git diff +git commit -am "delayed image instance" +git push +git push flyingspoon +git show FUCK_UP:src/game-lib-d3-texture.js > t.js +meld game-lib-d3-texture.js t.js +git commit -am "canvas check for textures" +git push +git push flyingspoon +git show FUCK_UP:src/game-lib-system-gui.js > g.js +meld game-lib-system-gui.js g.js +git commit -am "ambiguous idToObject removed" +git push +git push flyingspoon +git show FUCK_UP:src/game-lib-system-input.js > i.js +meld game-lib-system-input.js i.js +git commit -am "delayed instance update" +git push +git push flyingspoon +git diff +git commit -am "dont push to resolved" +git push +git push flyingspoon +git diff +git commit -am "physics world" +git push +git push flyingspoon +git show FUCK_UP:src/game-lib-system-storage.js > s.js +meld game-lib-system-storage.js s.js +git diff +git commit -am "delayed image creation for storage system" +git push +3d +git show fuck_up:src/editor-a.js > e.js +git show fuck_up:src/editor.js/editor-a.js > e.js +cd src/editor.js/ +meld editor-a.js editor- +git show fuck_up:src/editor.js/editor-a.js > e.js +meld editor-a.js e.js +git diff +git commit -am "fuckup updates" +git push +git push -u origin stable_for_editor +git diff +git status +git diff +git status +git show fuck_up:src/editor.js/editor-buttons.js > eb.js +meld editor-buttons.js eb.js +git diff +git commit -am "buttons updates" +git push +git show fuck_up:src/editor.js/editor-images.js > ei.js +git show fuck_up:src/editor.js/editor-upload.js > eu.js +meld editor-images.js ei.js +meld editor-upload.js eu.js +git diff +git commit -am "passwoid for uploads, images via EM" +git push +git push flyingspoon +grep "IMAGE_NOT_FOUND" * -R +gl +cd src/ +git diff +git commit -am "unneeded 'loaded'" +git push +3d +cd src/ +grep "MESH_DELETED" * -R +grep "COMPONENT_REMOVE" * -Rl | xargs sed -i "s/COMPONENT_REMOVE/REMOVE_COMPONENT/g" +grep "inputEditInputSystemStart" * -R +grep "inputEditInputSystemStart" * -Rl | xargs sed -i "s/inputEditInputSystemStart/inputInputSystemStart/g" +grep "inputEditInputSystemStop" * -Rl | xargs sed -i "s/inputEditInputSystemStop/inputInputSystemStop/g" +git diff +git commit -am "get physics" +git push +s +m +git +3d +gulp +p +gulp +ssh spoon2 +g +gl +gulp +3d +git diff +git branch "fuck up" +git checkout "fuck up" +git branch fuck_up +git checkout fuck_up +git help +git commit help +git help commit +git commit --patch -m "fuck" +git diff +git commit -am "controls part of entity" +git push +git push flyingspoon +git status +rm e.js +cd .. +cd game +cd game-lib/ +3d +git checkout master +git merge stable_for_editor +git mergetool +git commit -am "merge conflicts" +git push +git status +find . -name "*.orig" | xargs rm +git push flyingspoon +p +git push flyingspoon +gl +git push flyingspoon +gl +gulp +exit +p +gulp +exit +3d +gulp +exit +s +m +exit +s +m +exit +p +gulp +git diff +exit +gl +gulp +git diff +exit +3d +gulp +git diff +exit +gl +git diff +git commit -am "multiple renderer support" +git push +git push flyingspoon +git diff +git commit -am "mesh types in mesh constructors (like it should have been)") +git push +git push flyingspoon +git commit -am "mesh types in mesh constructors (like it should have been)" +git push flyingspoon +git push +ssh spoon2 +exit +3d +git diff +git commit -am "mesh types in constructor" +git push +git push flyingspoon +exit +o +p +git diff +git commit -am "restart custom code system on custom code component created" +git push +git push flyingspoon +exit +gl +git diff +git commit -am "input system updates" +git push +git push flyingspoon +3d +git diff +git commit -am "game start event" +git push +git push flyingspoon +p +git diff +exit +3d +npm install --save gulp-replace +exi +t +exit +s +p +git diff +git commit -am "download timestamp game-lib" +git push +git push flyingspoon +exit +3d +gulp +exit +p gulp +gulp +exit +gl +gulp +git diff +exit +3d +git diff +git commit -am "always latest scripts for editor" +git push +git push flyingspoon +pp +p +git diff +git commit -am "timestamp for preview" +git push +git push flyingspoon +gl +git diff +git commit -am "fog component" +git push +git push flyingspoon +git diff +git commit -am "override camera" +git push +git push flyingspoon +git diff +git commit --patch -m "camera update lookat" +git push +git push flyingspoon +ssh spoon2 +m +exit +c +cd api-v1/ +npm install --save nodegit +s +r +c +cd api-v1/ +npm install --save nodegit +sudo add-apt-repository ppa:ubuntu-toolchain-r/test +sudo apt-get update +c++ -v +sudo apt-get install libssl-dev +npm install --save nodegit +m +exit +cd +c +cd custom-code +git log +git diff +r +git log +gitlog +git log +exit +c +mkdir custom-code +rmdir custom-code +git clone git@bitbucket.org:cybafelo/custom-code.git +cd custom-code/ +vim README.md +git add README.md +git commit -m "first commit" +git push +git push -u origin master +git remote add flyingspoon git@bitbucket.org:flyingspoon/editor-custom-code.git +git push -u flyingspoon master +s +touch 3as +vim 3as +rm 3as +r +cd api-v1/ +npm install --save promisify +npm install --save fs-extra +npm install --save path +r +npm remove --save promisify +npm install --save promisify-node +r +cd .. +cd custom-code/ +ls +vim dywmtohrda +rm dywmtohrda +r +ls +r +ls +vim dywmtohrda.js +rm dywmtohrda.js +r +ls +r +ls +rm dywmtohrda.js +git status +rm dywmtohrda.js +git status +git rm dywmtohrda.js +ls +git status +r +git status +git log +r +l +ls +git rm dywmtohrda.js +ls +git status +ls +git status +git log +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +git status +git log +r +git log +r +ls +r +l +git rm *.js +git status +rm *.js +ls +git status +git log +git reset --HARD 31ce26c9a3b52109dcb26db01657d26b108fd703 +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +git log +git push +git push origin +git pul +git pull +git log +ls +rm *.js +git rm *.js +git log +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +git push origin :master +git push origin master +r +ls +rm *.js +git rm *.js +git status +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +ls +rm *.js +r +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +ls +rm *.js +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +r +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +ls +rm *.js +c +cd api-v1/ +npm install --save nodegit-kit +git commit -am "before git-kit" +r +rm *.js +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +ls +git pull +ls +git reset HEAD +git status +r +ls +git status +git checkout index.js +ls +r +c +cd custom-code/ +rm *.js +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +ls +r +ls +git log +r +git log +rm *.js +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +ls +r +ls +git log +r +vim .git/config +r +vim .git/config +ls +rm *.js +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +r +rm *.js +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +git log +cd .. +rm -rf custom-code +git clone git@bitbucket.org:cybafelo/custom-code.git +cd custom-code/ +git log +git remote add flyingspoon git@bitbucket.org:flyingspoon/editor-custom-code.git +r +ls +rm *.js +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +git log +r +ls +r +ls +r +d +s +r +cd custom-code/ +ls +rm *.js +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +ls +rm *.js +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +r +rm *.js +git reset --hard 31ce26c9a3b52109dcb26db01657d26b108fd703 +r +ls +git log +ls +git log +git pull +git push +r +exit +c +cd api-v1/ +npm remove --save promisify-node +npm remove --save gitkit +npm remove --save nodegit-kit +npm remove --save nodegit +npm remove --save fs-extra +npm install --save simple-git +git diff +git commit -am "custom code components save themselves to git" +git push +git push flyingspoon +exit +p +gulp +exit +3d +gulp +git diff +git commit -am "sorting" +git push +git push flyingspoon +exit +gl +gulp +git diff +git commit -am "mesh line - untested and probably stupid" +git push +git push flyingspoon +exit +3d +git diff +git commit -am "style update" +git push +git push flyingspoon +gl +git diff +3d +grep "selectEntity" * -R +cd src/ +grep "selectEntity" * -R +exit +gl +git diff +git commit -am "sort objects" +git push +git push flyingspoon +ssh spoon2 +exit +p +git push +exit +3d +git push flyingspoon +exit +gl +git diff +git commit -am "particle engine" +git push +exit +s +m +s +l +m +exit +p +gulp +gl +gulp +3d +gulp +cd Downloads/blender-2.79-rc1-linux-glibc219-x86_64/ +ls +./blender +exit +gnome-screenshot -a +exit +s +exit +cd Downloads/blender-2.79-rc1-linux-glibc219-x86_64/ +ls +./blender +exi +exit +s +exit diff --git a/cybafelo.blend b/cybafelo.blend deleted file mode 100644 index 465e306..0000000 Binary files a/cybafelo.blend and /dev/null differ diff --git a/hosts b/hosts index 91959c4..614a58c 100644 --- a/hosts +++ b/hosts @@ -19,6 +19,7 @@ 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 # 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 6f595dc..d511027 100644 --- a/nginx/sites-available/cybafelo.conf +++ b/nginx/sites-available/cybafelo.conf @@ -11,7 +11,7 @@ server { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin; add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-gamewheel"; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-authorization"; add_header Access-Control-Allow-Credentials true; return 200; } @@ -31,7 +31,7 @@ server { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin; add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-gamewheel"; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-authorization"; add_header Access-Control-Allow-Credentials true; return 200; } @@ -44,7 +44,7 @@ server { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin; add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-gamewheel"; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-authorization"; add_header Access-Control-Allow-Credentials true; return 200; } diff --git a/secure.js b/secure.js index a3eb7c2..e62a85d 100644 --- a/secure.js +++ b/secure.js @@ -24,7 +24,8 @@ var secure = { debug: true, ignoreTLS: true }, - sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' + sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23', + customCodePath: '/usr/share/cybafelo/custom-code' }, tools: { port: 3109, diff --git a/vimrc.local b/vimrc.local index ac434c9..c8f0074 100644 --- a/vimrc.local +++ b/vimrc.local @@ -30,7 +30,6 @@ set statusline="%f%m%r%h%w [%Y] [0x%02.2B]%< %F%=%4v,%4l %3p%% of %L" set number set nowrap -set history=1000000 com! FormatJSON %!python -m json.tool nmap dd\|i=join([" -- Theunis J. Botha ", strftime("%a, %d %b %Y %H:%M:%S %z")], "") imap dd\|i=join([" -- Theunis J. Botha ", strftime("%a, %d %b %Y %H:%M:%S %z")], "")