Commit Graph

153 Commits

Author SHA1 Message Date
klObs
6189563478 Merge branch 'eh2011' of john:pentagameshow into eh2011 + Punkteverteilung + Punkteverteilung
Conflicts:
	data.eh2011-1/questions.json
2011-04-23 18:38:54 +02:00
klObs
bf2f8b5e9d Fragenbepunktung 2011-04-23 18:34:44 +02:00
256a28cf2a four more questions 2011-04-23 17:30:58 +02:00
klObs
406df4df61 Fragenpool erweitert 2011-04-23 02:49:27 +02:00
john stone
46fbbb3de4 merged 1 question 2011-04-22 23:50:45 +02:00
john stone
58ca96a83d added about pfirsich 2011-04-22 23:49:08 +02:00
976f4c3269 Merge branch 'eh2011' of tuxcode.org:pentagameshow into eh2011 2011-04-22 23:47:16 +02:00
34c5c73cd9 four moar questions 2011-04-22 23:46:18 +02:00
klObs
70d2df069e Merge branch 'eh2011' of john:pentagameshow into eh2011
Conflicts:
	fragenkatalog_klobs/fragenpool
2011-04-22 23:43:37 +02:00
klObs
e35f63f2c3 Schraubenfragen 2011-04-22 23:38:23 +02:00
9b796796c9 questions reordering 2011-04-22 23:31:22 +02:00
e5cb972e88 backend server: nedap on localhost, irc on hackint 2011-04-22 23:16:34 +02:00
37f3ad0c78 fix buzzers 2011-04-22 23:14:56 +02:00
ad22aa3722 nedap server: listen on [::]:80 2011-04-22 23:06:06 +02:00
f6aa5090e5 pull buzz_iface 2011-04-22 23:05:32 +02:00
6bed1f5335 more data.eh2011-1/questions.json cleanup 2011-04-22 22:49:37 +02:00
32125b1d2d cleaned data.eh2011-1/questions.json + media 2011-04-22 22:40:32 +02:00
98a156741e merge questions for eh2011 2011-04-22 21:50:46 +02:00
c7dafc704b premature untested buzzer integration 2011-04-22 21:30:20 +02:00
7957805b60 buzz_iface submodule 2011-04-22 20:30:45 +02:00
673846a2dc Merge remote-tracking branch 'tuxcode/eh2011' into eh2011 2011-04-22 18:56:27 +02:00
8630497688 nedap server: rate limiting 2011-04-22 17:40:39 +02:00
klObs
9aaee51cec Erweiterun der Fragen 2011-04-22 17:34:18 +02:00
bb48073a7c nedap server: complete token validation 2011-04-22 14:30:27 +02:00
010117311b nedap server: partial token validation 2011-04-22 00:27:30 +02:00
e99c30964f Merge remote-tracking branch 'tuxcode/eh2011' into eh2011 2011-04-21 23:03:02 +02:00
4212ba78fe questioins.json.eh2011 2011-04-21 23:02:32 +02:00
klObs
c198e0d28b Fragenkatalog fuer eh2011
TODO
 - Fragen bewerten und sortieren
 - Mehr Fragen, Fragen, Fragen.
2011-04-20 10:41:20 +02:00
7b4b4abd4e TODO für eh2011 2011-04-19 01:10:21 +02:00
cbf78e2fc2 Merge branch 'master' of 81.163.137.55:Desktop/ds-quiz/ 2010-12-27 19:34:23 +01:00
Frank Becker
a3894a16fa fixes fixes fixes 2010-12-27 19:34:00 +01:00
ff8224ef01 Merge branch 'master' of 81.163.137.55:Desktop/ds-quiz/ 2010-12-27 19:07:45 +01:00
Frank Becker
6fac284afa fixes fixes fixes 2010-12-27 19:07:26 +01:00
31a6c54f45 Merge branch 'master' of 81.163.137.55:Desktop/ds-quiz/ 2010-12-27 18:08:47 +01:00
376992f5cb css: bigger whiter tier display 2010-12-27 18:08:24 +01:00
Frank Becker
eb89e80ad1 fixed pdf presentation 2010-12-27 18:08:21 +01:00
Frank Becker
4ca9f85564 fixed presentation 2010-12-27 18:07:01 +01:00
Frank Becker
d96b05995e added presentation 2010-12-27 17:51:57 +01:00
Frank Becker
27ad073798 27c3 generalprobe 2010-12-27 17:25:39 +01:00
636bc38287 36_expl.webm reencoded for chromium compat 2010-12-27 16:37:29 +01:00
94b5787a8a Merge branch 'master' of 81.163.137.55:Desktop/ds-quiz/ 2010-12-27 16:01:39 +01:00
aba1b70bc9 TIMER_ANSWER = 90 2010-12-27 15:59:15 +01:00
cfc5ff2815 server: filter non-Unicode from irc messages 2010-12-27 15:57:30 +01:00
a18a95072b very long timeout melody + implementation 2010-12-27 15:57:13 +01:00
61673de7b9 css: question font a tad smaller 2010-12-27 15:56:24 +01:00
Frank Becker
b54f438607 fixed s/,/;/ 2010-12-27 11:07:21 +01:00
Frank Becker
dd0379eafd small modifications of questions, added Kindle output 2010-12-27 11:05:33 +01:00
02b59b20e0 quiz.js: allow ending of round with no active player 2010-12-27 10:40:03 +01:00
Frank Becker
f5c560e363 added ascii art movie 2010-12-27 00:32:42 +01:00
Frank Becker
314a7d17fb more data, questions clean up 2010-12-27 00:22:18 +01:00