|
|
8bb91ec949
|
Merge branch 'master' of astrom.hq.c3d2.de:ds-quiz
Conflicts:
data.27c3/suggestions.txt
|
2010-12-21 23:40:44 +01:00 |
|
Frank Becker
|
f903b5daeb
|
apple block suggestion
|
2010-12-21 23:37:56 +01:00 |
|
|
|
6136626002
|
quiz.js: PLAYER_KEYS & ANSWER_KEYS as constants
|
2010-12-21 23:37:46 +01:00 |
|
|
|
3dd42ff18f
|
more 27c3 suggestions
|
2010-12-21 23:37:32 +01:00 |
|
Frank Becker
|
4267e9478d
|
suggestions for further questions
|
2010-12-21 23:34:08 +01:00 |
|
Frank Becker
|
3d0e869eb9
|
Test for video
|
2010-12-21 23:18:48 +01:00 |
|
Frank Becker
|
0893c885c2
|
removed quoting of true
|
2010-12-21 22:54:17 +01:00 |
|
Frank Becker
|
fc7882efbe
|
questions updated
|
2010-12-21 22:51:49 +01:00 |
|
Frank Becker
|
eedf9b2f0f
|
Merge branch 'master' of astrom.hq.c3d2.de:ds-quiz
|
2010-12-21 22:51:19 +01:00 |
|
Frank Becker
|
7b80ab5e22
|
questions updated
|
2010-12-21 22:51:06 +01:00 |
|
|
|
89bffe5eb6
|
don't display audience & phone jokers
|
2010-12-21 22:48:11 +01:00 |
|
|
|
a66f901d9a
|
cache avoiding hacks
|
2010-12-21 22:47:57 +01:00 |
|
Frank Becker
|
5cee783d35
|
Merge branch 'master' of astrom.hq.c3d2.de:ds-quiz
|
2010-12-21 22:40:13 +01:00 |
|
Frank Becker
|
940a0bef30
|
changed points
|
2010-12-21 22:40:05 +01:00 |
|
|
|
530a0f0480
|
link pix to data.27c3/pix
|
2010-12-21 22:21:24 +01:00 |
|
Frank Becker
|
895b7f0f62
|
added folders for 27c3 rounds
|
2010-12-21 22:18:56 +01:00 |
|
Frank Becker
|
11cc22a0dd
|
added pictures for round 1
|
2010-12-21 22:17:27 +01:00 |
|
Frank Becker
|
0310ad9924
|
also look for pix/id.{jpg, png} and video/id.webm
|
2010-12-21 13:32:54 +01:00 |
|
Frank Becker
|
6695717385
|
wrote something that will become docu one day
|
2010-12-21 00:51:00 +01:00 |
|
Frank Becker
|
94f34828e4
|
Propaganda files by dodo
|
2010-12-21 00:45:34 +01:00 |
|
Frank Becker
|
bbadfa6377
|
kinda broken dump of Pentasubmitter data in csv
|
2010-12-21 00:43:02 +01:00 |
|
Frank Becker
|
6161ef3c6c
|
Questions for the 27c3 show
|
2010-12-21 00:41:23 +01:00 |
|
Frank Becker
|
a0b8104931
|
Converter for the csv source file to generate json
|
2010-12-21 00:39:54 +01:00 |
|
Frank Becker
|
001186ff6a
|
no clue what changed on the video file
|
2010-12-21 00:38:56 +01:00 |
|
Frank Becker
|
d27246a160
|
Merge branch 'master' of astrom.hq.c3d2.de:ds-quiz
|
2010-12-21 00:34:37 +01:00 |
|
|
|
0821509986
|
sounds
|
2010-12-20 05:29:35 +01:00 |
|
|
|
d1aae20532
|
server: nedap location ws://nedap.c3d2.de/
|
2010-12-20 04:45:07 +01:00 |
|
|
|
5f012809b8
|
working attempt at nedap graph outline
|
2010-12-20 04:44:44 +01:00 |
|
|
|
a47a72e89a
|
fwd joker
|
2010-12-20 04:34:26 +01:00 |
|
Frank Becker
|
07b183d5b1
|
Merge branch 'master' of astrom.hq.c3d2.de:ds-quiz
|
2010-12-19 14:53:31 +01:00 |
|
|
|
9560644d9a
|
fwd joker artwork
|
2010-12-11 18:21:58 +01:00 |
|
|
|
d98d8b2389
|
TODO update
|
2010-12-11 18:21:48 +01:00 |
|
|
|
aabf95a03a
|
irc joker
|
2010-12-10 22:04:17 +01:00 |
|
|
|
b0da213886
|
nedap style
|
2010-12-10 18:53:59 +01:00 |
|
|
|
4d84c7c24f
|
nedap joker icons
|
2010-12-10 18:50:33 +01:00 |
|
|
|
9b59a5e88e
|
nedap poll feedback in frontend
|
2010-12-10 18:34:02 +01:00 |
|
|
|
12aef47d43
|
nedap usability
|
2010-12-10 17:26:23 +01:00 |
|
|
|
942dd0dfd9
|
fix client-side message handling
|
2010-12-06 19:21:29 +01:00 |
|
|
|
95fbd1e7d2
|
reconnecting websockets
|
2010-12-06 19:19:52 +01:00 |
|
|
|
fb00a2f575
|
bump timer durations back up
|
2010-12-06 19:11:12 +01:00 |
|
|
|
0c64b536c8
|
nedap websockets work
|
2010-12-06 19:10:44 +01:00 |
|
|
|
74b34dcf05
|
untested rewrite from spacesocket to websocket-server
|
2010-12-06 18:01:48 +01:00 |
|
|
|
bdc6ec06e3
|
more progress w/ broken spacesocket :-(
|
2010-12-04 23:08:05 +01:00 |
|
|
|
94021daf77
|
more untested server stuff
|
2010-12-04 22:04:58 +01:00 |
|
|
|
d12a1a27da
|
untested nedap/server
|
2010-12-04 20:20:25 +01:00 |
|
|
|
b2b0a2d612
|
fiftyfifty.png w/ Loeschkandidat bucket
|
2010-11-30 22:17:23 +01:00 |
|
|
|
f702b78ea8
|
html h1: Pentanews Game Show
|
2010-11-30 22:17:15 +01:00 |
|
|
|
85bb6cb638
|
TODO update
|
2010-11-30 21:59:05 +01:00 |
|
|
|
0b47409f51
|
implement question explanation
|
2010-11-30 21:58:51 +01:00 |
|
|
|
888b1f3c08
|
punish all on timeout w/o buzzer press
|
2010-11-30 21:07:15 +01:00 |
|
