Commit Graph

185 Commits

Author SHA1 Message Date
Astro 574978b937 new awesome sfx from 2bt 2011-10-15 14:56:32 +02:00
Astro 03561a8e7f buzz_iface submodule 2011-10-15 02:43:22 +02:00
Astro 4bf35a0dbd nedap server: gracefully handle missing backend 2011-10-14 21:15:45 +02:00
Astro 9774738066 reenable buzzers & leds 2011-10-14 20:49:22 +02:00
Astro 09f9b814b3 nedap websocket fixes 2011-10-14 20:49:22 +02:00
Astro 5e57cc4531 port to newer connect 2011-10-14 20:49:21 +02:00
Astro af2db77bb2 cosmetics 2011-10-14 20:49:21 +02:00
Astro ea97984985 nedap server: listen on :2342 by default 2011-10-14 20:49:21 +02:00
Astro 8f676f4284 nedap server: support latest connect 2011-10-14 20:49:21 +02:00
john stone 2acb8c1364 merged fix in submodul 2011-10-14 18:43:29 +02:00
Astro e48e6ca566 gamestate saving 2011-10-14 04:37:13 +02:00
Astro 4c53674c35 morse joker 2011-10-14 03:56:54 +02:00
Astro ccab3a3afe port to websocket library 2011-10-14 02:56:16 +02:00
Astro 48f6b35491 Revert "automatic question scaling"
This reverts commit b8b33ab63a.
2011-04-23 22:34:25 +02:00
Astro 6ce29d8f87 question data fixes 2011-04-23 21:49:50 +02:00
Astro 2afcbe411e Merge remote-tracking branch 'tuxcode/eh2011' into eh2011 2011-04-23 21:44:28 +02:00
cosmo b8b33ab63a automatic question scaling 2011-04-23 21:41:26 +02:00
klObs f23cd3c0aa Merge branch 'eh2011' of john:pentagameshow into eh2011
Conflicts:
	data.eh2011-1/100
	data.eh2011-1/33
2011-04-23 21:36:51 +02:00
Astro 57c283f8ae don't reconnect immediately after websocket error 2011-04-23 21:36:51 +02:00
Astro 9d513fe21b nedap server: catch missing parameters 2011-04-23 21:36:08 +02:00
klObs 4c6727fecc Runden Easterhegg 2011-04-23 21:27:29 +02:00
Astro 64f2960481 buzz.ogg 2011-04-23 21:25:08 +02:00
Astro fc96774ece html: nedap & irc on setup screen 2011-04-23 20:07:09 +02:00
Astro d78601b943 frontend: redraw() prior 1st voting update 2011-04-23 20:05:02 +02:00
Astro c34c082873 questions syntax fixes 2011-04-23 19:58:15 +02:00
Astro 700629343a nedap server: utf-8 encoding 2011-04-23 19:57:58 +02:00
Astro 1791a3f79e TODO: hotfixes 2011-04-23 19:57:34 +02:00
Astro c9a61bd398 Merge remote-tracking branch 'tuxcode/eh2011' into eh2011 2011-04-23 19:13:46 +02:00
klObs 4ebed1aec1 Separate questions 2011-04-23 19:09:52 +02:00
cosmo b6027b427a fancy.patch 2011-04-23 19:09:29 +02:00
Astro f31caba827 Merge remote-tracking branch 'tuxcode/eh2011' into eh2011 2011-04-23 19:03:10 +02:00
Astro 7a6dff6781 quiz.js: joker keys 2011-04-23 19:00:32 +02:00
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
Astro 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
Astro 976f4c3269 Merge branch 'eh2011' of tuxcode.org:pentagameshow into eh2011 2011-04-22 23:47:16 +02:00
Astro 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
Astro 9b796796c9 questions reordering 2011-04-22 23:31:22 +02:00
Astro e5cb972e88 backend server: nedap on localhost, irc on hackint 2011-04-22 23:16:34 +02:00
Astro 37f3ad0c78 fix buzzers 2011-04-22 23:14:56 +02:00
Astro ad22aa3722 nedap server: listen on [::]:80 2011-04-22 23:06:06 +02:00
Astro f6aa5090e5 pull buzz_iface 2011-04-22 23:05:32 +02:00
Astro 6bed1f5335 more data.eh2011-1/questions.json cleanup 2011-04-22 22:49:37 +02:00
Astro 32125b1d2d cleaned data.eh2011-1/questions.json + media 2011-04-22 22:40:32 +02:00
Astro 98a156741e merge questions for eh2011 2011-04-22 21:50:46 +02:00