Commit Graph

329 Commits

Author SHA1 Message Date
Frank Becker
b53af4970b Merge branch 'master' of tuxcode.org:pentagameshow 2011-12-27 18:51:02 +01:00
Frank Becker
a899c77b93 fixed explanation media 2011-12-27 18:50:52 +01:00
john stone
4a6b63ea07 resized pic 2011-12-27 18:38:19 +01:00
Frank Becker
47d81e98dd scaled pix 2011-12-27 18:22:29 +01:00
Frank Becker
7e556b3036 fixed missing tier 2011-12-27 18:05:39 +01:00
Frank Becker
8ca59a59b1 Merge branch 'master' of tuxcode.org:pentagameshow 2011-12-27 17:45:54 +01:00
Frank Becker
ffe1208c3a updated points ranges 2011-12-27 17:45:45 +01:00
8fc9425be3 tweet source & winners 2011-12-27 17:41:27 +01:00
Frank Becker
4b2f1621dc added round_5.json 2011-12-27 17:36:03 +01:00
Frank Becker
cb0c2472ce updated fefe answer pix 2011-12-27 17:30:19 +01:00
Frank Becker
a9ae54bb28 Merge branch 'master' of tuxcode.org:pentagameshow 2011-12-27 17:29:45 +01:00
Frank Becker
4e0717d80e finalised questions, added bonus round 5 2011-12-27 17:29:36 +01:00
klObs
3a89d8f118 Merge branch 'master' of john:pentagameshow 2011-12-27 17:17:47 +01:00
klObs
95c5f03b42 exchange fefe resource 2011-12-27 17:17:34 +01:00
0b997e1e77 buzz_iface submodule 2011-12-27 15:52:38 +01:00
9de16fff22 backend server.js: more graceful chat reconnect 2011-12-27 15:52:38 +01:00
Frank Becker
c18589a854 added option to generate speaker pdf 2011-12-27 15:09:00 +01:00
Frank Becker
a183c63ecc Fixed yaml violations 2011-12-27 10:27:23 +01:00
Frank Becker
63c5f3d4c6 Added comments for round 2 and 4 2011-12-27 10:25:33 +01:00
Frank Becker
c57cdd5b3c Questions improvement, klobs pls review
- Tried to improve the wording
    - Tried to shorten stuff
    - Tried to make questions more explicit
2011-12-27 10:04:09 +01:00
Frank Becker
49535c9d93 round 2 and 4 have all media now, updated round_X.json files 2011-12-26 21:37:51 +01:00
8c039ddfea credits.html: fixes 2011-12-26 20:10:27 +01:00
4354e9e4a6 credits.html: fixes 2011-12-26 20:08:51 +01:00
7c5efde601 credits: BattletoadsDoubleDragon.ogg 2011-12-26 20:08:41 +01:00
5f18d586a9 credits.html 2011-12-26 20:00:46 +01:00
74b2dd8c91 backend server: listen on ::1 for security 2011-12-26 19:01:50 +01:00
b63c9cc059 nedap websocket rekeying
b/c the old key is now on github
2011-12-26 19:01:50 +01:00
Frank Becker
eb426c0188 little fixes, more pix 2011-12-26 00:58:58 +01:00
klObs
8825112431 Remove 1 todo from questions 2011-12-25 01:09:30 +01:00
klObs
c8dddb0329 fixing typos 2011-12-25 01:04:59 +01:00
klObs
4aba29e518 Provide pix for round 3 2011-12-25 00:01:52 +01:00
klObs
a41568fe64 Provide some gfx for round 3 2011-12-24 23:08:00 +01:00
Frank Becker
3df6af4c20 Source to all questions, more pix, one more video
- At least all questions have a source link
    - rm password question
    - added 40K intelligence violations since 9/11 question
    - round files updated
2011-12-23 23:56:33 +01:00
Frank Becker
f348f9c1bd j. applebaum question update 2011-12-23 14:01:25 +01:00
Frank Becker
478aa6b86b re-added freshly generated round files 2011-12-23 13:51:29 +01:00
Frank Becker
7c4436ba3d merge conflict 2011-12-23 13:50:32 +01:00
Frank Becker
64d6976aaf pix 4 handygate question 2011-12-23 13:49:17 +01:00
Frank Becker
10ae71680a updated round json files 2011-12-23 00:54:29 +01:00
Frank Becker
02c637b7ca added few pix 2011-12-23 00:50:28 +01:00
Frank Becker
97671f43f4 Points for question can be generated randomly now.
- The points each question is worth are generated now.
      To switch back to the old fixed scheme change get_random_points to False
      in the Question() class. That will become a cmd line option in the future.
      I only got until 2:30 pm. :)
    - The range is set in the Question class for now. Each game round will
      get it's own config in the questions.yaml in the future.
2011-12-18 14:24:32 +01:00
Frank Becker
b143c4dbc1 Added source field to generated json input
- the key 'source' has as the value the url to the source of the question
    - If not source is specified it is set to 'false'
2011-12-18 13:58:32 +01:00
Frank Becker
e8cc69ca12 moved sony question to round 4 2011-12-18 13:58:15 +01:00
Frank Becker
f822d9ab54 Merge branch 'master' into 28c3a8 2011-12-18 13:52:41 +01:00
john stone
f9a4b55803 added crazy roundswitching script
only run, if you know what yr doin
2011-12-17 17:45:42 +01:00
Frank Becker
5e14c29bee pix for WP pornstar question 2011-12-17 14:17:57 +01:00
Frank Becker
e83b62ae03 add key source to json 2011-12-17 14:14:28 +01:00
john stone
51a09e3594 serial buzzer interface bug fixin attempt nr 2342 2011-12-17 02:39:47 +01:00
john stone
8761883bd3 bigger font for censor interface
to speed up censorship
2011-12-17 02:35:38 +01:00
john stone
da13020ef7 fixed bug in 5050 joker
enless loop, if more than 2 answers were  correct
2011-12-16 20:49:42 +01:00
john stone
90272948c5 Merge branch 'master' of tuxcode.org:pentagameshow 2011-12-16 19:29:27 +01:00