Commit Graph

342 Commits

Author SHA1 Message Date
Frank Becker
a642a1d762 added generated json files to repo - So astro doesn't have to generate 'em himself. 2011-12-13 11:27:58 +01:00
Frank Becker
7fee81e632 fixed everything to make the converter happy 2011-12-13 11:27:07 +01:00
Frank Becker
ef2b614d51 added few more ideas 2011-12-13 09:56:40 +01:00
john stone
dfce5b2515 Merge branch 'master' of tuxcode.org:pentagameshow 2011-12-13 04:00:00 +01:00
john stone
0a637b76ad changed devicefile to by-id version
this is portable between diffrent linux computers and more relable
than using stuff like /ttyUSB5.
2011-12-13 03:56:42 +01:00
Frank Becker
4a9f8a7559 added some media files 2011-12-13 00:04:02 +01:00
klObs
80376a05c3 Merge branch '28c3-klobs' 2011-12-12 23:58:54 +01:00
klObs
bf36075795 28c3, 20 fragen mit quellen und bildern 2011-12-12 23:58:19 +01:00
Frank Becker
f822ace61a 3 rounds of questions 2011-12-12 23:57:14 +01:00
klObs
a1c5a9dc6a Add sources 2011-12-12 23:07:29 +01:00
Frank Becker
f95914a6af copied ds2011 questions, wrong format though 2011-12-12 20:58:47 +01:00
ad18dc7125 begin gif joker in nedap backend 2011-12-12 18:49:54 +01:00
klObs
ca38a9323b 20 Fragen klObs für den 28c3, noch keine Grafiken. 2011-12-12 17:18:55 +01:00
9a3ef94217 package.json w/ server dependencies 2011-12-11 03:22:57 +01:00
Frank Becker
e844d90763 csv dump of pentasubmitter data 2011-11-30 22:49:42 +01:00
8b7a8a1bbe display jokers in question screen 2011-11-28 03:11:04 +01:00
df4e1f4ab2 index.html: rm player3 & player4 2011-11-28 03:10:37 +01:00
19c5db0c5b reveal tier scores only up to next question 2011-11-28 02:44:34 +01:00
a3ea4da327 censorIrcMessage() 2011-11-28 01:58:24 +01:00
48857c0e44 Merge remote-tracking branch 'tuxcode/master' into ds2011 2011-11-23 02:03:45 +01:00
c4ca725923 latest ds2011 fixes 2011-11-23 02:03:28 +01:00
Frank Becker
70e6744c53 added 1st generated json file for astro-validation 2011-11-21 13:00:13 +01:00
Frank Becker
5866e751fb JSON input files are written now 2011-11-21 12:45:42 +01:00
Frank Becker
8f045dca21 media files will be added now 2011-11-21 10:33:13 +01:00
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