0000000000000000000000000000000000000000 da3951a65fc643b4c2ce84e00d93fe432a1afad0 Marvin Lunz <marvinlunz@gmail.com> 1454095486 +0100	clone: from ssh://git_proj@wag-web.de/~/server/jam-cgl
da3951a65fc643b4c2ce84e00d93fe432a1afad0 2016a695b137b3d972dc3774ad4c37f7d546e56c Marvin Lunz <marvinlunz@gmail.com> 1454097721 +0100	commit: adds some inital stuff
2016a695b137b3d972dc3774ad4c37f7d546e56c 1160134f62740d13f24bb390c5cd0d62913538c6 Marvin Lunz <marvinlunz@gmail.com> 1454099671 +0100	commit: a desperate try to support html5
1160134f62740d13f24bb390c5cd0d62913538c6 57660838126e9e1f6375819db0f148676a2effd4 Marvin Lunz <marvinlunz@gmail.com> 1454100768 +0100	commit: Adds formatter
57660838126e9e1f6375819db0f148676a2effd4 f1e6f6412e66995fd833535e7276edd02963d2a5 Marvin Lunz <marvinlunz@gmail.com> 1454101170 +0100	commit: adds res folder
f1e6f6412e66995fd833535e7276edd02963d2a5 8096dad9ee39f16d7abeddef4faa48003dddf391 Marvin Lunz <marvinlunz@gmail.com> 1454103332 +0100	pull: Fast-forward
8096dad9ee39f16d7abeddef4faa48003dddf391 1fa40bae58a24327841fe3a968081e15ebd37931 Marvin Lunz <marvinlunz@gmail.com> 1454108063 +0100	commit: Adds some components
1fa40bae58a24327841fe3a968081e15ebd37931 45d55bea8404a306a51a313e52863ff6484c4c82 Marvin Lunz <marvinlunz@gmail.com> 1454108564 +0100	commit: Fixes components
45d55bea8404a306a51a313e52863ff6484c4c82 762fc62899965226355ca677290e01039d855f91 Marvin Lunz <marvinlunz@gmail.com> 1454108766 +0100	pull: Fast-forward
762fc62899965226355ca677290e01039d855f91 7c8557b0b0d713a5e393976bc47e344c42b44e1f Marvin Lunz <marvinlunz@gmail.com> 1454110207 +0100	commit: Implements components
7c8557b0b0d713a5e393976bc47e344c42b44e1f 5e58d9b39b9d648a45340c345780c520aaa5f9d1 Marvin Lunz <marvinlunz@gmail.com> 1454110225 +0100	pull: Merge made by the 'recursive' strategy.
5e58d9b39b9d648a45340c345780c520aaa5f9d1 e5ff4f208e406643d077c919afc2acb8859e6756 Marvin Lunz <marvinlunz@gmail.com> 1454111471 +0100	commit: Improves components and adds systems
e5ff4f208e406643d077c919afc2acb8859e6756 6e218285722775b68c4709b2452e936adc73f016 Marvin Lunz <marvinlunz@gmail.com> 1454112121 +0100	commit: Adds light wobble
6e218285722775b68c4709b2452e936adc73f016 0edc9e06e5d234693907d21dc1b1985e7b1faebc Marvin Lunz <marvinlunz@gmail.com> 1454112865 +0100	commit: fix commit
0edc9e06e5d234693907d21dc1b1985e7b1faebc f8914895366099fb9fecfa092ce78da043e37b73 Marvin Lunz <marvinlunz@gmail.com> 1454113226 +0100	commit: Fixes components
f8914895366099fb9fecfa092ce78da043e37b73 4b7c927d42e538fd995688735099a274ff54a5e8 Marvin Lunz <marvinlunz@gmail.com> 1454113396 +0100	rebase finished: refs/heads/master onto 4b7c927d42e538fd995688735099a274ff54a5e8
4b7c927d42e538fd995688735099a274ff54a5e8 5b0cbdf39b3ca48c14a0302afb073b122fe8f5be Marvin Lunz <marvinlunz@gmail.com> 1454114741 +0100	commit: Fixes families
5b0cbdf39b3ca48c14a0302afb073b122fe8f5be dff7422cfa026656a7e3df5cf1c3b1968f6cd72a Marvin Lunz <marvinlunz@gmail.com> 1454114815 +0100	rebase finished: refs/heads/master onto 18ea90680209bf70fbc8a25a785b58187c09a104
dff7422cfa026656a7e3df5cf1c3b1968f6cd72a ee308e68411f15720b8f2221941ae8035d3ec6ae Marvin Lunz <marvinlunz@gmail.com> 1454117566 +0100	commit: Adds entity to bodys
ee308e68411f15720b8f2221941ae8035d3ec6ae 81f58992074f9cb91b7638607d7a99582c9085db Marvin Lunz <marvinlunz@gmail.com> 1454118514 +0100	rebase finished: refs/heads/master onto 81f58992074f9cb91b7638607d7a99582c9085db
81f58992074f9cb91b7638607d7a99582c9085db b8d8cd05a057fad7f9062d50974bc8e9642f2aa5 Marvin Lunz <marvinlunz@gmail.com> 1454118692 +0100	rebase finished: refs/heads/master onto b8d8cd05a057fad7f9062d50974bc8e9642f2aa5
b8d8cd05a057fad7f9062d50974bc8e9642f2aa5 d51dab7d61ef6d1d5c36ac7e0b4ef11c41d90f77 Marvin Lunz <marvinlunz@gmail.com> 1454124293 +0100	commit: Adds collision logic
d51dab7d61ef6d1d5c36ac7e0b4ef11c41d90f77 49b1844fc21871649c85d6103d0aea614d522ad8 Marvin Lunz <marvinlunz@gmail.com> 1454127410 +0100	commit: Adds some fancy test
49b1844fc21871649c85d6103d0aea614d522ad8 c8779c6e89aad1e729f1342201e7a4b796e3e14d Marvin Lunz <marvinlunz@gmail.com> 1454154127 +0100	rebase finished: refs/heads/master onto c8779c6e89aad1e729f1342201e7a4b796e3e14d
c8779c6e89aad1e729f1342201e7a4b796e3e14d e940b37d59d0219f1708d9eb8696c1ffb2169e8a Marvin Lunz <marvinlunz@gmail.com> 1454159035 +0100	commit: Adds light bulb aligner and background image
e940b37d59d0219f1708d9eb8696c1ffb2169e8a 916de7534549f228edd2ddb10c2c684bea7b62c3 Marvin Lunz <marvinlunz@gmail.com> 1454159839 +0100	rebase finished: refs/heads/master onto a6f8fd96bd5d18e8b9de8c6d26c2615560a99b40
916de7534549f228edd2ddb10c2c684bea7b62c3 3ce5a3d11ac246aaf7543445a85c4516b95d8d29 Marvin Lunz <marvinlunz@gmail.com> 1454162542 +0100	commit: Adds logic to light source controller
3ce5a3d11ac246aaf7543445a85c4516b95d8d29 7dfd636612c293c9ddf9192aa1f01fdf42a1ef4f Marvin Lunz <marvinlunz@gmail.com> 1454162548 +0100	rebase finished: refs/heads/master onto 9bed21291c54fbffc8f7e6445f245b86b805b03f
7dfd636612c293c9ddf9192aa1f01fdf42a1ef4f cd1c2fd9934c545537a3139fe01e9c91dcd49c7a Marvin Lunz <marvinlunz@gmail.com> 1454162844 +0100	rebase finished: refs/heads/master onto cd1c2fd9934c545537a3139fe01e9c91dcd49c7a
cd1c2fd9934c545537a3139fe01e9c91dcd49c7a d5b64c61ae3bd6810cc5a46d45dba37b8a7da055 Marvin Lunz <marvinlunz@gmail.com> 1454167452 +0100	commit: Minor changes
d5b64c61ae3bd6810cc5a46d45dba37b8a7da055 8f6c1a6346caf3abd0c91d727127277417eda881 Marvin Lunz <marvinlunz@gmail.com> 1454168336 +0100	rebase finished: refs/heads/master onto 2b976e363f81898a1c26103e6351b83ccfefb9c7
8f6c1a6346caf3abd0c91d727127277417eda881 c451001205ca05c31b614875d30a8a1d6558beab Marvin Lunz <marvinlunz@gmail.com> 1454168501 +0100	commit: Fixes mirror
c451001205ca05c31b614875d30a8a1d6558beab 9a42e3c5e5204681ce994a6c0bb999cbc4f93f3e Marvin Lunz <marvinlunz@gmail.com> 1454174436 +0100	commit: Adds player control
9a42e3c5e5204681ce994a6c0bb999cbc4f93f3e 02c2db7803c55cae94b36ffef2bee3eee40d398f Marvin Lunz <marvinlunz@gmail.com> 1454174443 +0100	rebase finished: refs/heads/master onto 59b83e7a883c0b8f67406f526bee247f1bf8c030
02c2db7803c55cae94b36ffef2bee3eee40d398f 1d60e4d3972e9e4b86970bcd8cc560a59493f0a0 Marvin Lunz <marvinlunz@gmail.com> 1454175473 +0100	commit: Improves user input
1d60e4d3972e9e4b86970bcd8cc560a59493f0a0 b4d13212228ade86e238c3d189fcf4977fd3479c Marvin Lunz <marvinlunz@gmail.com> 1454178549 +0100	commit: Adds sprite rendering
b4d13212228ade86e238c3d189fcf4977fd3479c 4f97a6d8df42c4d263c2c057160d41fc6ae0d2e9 Marvin Lunz <marvinlunz@gmail.com> 1454178611 +0100	rebase finished: refs/heads/master onto 2ce09ef10897e619dc5e489e1caf56e6b57719a7
4f97a6d8df42c4d263c2c057160d41fc6ae0d2e9 5acbafc3790bc305ae7f3cf9dddc06c1d5a37ff3 Marvin Lunz <marvinlunz@gmail.com> 1454183934 +0100	commit: Adds mirror graphics (fix)
5acbafc3790bc305ae7f3cf9dddc06c1d5a37ff3 4a861e89ceb4f289fb7263d6f30d98a0a8d42d84 Marvin Lunz <marvinlunz@gmail.com> 1454192650 +0100	commit: adds try to add wall function
4a861e89ceb4f289fb7263d6f30d98a0a8d42d84 1e36c5b462e7e0793f64ba6a09f29b7cc80c47a0 Marvin Lunz <marvinlunz@gmail.com> 1454192664 +0100	rebase finished: refs/heads/master onto 9619e21c06a83ab67420c1e4e9a38696d216af6c
1e36c5b462e7e0793f64ba6a09f29b7cc80c47a0 9b4832c930c47a3e78c6d5a76731fe1ea3839e96 Marvin Lunz <marvinlunz@gmail.com> 1454194283 +0100	commit: fixes light bug
9b4832c930c47a3e78c6d5a76731fe1ea3839e96 eace9a8fdae96c37af26e8a3e5c0c5d88c8af244 Marvin Lunz <marvinlunz@gmail.com> 1454194349 +0100	rebase finished: refs/heads/master onto eace9a8fdae96c37af26e8a3e5c0c5d88c8af244
eace9a8fdae96c37af26e8a3e5c0c5d88c8af244 5747f28037c357f6064159937a71816850ffb17d Marvin Lunz <marvinlunz@gmail.com> 1454197213 +0100	commit: some desperate commit caused by a segfault
5747f28037c357f6064159937a71816850ffb17d e1dfc395ac72c0f7ff2780fc5ef2cacec6692d96 Marvin Lunz <marvinlunz@gmail.com> 1454202886 +0100	commit: Bugfix and assets update
e1dfc395ac72c0f7ff2780fc5ef2cacec6692d96 f7cfe61f1b3cdb88561568f47c66868b8194e0c2 Marvin Lunz <marvinlunz@gmail.com> 1454203037 +0100	rebase finished: refs/heads/master onto 62a95f77a4b0a12939e1466793dae3418489c5c5
f7cfe61f1b3cdb88561568f47c66868b8194e0c2 4ecd2d9f726dda54da071d422e7f740a32af6181 Marvin Lunz <marvinlunz@gmail.com> 1454204657 +0100	commit: Removes grid
4ecd2d9f726dda54da071d422e7f740a32af6181 50296ca3210b5e13b39a6740257672532b967eff Marvin Lunz <marvinlunz@gmail.com> 1454204672 +0100	rebase finished: refs/heads/master onto ff0ba9fbf09bace3d43bee8a9eb16e9fe65b524f
50296ca3210b5e13b39a6740257672532b967eff 65bfdc1e48dc82fb6273a670c004ad36295befcf Marvin Lunz <marvinlunz@gmail.com> 1454205140 +0100	commit: renames LevelScript.groovy to LevelScript.java
65bfdc1e48dc82fb6273a670c004ad36295befcf b534abf23f6a87720117fb9c2aace99b1ca5bb54 Marvin Lunz <marvinlunz@gmail.com> 1454205914 +0100	commit: Adds assets
b534abf23f6a87720117fb9c2aace99b1ca5bb54 10a41b72f7fe326cae615d33df9c608f160cd21e Marvin Lunz <marvinlunz@gmail.com> 1454216822 +0100	commit: Adds ui package
10a41b72f7fe326cae615d33df9c608f160cd21e ed8b67b16605d32f9f65294f235f5ffd18b5e8b5 Marvin Lunz <marvinlunz@gmail.com> 1454216836 +0100	rebase finished: refs/heads/master onto f536cefb02d877a8635a4da0f1bdf8c9c5a2877a
ed8b67b16605d32f9f65294f235f5ffd18b5e8b5 70c0d7e9e830e9e96b9dbf11606b0e3e76b9ec5b Marvin Lunz <marvinlunz@gmail.com> 1454247749 +0100	commit: tries to add menu
70c0d7e9e830e9e96b9dbf11606b0e3e76b9ec5b f2eb278c229ef9b6c05ef5576d4960311a64ecbb Marvin Lunz <marvinlunz@gmail.com> 1454247757 +0100	rebase finished: refs/heads/master onto d0e6eccc2f7a4611c0bc59876c8546a4e4475945
f2eb278c229ef9b6c05ef5576d4960311a64ecbb 34d7cb2538ac1e0957a839e7d2a033a932780a2a Marvin Lunz <marvinlunz@gmail.com> 1454247966 +0100	commit: inverts light source frequency
34d7cb2538ac1e0957a839e7d2a033a932780a2a eb9c90fc9f592229ae7e78d0a0c71bdc485dba59 Marvin Lunz <marvinlunz@gmail.com> 1454248454 +0100	commit: adds music
eb9c90fc9f592229ae7e78d0a0c71bdc485dba59 354293824540e67affb8b1d395d78e55d428fbcf Marvin Lunz <marvinlunz@gmail.com> 1454248474 +0100	rebase finished: refs/heads/master onto 0e89e95129b962a1dee4be0f3656f01837f491e2
