Commit Graph

2078 Commits

Author SHA1 Message Date
Neale Pickett 811141e4d9 Merge cfl:/var/projects/gctf
Conflicts:
	pollster/pollster.py
2009-10-08 16:44:42 -06:00
Neale Pickett ec202f23f5 Mostly cosmetics 2009-10-08 16:42:26 -06:00
Curt Hash fbf09276c0 changed it so that the response from the polls is not turned
into a string until it returns to the poller loop. This allows
poll functions to manipulate the raw responses from the socket
reads. Also added an ACK to tftdp poller so that the tftpd
daemon stops whining about the socket closing without an ACK.
2009-10-08 16:40:14 -06:00
Curt Hash 6fb8d935ec summary of puzzles 1-4 2009-10-08 15:54:42 -06:00
Curt Hash 1ca3e319e1 fixed symlinks 2009-10-08 15:52:01 -06:00
Paul S. Ferrell 98f50c3633 Setup mkpuzzles to ignore summary.txt puzzle files. 2009-10-08 15:12:27 -06:00
Paul S. Ferrell f6a28a3a95 Merge branch 'master' of ssh://cfl.lanl.gov/var/projects/gctf 2009-10-08 15:05:22 -06:00
Paul S. Ferrell f04e554100 Added summary files for each puzzle category. 2009-10-08 15:05:07 -06:00
Neale Pickett d9d7ddfe53 Merge cfl:/var/projects/gctf 2009-10-08 14:58:46 -06:00
Curt Hash 5b8c83bf68 proper way to reference an element 2009-10-08 14:33:43 -06:00
Curt Hash 62d42934a0 Merge branch 'master' of cfl:/var/projects/gctf 2009-10-08 14:32:48 -06:00
Curt Hash d14e07c0db javascript to read the team name and passwd from cookie 2009-10-08 14:32:33 -06:00
Danny Quist 5e67a2c847 Reordered puzzles, added the new Sandia challenges. 2009-10-08 14:15:45 -06:00
Neale Pickett 53d4ec0e76 Fix webapp links 2009-10-08 13:01:51 -06:00
Paul S. Ferrell c272858051 Merge branch 'master' of ssh://cfl.lanl.gov/var/projects/gctf 2009-10-08 12:33:43 -06:00
Paul S. Ferrell 7108932856 Fixed mainly formatting issues. Upped the max bitrate to 4000k/s for the videos. 2009-10-08 12:33:01 -06:00
Paul S. Ferrell 116c553e88 Fixed encode quality, # of turns, and results.cgi error. 2009-10-08 11:32:24 -06:00
Curt Hash e328814054 Merge branch 'master' of cfl:/var/projects/gctf 2009-10-08 11:30:20 -06:00
Curt Hash e1a3063ebe changed point scores at abrugh's request 2009-10-08 11:30:05 -06:00
Alexander Brugh b0815fdb9f Merge branch 'master' of cfl.lanl.gov:/var/projects/gctf 2009-10-08 11:28:12 -06:00
Alexander Brugh 2231337f07 repoint valued some of these as per neale, added a gray code puzzle at 400 2009-10-08 11:27:33 -06:00
Paul S. Ferrell a4ebc71b58 This was neale's fault. 2009-10-08 11:19:46 -06:00
Paul S. Ferrell 8235179129 More bug fixes. 2009-10-08 11:18:40 -06:00
Paul S. Ferrell 147e3835e5 Merge branch 'master' of ssh://cfl.lanl.gov/var/projects/gctf 2009-10-08 11:15:33 -06:00
Paul S. Ferrell 4f44d0bbb6 I hate neale. 2009-10-08 11:15:06 -06:00
Curt Hash 91ee387600 Merge branch 'master' of cfl:/var/projects/gctf 2009-10-08 11:12:13 -06:00
Curt Hash 7c07f13117 config and points submission stuff added to polster 2009-10-08 11:11:41 -06:00
Neale Pickett a1faaed722 Make run_tanks use asyncore 2009-10-08 11:03:50 -06:00
Neale Pickett 1ba4f341f6 Fix exception in flagd.py:FlagServer.handle_close 2009-10-08 10:31:28 -06:00
Paul S. Ferrell dd281b5706 Changed results page to have the correct stylesheet. 2009-10-08 09:16:29 -06:00
Paul S. Ferrell 30e18ea544 Fixed type error, made results rows keyed by color. 2009-10-08 09:12:41 -06:00
Paul S. Ferrell 8e8bad1e3c Merge branch 'master' of ssh://cfl.lanl.gov/var/projects/gctf 2009-10-08 09:04:28 -06:00
Paul S. Ferrell adca40f63e Various changes to tanks run scripts. 2009-10-08 09:04:07 -06:00
Curt Hash 04893b33bd css additions for pollster page, more robust pollster 2009-10-08 08:49:50 -06:00
Neale Pickett 06fd1a2c87 Potential new pwnables image 2009-10-07 22:57:32 -06:00
Neale Pickett 62006499e3 Twiddled run_tanks.py (don't hurt me, Paul) 2009-10-07 21:22:16 -06:00
Curt Hash 42153af67f Merge branch 'master' of cfl:/var/projects/gctf 2009-10-07 19:04:12 -06:00
Curt Hash 402cd03be5 updates per neale's suggestions (more to come) 2009-10-07 19:02:57 -06:00
Danny Quist 6f989bc018 Added new puzzles 2009-10-07 18:30:36 -06:00
Neale Pickett f666930688 Add heartbeatd 2009-10-07 17:32:36 -06:00
Curt Hash b5c517e2c0 pollster thing 2009-10-07 16:54:47 -06:00
Neale Pickett 31e2d517c3 Make survey record answers 2009-10-07 15:45:02 -06:00
Neale Pickett 742d1a0c35 Display what points your team has already made 2009-10-07 15:16:15 -06:00
Paul S. Ferrell ca86e03fd3 More tanks fixes. 2009-10-07 13:58:23 -06:00
Paul S. Ferrell 597323eb36 Tanks fixes. 2009-10-07 13:53:51 -06:00
Neale Pickett c2c763d2b3 Merge cfl:/var/projects/gctf 2009-10-07 13:29:13 -06:00
Neale Pickett ef78f6da9b Make ctfd reap zombies 2009-10-07 13:29:00 -06:00
Paul S. Ferrell 3343f62208 Added 'fake' to .gitignore.
Removed ctf.teams dependency from Pflanzarr
2009-10-07 13:18:30 -06:00
Neale Pickett a6a4657a2e Add 50 point compaq puzzle 2009-10-07 13:00:59 -06:00
Neale Pickett db646f244e Merge cfl:/var/projects/gctf 2009-10-07 12:54:03 -06:00