john stone
|
cfba846a53
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 23:15:13 +01:00 |
|
Frank Becker
|
8eaa892b88
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 23:13:39 +01:00 |
|
Frank Becker
|
8e0c6a8760
|
round data updated
|
2011-12-13 23:13:13 +01:00 |
|
Frank Becker
|
f844c42f35
|
add data as webroot to static files
|
2011-12-13 23:13:00 +01:00 |
|
|
d856eb861c
|
fix ingame joker display
|
2011-12-13 23:05:26 +01:00 |
|
john stone
|
d146ee031b
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 22:17:30 +01:00 |
|
|
04f49f9cf3
|
index: joker pics
|
2011-12-13 22:17:13 +01:00 |
|
Frank Becker
|
eba5a9625b
|
Siri
|
2011-12-13 22:08:38 +01:00 |
|
john stone
|
5a632a2c36
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 21:45:47 +01:00 |
|
Frank Becker
|
cd6c035292
|
round_1 was missing
|
2011-12-13 21:43:32 +01:00 |
|
john stone
|
8ec8ac86f7
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 21:37:56 +01:00 |
|
Frank Becker
|
dd45608030
|
merged questions.yaml generated json
|
2011-12-13 21:30:26 +01:00 |
|
Frank Becker
|
300d84b218
|
fixed merge conflict, Facebook question got lost
|
2011-12-13 21:21:46 +01:00 |
|
Frank Becker
|
00b97c459b
|
generated rounds
|
2011-12-13 21:15:41 +01:00 |
|
Frank Becker
|
204732fc55
|
question update
|
2011-12-13 21:14:41 +01:00 |
|
john stone
|
1612040e8c
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 20:59:57 +01:00 |
|
|
6057c54e4b
|
gif joker picture
|
2011-12-13 20:58:09 +01:00 |
|
|
9d4b42d2c2
|
censor interface: max image size
|
2011-12-13 19:38:45 +01:00 |
|
|
0604db4344
|
nedap server: token validation for gif uploads too
|
2011-12-13 19:28:42 +01:00 |
|
|
c6ee661bf9
|
gif joker censor interface
|
2011-12-13 19:25:38 +01:00 |
|
john stone
|
aa9a56e623
|
changed to /dev/pentabuzzer
i wasnt able to automatically allow user access
|
2011-12-13 18:35:17 +01:00 |
|
|
d1f86d6648
|
gif joker displaying in frontend
|
2011-12-13 16:50:22 +01:00 |
|
|
0ae711b59c
|
gif upload working in nedap backend
|
2011-12-13 16:07:09 +01:00 |
|
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 |
|