Commit Graph

268 Commits

Author SHA1 Message Date
Frank Becker
600a60b5d7 Updated 28c3 questions to new media mark-up 2011-11-20 18:47:02 +01:00
Frank Becker
26fced4788 Changed media data structure in YAML file
- Looking at last years json required to change how to put the
      media files in the YAML file
2011-11-20 18:42:12 +01:00
Frank Becker
e7a885048d Generate one json file per game round
- Now one json file is generated per game round and printed to stdout (for now,
      will be files later on)
2011-11-19 19:58:50 +01:00
Frank Becker
bb865905bf print registered questions if debug 2011-11-19 00:01:04 +01:00
Frank Becker
6f9b4678e4 added incomplete question2json.py helper tool
- Since CVS is not much liked here is a YAML to JSON converter
    - have a look at 2011-28c2/questions.yaml
    - so far it generates JSON
    - only tested with Python 2.7 (should work in 2.6 but you will need to install json)
    - Warning: Currently, media files are ignored. It's not implemented yet.
    - more to come...
2011-11-18 23:42:05 +01:00
32f666a38c re-connectChat on error 2011-10-15 20:23:56 +02:00
6fad833a52 playername input fixes 2011-10-15 20:23:32 +02:00
162bcf9300 quiz: playername entry buzzer led 2011-10-15 20:19:51 +02:00
01b6ed86ab larger clippy pic 2011-10-15 20:12:10 +02:00
033dbd127a update buzz_iface submodule 2011-10-15 20:08:34 +02:00
4d8872a4f4 update buzz_iface submodule 2011-10-15 20:08:34 +02:00
be34fffc89 1 addon question from a8 2011-10-15 20:08:13 +02:00
de339ba386 led tuning 2011-10-15 20:07:30 +02:00
Frank Becker
636bbb5db0 2 new addon questions for @astro 2011-10-15 19:46:56 +02:00
klObs
bd3a4bfea9 Merge branch 'ds2011' of john:pentagameshow into ds2011 2011-10-15 19:30:51 +02:00
klObs
e496c6654d Pentanews quiz show ds2011 runde 4 2011-10-15 19:30:30 +02:00
ade6d8a7f0 data.ds2011-[12] media 2011-10-15 19:25:58 +02:00
klObs
d04aa3a882 Fix json 2011-10-15 19:02:30 +02:00
klObs
3feff7ea07 Datenspuren 2011 Fragenkatalog 3 2011-10-15 18:50:29 +02:00
john stone
e272b6c929 merged stuff 2011-10-15 17:49:46 +02:00
7c9709096b data.ds2011-[1234]/questions.json 2011-10-15 17:30:41 +02:00
Frank Becker
ae4565f9f7 now all 4 round files are generated 2011-10-15 16:59:09 +02:00
08d06adcd4 leak joker 2011-10-15 16:56:00 +02:00
Frank Becker
69cf3d698d the wasn't me version, but it generated round_X.json files. Maybe they work... 2011-10-15 16:53:47 +02:00
Frank Becker
5d99019f4b recount to 42, now it's 42 questions 2011-10-15 16:23:07 +02:00
Frank Becker
f7a6f2f5b7 42 Questions 2011-10-15 16:18:24 +02:00
8bd2327f11 update buzz_iface submodule 2011-10-15 15:06:42 +02:00
b543d49f2a activatePlayer: turn led off after 500ms
too bright they are
2011-10-15 14:56:46 +02:00
574978b937 new awesome sfx from 2bt 2011-10-15 14:56:32 +02:00
Frank Becker
26ef0f25d4 copied kl0bs questions 2011-10-15 09:47:18 +02:00
03561a8e7f buzz_iface submodule 2011-10-15 02:43:22 +02:00
4bf35a0dbd nedap server: gracefully handle missing backend 2011-10-14 21:15:45 +02:00
9774738066 reenable buzzers & leds 2011-10-14 20:49:22 +02:00
09f9b814b3 nedap websocket fixes 2011-10-14 20:49:22 +02:00
5e57cc4531 port to newer connect 2011-10-14 20:49:21 +02:00
af2db77bb2 cosmetics 2011-10-14 20:49:21 +02:00
ea97984985 nedap server: listen on :2342 by default 2011-10-14 20:49:21 +02:00
8f676f4284 nedap server: support latest connect 2011-10-14 20:49:21 +02:00
john stone
2acb8c1364 merged fix in submodul 2011-10-14 18:43:29 +02:00
e48e6ca566 gamestate saving 2011-10-14 04:37:13 +02:00
4c53674c35 morse joker 2011-10-14 03:56:54 +02:00
ccab3a3afe port to websocket library 2011-10-14 02:56:16 +02:00
Frank Becker
179280623f 1st selection of questions - still much work to do 2011-10-13 23:35:52 +02:00
Frank Becker
f78c98f4c8 added newsdump 2011-10-12 15:25:52 +02:00
48f6b35491 Revert "automatic question scaling"
This reverts commit b8b33ab63a.
2011-04-23 22:34:25 +02:00
6ce29d8f87 question data fixes 2011-04-23 21:49:50 +02:00
2afcbe411e Merge remote-tracking branch 'tuxcode/eh2011' into eh2011 2011-04-23 21:44:28 +02:00
cosmo
b8b33ab63a automatic question scaling 2011-04-23 21:41:26 +02:00
klObs
f23cd3c0aa Merge branch 'eh2011' of john:pentagameshow into eh2011
Conflicts:
	data.eh2011-1/100
	data.eh2011-1/33
2011-04-23 21:36:51 +02:00
57c283f8ae don't reconnect immediately after websocket error 2011-04-23 21:36:51 +02:00