Commit Graph

525 Commits

Author SHA1 Message Date
Johannes Wendel efb77a754d asdf 2019-10-09 23:11:36 +02:00
Johannes Wendel 03e1501985 Merge branch 'local-dev' 2019-10-09 23:05:41 +02:00
Johannes Wendel feb939a9d9 some working version 2019-10-09 23:04:26 +02:00
Jonas Zeunert cffc40a8c3 Merge branch 'master' of https://github.com/swinginbird/flippr-code 2019-10-09 22:52:25 +02:00
Jonas Zeunert ce9e0ba206 bla 2019-10-09 22:52:14 +02:00
Jonas Zeunert 5f86d527a5 finished sound json 2019-10-09 22:51:32 +02:00
Johannes Wendel 5e961d93c3 Fixed server file erroe 2019-10-09 21:55:07 +02:00
Johannes Wendel e086d79da3 Changed 2019-10-09 19:55:07 +02:00
Johannes Wendel ac7c2e41b2 little change to cmakes file 2019-10-09 15:49:31 +02:00
Jonas Zeunert 5037cbb770 Merge branch 'master' of https://github.com/swinginbird/flippr-code 2019-09-25 20:12:09 +02:00
Johannes Wendel 5f2eb4fbdc Extended game model 2019-09-20 09:38:48 +02:00
Johannes Wendel 25f67e15dd Merge branch 'master' of github.com:swinginbird/flippr-code 2019-09-13 11:17:24 +02:00
Johannes Wendel a5da39c155 changes? 2019-09-13 11:17:14 +02:00
andi eb09b227b1 minor changes to game.py 2019-09-12 22:51:35 +02:00
andi 90ee8d2e17 Merge branch 'master' of github.com:swinginbird/flippr-code 2019-09-12 22:49:36 +02:00
andi d52b597f88 first steps towards game logic 2019-09-12 22:48:55 +02:00
Jonas Zeunert 531c2beb21 change priority 2019-09-12 20:35:00 +02:00
Jonas Zeunert 30ff863ead added slash 2019-09-12 20:19:58 +02:00
Jonas Zeunert 9e1ba609bd return values when its meaningful 2019-08-30 00:28:45 +02:00
Johannes Wendel be595edc12 changed cli 2019-08-29 22:59:02 +02:00
Johannes Wendel 0fab1d4b74 changed cli 2019-08-29 22:32:37 +02:00
Johannes Wendel 6f7a0e9da3 changed cli 2019-08-29 22:30:02 +02:00
Johannes Wendel 9a52647105 changed cli 2019-08-29 22:28:44 +02:00
Johannes Wendel 919f75b238 added ItemVarHolder 2019-08-29 22:19:21 +02:00
Johannes Wendel f7fe4ffca2 cli cange 2019-08-28 19:24:06 +02:00
Johannes Wendel bf3c25ca9a cli cange 2019-08-28 19:21:08 +02:00
Johannes Wendel 03beeb8272 cli cange 2019-08-28 19:18:22 +02:00
Johannes Wendel 1cd3656f0b Try change 2019-08-28 18:31:59 +02:00
Jonas Zeunert 054a6588be asdf 2019-08-22 22:48:43 +02:00
Johannes Wendel 76c6d67ec6 adapted filesystem library 2019-08-22 22:23:12 +02:00
Johannes Wendel bed57175e6 adapted filesystem library 2019-08-22 22:13:28 +02:00
Johannes Wendel 3f0356dbfc adapted filesystem library 2019-08-22 22:10:06 +02:00
Johannes Wendel 629524aa15 adapted filesystem library 2019-08-22 22:05:49 +02:00
Johannes Wendel b4f9661e29 adapted filesystem library 2019-08-22 22:04:27 +02:00
Jonas Zeunert 8cf8fdf8b1 meeeeerge 2019-08-22 21:57:55 +02:00
Jonas Zeunert e6dd92620d changed to two sockets 2019-08-22 21:51:52 +02:00
Johannes Wendel 04d1f73b97 changed some stuff with directories 2019-08-22 21:50:27 +02:00
Johannes Wendel e7649daf2e added log 2019-08-22 21:23:31 +02:00
Jonas Zeunert c8bd4666fc merged 2019-08-22 21:16:46 +02:00
Jonas Zeunert 3bae22cc1e changed runtime dir 2019-08-22 21:15:08 +02:00
Johannes Wendel 0d7ca06c18 adsf 2019-08-15 23:20:22 +02:00
Johannes Wendel 06e90b226c adsf 2019-08-15 23:17:48 +02:00
Johannes Wendel 9165054665 asdf 2019-08-15 23:11:55 +02:00
Jonas Zeunert 33b31969aa Merge branch 'master' of https://github.com/swinginbird/flippr-code 2019-08-15 22:17:09 +02:00
Jonas Zeunert 7904cd85b1 typo 2019-08-15 22:16:44 +02:00
Johannes Wendel a837346794 changed runtime dir 2019-08-15 20:20:41 +02:00
Johannes Wendel 5ea137cdba changed runtime dir 2019-08-15 20:18:16 +02:00
Johannes Wendel db45459558 changed runtime dir 2019-08-15 20:09:44 +02:00
Johannes Wendel c0925603e8 changed runtime dir 2019-08-15 19:59:19 +02:00
Johannes Wendel f00bff28b5 changed string to number in config 2019-08-15 19:51:17 +02:00