Commit Graph

64 Commits

Author SHA1 Message Date
Frank Becker
25b58479b9 fixed paypal q_ pix 2011-12-27 21:23:51 +01:00
Frank Becker
d32c510123 Merge branch 'master' of tuxcode.org:pentagameshow 2011-12-27 21:13:41 +01:00
Frank Becker
cd2ef271c2 Sony gets only 1 point 2011-12-27 21:13:33 +01:00
john stone
cb042680d0 resizung again 2011-12-27 18:55:20 +01:00
john stone
ac838ce342 Merge branch 'master' of tuxcode.org:pentagameshow 2011-12-27 18:52:23 +01:00
Frank Becker
08f9ae8754 added missing media files 2011-12-27 18:51:52 +01:00
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
79f9c3ee98 resized image, roundswitch 2011-12-27 18:49:54 +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
ffe1208c3a updated points ranges 2011-12-27 17:45:45 +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
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
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
e8cc69ca12 moved sony question to round 4 2011-12-18 13:58:15 +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
Frank Becker
5f492f9716 evolution question update, added fields source and comment 2011-12-16 14:49:18 +01:00
Frank Becker
c116803ba0 Merge branch 'master' into 28c3a8 2011-12-16 14:44:55 +01:00
klObs
a005fd7f89 Merge branch 'master' of john:pentagameshow 2011-12-14 00:20:30 +01:00
klObs
7c4375bf0b Notes after testing round 2011-12-14 00:19:36 +01:00
Frank Becker
8e0c6a8760 round data updated 2011-12-13 23:13:13 +01:00
Frank Becker
eba5a9625b Siri 2011-12-13 22:08:38 +01:00
Frank Becker
cd6c035292 round_1 was missing 2011-12-13 21:43:32 +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