0000000000000000000000000000000000000000 ba7010843ca3da3baeb92226debcd203d1dfd5dd Steven Arnow <s@rdw.se> 1431602751 +0200	commit (initial): gittignore
ba7010843ca3da3baeb92226debcd203d1dfd5dd 9434758120dae09350c852e57e8a449321e754e8 Steven Arnow <s@rdw.se> 1431603874 +0200	commit: main.c
9434758120dae09350c852e57e8a449321e754e8 1b48191eb635babb745cd4395840bd5cc0caf046 Steven Arnow <s@rdw.se> 1431604277 +0200	pull: Fast-forward
1b48191eb635babb745cd4395840bd5cc0caf046 489d7a52fcee57579760791b0b571b2591750ac8 Steven Arnow <s@rdw.se> 1431608118 +0200	commit: Started on client objects
489d7a52fcee57579760791b0b571b2591750ac8 956103b8174d6cbb9ab0f11db14a65b29abaa296 Steven Arnow <s@rdw.se> 1431609004 +0200	pull: Fast-forward
956103b8174d6cbb9ab0f11db14a65b29abaa296 6f96dcbdcf6c21d62a4a66e4a2004388271ebff3 Steven Arnow <s@rdw.se> 1431609265 +0200	pull: Fast-forward
6f96dcbdcf6c21d62a4a66e4a2004388271ebff3 9f40ca96fe78315c792779706de43c7b8e687735 Steven Arnow <s@rdw.se> 1431609916 +0200	commit: main
9f40ca96fe78315c792779706de43c7b8e687735 88603b50325f39b8ffdd1747074b5d31543a24ac Steven Arnow <s@rdw.se> 1431611035 +0200	pull: Fast-forward
88603b50325f39b8ffdd1747074b5d31543a24ac 75e1ea9fd3eb481e5216df8db214e570e52f3d8f Steven Arnow <s@rdw.se> 1431611650 +0200	commit: dfss
75e1ea9fd3eb481e5216df8db214e570e52f3d8f 530927ee54e766c4205974cfff8847ac4f9d1780 Steven Arnow <s@rdw.se> 1431611656 +0200	pull: Merge made by the 'recursive' strategy.
530927ee54e766c4205974cfff8847ac4f9d1780 34bd63f2a2a27d314c70a34e0b7367cd7e6530e2 Steven Arnow <s@rdw.se> 1431612179 +0200	pull: Fast-forward
34bd63f2a2a27d314c70a34e0b7367cd7e6530e2 292ad59056286cef53b0fc50f50e42c39348050c Steven Arnow <s@rdw.se> 1431612554 +0200	pull: Fast-forward
292ad59056286cef53b0fc50f50e42c39348050c 947b2477a2d71f1ffc8a986a65db394bffa1b3aa Steven Arnow <s@rdw.se> 1431613821 +0200	commit: display physics
947b2477a2d71f1ffc8a986a65db394bffa1b3aa 2c519b3c9f71f3ed5a6cda327e8e6141b0c4def6 Steven Arnow <s@rdw.se> 1431617381 +0200	commit: Handle tiles in addition to sprites
2c519b3c9f71f3ed5a6cda327e8e6141b0c4def6 af46704aeee3d262665a36c5bb3a67dd0bc45f5d Steven Arnow <s@rdw.se> 1431617861 +0200	pull: Merge made by the 'recursive' strategy.
af46704aeee3d262665a36c5bb3a67dd0bc45f5d 40a29f027e20db0a26a56104d8f7784111ccbff4 Steven Arnow <s@rdw.se> 1431618375 +0200	pull: Merge made by the 'recursive' strategy.
40a29f027e20db0a26a56104d8f7784111ccbff4 b9cfdda85c9793acd0bfb81dc9063224740867e4 Steven Arnow <s@rdw.se> 1431623808 +0200	commit: Hack around segfault
b9cfdda85c9793acd0bfb81dc9063224740867e4 c4557d674ab69e7fec3fc1a661d797079ef6603d Steven Arnow <s@rdw.se> 1431626034 +0200	pull: Fast-forward
c4557d674ab69e7fec3fc1a661d797079ef6603d 6251107c0753ab8de983f23765b811a32528cef5 Steven Arnow <s@rdw.se> 1431626474 +0200	commit: angle
6251107c0753ab8de983f23765b811a32528cef5 13a81429b17239ddd0a29517276c495d6a2d4c52 Steven Arnow <s@rdw.se> 1431627306 +0200	pull: Fast-forward
13a81429b17239ddd0a29517276c495d6a2d4c52 ac02a8d004291d75761bf4b437262f5efb6fb1c6 Steven Arnow <s@rdw.se> 1431627475 +0200	pull: Fast-forward
ac02a8d004291d75761bf4b437262f5efb6fb1c6 899e6d901dd42aa7e05695e6e7477f42e1fb0254 Steven Arnow <s@rdw.se> 1431627666 +0200	pull: Fast-forward
899e6d901dd42aa7e05695e6e7477f42e1fb0254 185fb0186946c1900beb2bfb50ec6b6d2407e2c4 Steven Arnow <s@rdw.se> 1431630660 +0200	pull: Fast-forward
185fb0186946c1900beb2bfb50ec6b6d2407e2c4 0fbeda85a83c3bdedc97406283ac6df698d16d9d Steven Arnow <s@rdw.se> 1431631415 +0200	commit: COOOOOOODE
0fbeda85a83c3bdedc97406283ac6df698d16d9d 4d159cff5637af18326690725e96728953fd348b Steven Arnow <s@rdw.se> 1431631425 +0200	pull: Merge made by the 'recursive' strategy.
4d159cff5637af18326690725e96728953fd348b ab086d08e85307593afa5267be76f277ae540c04 Steven Arnow <s@rdw.se> 1431633003 +0200	commit: Arne
ab086d08e85307593afa5267be76f277ae540c04 f9ea16d835943e09d3e7eff5b43c64838c81c208 Steven Arnow <s@rdw.se> 1431633162 +0200	pull: Fast-forward
f9ea16d835943e09d3e7eff5b43c64838c81c208 3d762c969052bf10ad4ea4fac99aec5f5f9a9b0f Steven Arnow <s@rdw.se> 1431638417 +0200	commit: the client and server are now one
3d762c969052bf10ad4ea4fac99aec5f5f9a9b0f 4ef623d61165ca97f5e72e22f9e10e4f516db051 Steven Arnow <s@rdw.se> 1431640313 +0200	commit: In theory several people can now join
4ef623d61165ca97f5e72e22f9e10e4f516db051 9b86807b25fbfb49753eff1685e4302c4b7b0a50 Steven Arnow <s@rdw.se> 1431640407 +0200	commit: arne
9b86807b25fbfb49753eff1685e4302c4b7b0a50 b6c00d14bd4b83495862988c5eac90144cc20ae9 Steven Arnow <s@rdw.se> 1431641322 +0200	commit: I think I did something?
b6c00d14bd4b83495862988c5eac90144cc20ae9 b3a4afea89a56c32b5f429ce2ea6f122ac0036be Steven Arnow <s@rdw.se> 1431641951 +0200	commit: get rid of preamble
b3a4afea89a56c32b5f429ce2ea6f122ac0036be 9f0fe97b00fc92fd4667f51316ca03599d08b558 Steven Arnow <s@rdw.se> 1431642001 +0200	commit: you shall build
9f0fe97b00fc92fd4667f51316ca03599d08b558 637edda0b0749bf03881d4beee208ff65eec5163 Steven Arnow <s@rdw.se> 1431642687 +0200	commit: this might announce players already in the room?
637edda0b0749bf03881d4beee208ff65eec5163 4543c3cba2f013840b61348861fe113fdac88dea Steven Arnow <s@rdw.se> 1431642880 +0200	commit: arne
4543c3cba2f013840b61348861fe113fdac88dea 7219bbaf1fca2460695f23e84c8221854451606b Steven Arnow <s@rdw.se> 1431644536 +0200	commit: use consistent begin value for outsiders joining a game
7219bbaf1fca2460695f23e84c8221854451606b d0875181058fe1c0640651edee3d6042739ea44d Steven Arnow <s@rdw.se> 1431646015 +0200	commit: I think this might announce a game
d0875181058fe1c0640651edee3d6042739ea44d 30fa2d2ba2c63e0e550c4991269d8fc43f175336 Steven Arnow <s@rdw.se> 1431646681 +0200	commit: fix segfault in server
30fa2d2ba2c63e0e550c4991269d8fc43f175336 ee15eababbaa0bddf008ae11f3610f3b672fa536 Steven Arnow <s@rdw.se> 1431646808 +0200	commit: arne
ee15eababbaa0bddf008ae11f3610f3b672fa536 fbce9e4fc175f70d5839cc5cba7f20a0aa627b3b Steven Arnow <s@rdw.se> 1431648132 +0200	commit: arne
fbce9e4fc175f70d5839cc5cba7f20a0aa627b3b ed2d70d3ef9dd54a3c3ec66a288f869e655f6192 Steven Arnow <s@rdw.se> 1431648137 +0200	pull: Merge made by the 'recursive' strategy.
ed2d70d3ef9dd54a3c3ec66a288f869e655f6192 bba79d02513a379e7880f59f71182191ecebc4a7 Steven Arnow <s@rdw.se> 1431648458 +0200	pull: Merge made by the 'recursive' strategy.
bba79d02513a379e7880f59f71182191ecebc4a7 51cf8002690a4058a4c9e789ed92508ea1519b1e Steven Arnow <s@rdw.se> 1431649708 +0200	commit: lolwut
51cf8002690a4058a4c9e789ed92508ea1519b1e 9055e3ef5cf1d3ca3aa46eb70153ac99b85a97aa Steven Arnow <s@rdw.se> 1431650307 +0200	commit: camera?
9055e3ef5cf1d3ca3aa46eb70153ac99b85a97aa 27665cfc3dad3ba98d3ac26a6a07136dd725917f Steven Arnow <s@rdw.se> 1431650317 +0200	pull: Merge made by the 'recursive' strategy.
27665cfc3dad3ba98d3ac26a6a07136dd725917f b35ed012523da17e2c8e9513bd3f1f9d55b2363a Steven Arnow <s@rdw.se> 1431651077 +0200	commit: camera lol
b35ed012523da17e2c8e9513bd3f1f9d55b2363a cb204261a3315b3110b72b32920182169a092c2b Steven Arnow <s@rdw.se> 1431653188 +0200	commit: gfgsdf
cb204261a3315b3110b72b32920182169a092c2b 9064781a836e9e24cff04080945ae8c15bd1a844 Steven Arnow <s@rdw.se> 1431655153 +0200	commit: fsdfs
9064781a836e9e24cff04080945ae8c15bd1a844 1819da614a6503d647be218ff5494153416166f2 Steven Arnow <s@rdw.se> 1431658922 +0200	commit: Trigonimetry is hard when it's 5am
1819da614a6503d647be218ff5494153416166f2 89b50b0506ac121fd5a3c3b95eb3bf749d7093cb Steven Arnow <s@rdw.se> 1431661630 +0200	commit (merge): merge
89b50b0506ac121fd5a3c3b95eb3bf749d7093cb 05f831f0111b79b83dd4f315553df1d0e82f8ba4 Steven Arnow <s@rdw.se> 1431661674 +0200	pull: Merge made by the 'recursive' strategy.
05f831f0111b79b83dd4f315553df1d0e82f8ba4 c1a0245716b18c458012c8fa0fdaaed7555e6378 Steven Arnow <s@rdw.se> 1431667484 +0200	commit: started on name tags
c1a0245716b18c458012c8fa0fdaaed7555e6378 12d13d02d9398207bd1361e78d3e2269ac0627ea Steven Arnow <s@rdw.se> 1431667492 +0200	pull: Merge made by the 'recursive' strategy.
12d13d02d9398207bd1361e78d3e2269ac0627ea 34746d34e72850822cceae88fc0588e86b6a166a Steven Arnow <s@rdw.se> 1431669457 +0200	pull: Fast-forward
34746d34e72850822cceae88fc0588e86b6a166a 6dc89acb04217c222870fcf409329171b24475f6 Steven Arnow <s@rdw.se> 1431675026 +0200	commit: arne
6dc89acb04217c222870fcf409329171b24475f6 6b551faa0cb28cbf3d38ed14a2c20ab30abc115c Steven Arnow <s@rdw.se> 1431675087 +0200	commit (merge): merge
6b551faa0cb28cbf3d38ed14a2c20ab30abc115c 9989e9237e9edc4f6499ea73ce695f9b91734396 Steven Arnow <s@rdw.se> 1431676142 +0200	commit: Bouncy walls
9989e9237e9edc4f6499ea73ce695f9b91734396 2447b42fb556732a2da358129ba25bbc1c9067a7 Steven Arnow <s@rdw.se> 1431680810 +0200	commit: Arne
2447b42fb556732a2da358129ba25bbc1c9067a7 88cebd77dfea7284105be8a7e4da6a06e6fca4c5 Steven Arnow <s@rdw.se> 1431680834 +0200	merge refs/remotes/origin/master: Merge made by the 'recursive' strategy.
88cebd77dfea7284105be8a7e4da6a06e6fca4c5 d0119c2b3ec59bc869dc3461a55749ee331e3a6f Steven Arnow <s@rdw.se> 1431682077 +0200	commit: changes
d0119c2b3ec59bc869dc3461a55749ee331e3a6f d745906cfdfbdacd8bf777e1e4d73835726a4c09 Steven Arnow <s@rdw.se> 1431682131 +0200	commit (merge): merge
d745906cfdfbdacd8bf777e1e4d73835726a4c09 1bbfb13aa5cc279568aa0c69e0ad63d710a3abc6 Steven Arnow <s@rdw.se> 1431684793 +0200	commit: mätare
1bbfb13aa5cc279568aa0c69e0ad63d710a3abc6 e24f2edc4d1cfbf9758fd247ce75ed3a35623244 Steven Arnow <s@rdw.se> 1431686067 +0200	commit: arne
e24f2edc4d1cfbf9758fd247ce75ed3a35623244 3d6c671872ef871daeca71ee4ae858e9a2030f66 Steven Arnow <s@rdw.se> 1431686078 +0200	pull: Merge made by the 'recursive' strategy.
3d6c671872ef871daeca71ee4ae858e9a2030f66 a7e371622d6f33a25ddda0d09a683f85b20c7a2b Steven Arnow <s@rdw.se> 1431687564 +0200	commit: test tractorbeam
a7e371622d6f33a25ddda0d09a683f85b20c7a2b 74a0489c54f5254ced39250ab1d4e2b99e6a0905 Steven Arnow <s@rdw.se> 1431687569 +0200	pull: Merge made by the 'recursive' strategy.
74a0489c54f5254ced39250ab1d4e2b99e6a0905 cb9f6b173b6d2d92577ca35858a7d0637fea48b2 Steven Arnow <s@rdw.se> 1431688478 +0200	commit: fixed collision#
cb9f6b173b6d2d92577ca35858a7d0637fea48b2 b8446a7ea92ac40a9de8ba7dd6deda690efa1fff Steven Arnow <s@rdw.se> 1431688878 +0200	commit: adjusted some radius values
b8446a7ea92ac40a9de8ba7dd6deda690efa1fff e18d194c7f9d2755947f394d183a78eb979778ef Steven Arnow <s@rdw.se> 1431702694 +0200	commit: Worked more on tractor beam
e18d194c7f9d2755947f394d183a78eb979778ef 18b7c7878d612cae1339e2e1aaeae5f7ffd9ff2b Steven Arnow <s@rdw.se> 1431702783 +0200	commit (merge): arne
18b7c7878d612cae1339e2e1aaeae5f7ffd9ff2b 1e7b885ab17f1ba1e3b7917ea5012a10f7ca9085 Steven Arnow <s@rdw.se> 1431703215 +0200	commit: merge
1e7b885ab17f1ba1e3b7917ea5012a10f7ca9085 54de8937d1640f8412c909b98cbb46600180aafc Steven Arnow <s@rdw.se> 1431706186 +0200	pull: Fast-forward
54de8937d1640f8412c909b98cbb46600180aafc 523d4a6b45003781027fd1f29dc9c97af7368409 Steven Arnow <s@rdw.se> 1431707050 +0200	commit: tractor beam
523d4a6b45003781027fd1f29dc9c97af7368409 c44c875b768d2e004c677827bee64aea796de85b Steven Arnow <s@rdw.se> 1431707633 +0200	pull: Fast-forward
c44c875b768d2e004c677827bee64aea796de85b da57f56005c25da6421e0823bf56be08869dd8d4 Steven Arnow <s@rdw.se> 1431717424 +0200	commit: arne
da57f56005c25da6421e0823bf56be08869dd8d4 ae9b2752628691d309d267997646cf709b13988e Steven Arnow <s@rdw.se> 1431717588 +0200	commit (merge): afdsdf
ae9b2752628691d309d267997646cf709b13988e 73a9ccd2943c1edd032787a771f2e26b701ade53 Steven Arnow <s@rdw.se> 1431720875 +0200	commit: I guess we can fire bullets now
73a9ccd2943c1edd032787a771f2e26b701ade53 86f2e5136d3ef4ca7ca2101d9fafe176a2afcf9c Steven Arnow <s@rdw.se> 1431721546 +0200	commit: pewpew for realz
86f2e5136d3ef4ca7ca2101d9fafe176a2afcf9c 92a07ba66f49e8bedaa47ab1fe60aa56121b0bcc Steven Arnow <s@rdw.se> 1431723313 +0200	pull: Fast-forward
92a07ba66f49e8bedaa47ab1fe60aa56121b0bcc 4f402b02b00be0a240bbac38ef102cbb8d57a610 Steven Arnow <s@rdw.se> 1431724272 +0200	pull: Fast-forward
4f402b02b00be0a240bbac38ef102cbb8d57a610 9c16a5228b4c16d465208ab009c93ae920c7eba7 Steven Arnow <s@rdw.se> 1431724702 +0200	commit: Faster refill of energy
9c16a5228b4c16d465208ab009c93ae920c7eba7 a0a81a197f457694d33fe745a4cec9680b59205a Steven Arnow <s@rdw.se> 1431724782 +0200	commit: Play for 5 minutes, not 3
a0a81a197f457694d33fe745a4cec9680b59205a c9b9e51119dd8352894e19554c426b5b6e176216 Steven Arnow <s@rdw.se> 1431725827 +0200	commit: arne
