Commit Graph

938 Commits

Author SHA1 Message Date
Neale Pickett bb923abc6b more p2 scoreboard work 2012-06-06 17:51:37 -06:00
Neale Pickett d078929c55 work on p2 scoreboard 2012-06-06 14:55:09 -06:00
Neale Pickett e3cf808e79 work on p2 scoreboard 2012-06-06 14:55:09 -06:00
Neale Pickett c6d0fe4f30 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-06-06 11:36:20 -06:00
Neale Pickett 0163c4e636 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-06-06 11:36:20 -06:00
Neale Pickett 80e7d56a37 ignore printf build warnings 2012-06-06 00:03:40 -06:00
Neale Pickett d4568c4143 ignore printf build warnings 2012-06-06 00:03:40 -06:00
Neale Pickett 1f799fa927 merge backup into pointsd 2012-06-05 23:56:29 -06:00
Neale Pickett b43c76c839 merge backup into pointsd 2012-06-05 23:56:29 -06:00
Neale Pickett 52d59b14a8 avoid duplicates in points.log 2012-06-05 16:55:58 -06:00
Neale Pickett bbb17c787e avoid duplicates in points.log 2012-06-05 16:55:58 -06:00
Neale Pickett 04111f6152 Merge remote-tracking branch 'fozzie/master' 2012-06-01 10:58:32 -06:00
Neale Pickett 0225cc740c Merge remote-tracking branch 'fozzie/master' 2012-06-01 10:58:32 -06:00
Neale Pickett 7d7d2afc2d Add TEA encryption tool 2012-05-31 23:09:01 -06:00
Neale Pickett 2b791f63d1 Add TEA encryption tool 2012-05-31 23:09:01 -06:00
Neale Pickett 8b851938db Tanks using new architectuer 2012-05-31 13:57:34 -06:00
Neale Pickett 29099b6496 Tanks using new architectuer 2012-05-31 13:57:34 -06:00
Neale Pickett 747d560a31 Bring arc4 back in 2012-05-31 13:52:23 -06:00
Neale Pickett ba507c4925 Bring arc4 back in 2012-05-31 13:52:23 -06:00
Aaron McPhall 3075e0a055 State of competition can now happen in the cloud 2012-05-31 00:29:36 -04:00
Aaron McPhall 1a032f7d62 State of competition can now happen in the cloud 2012-05-31 00:29:36 -04:00
Aaron J. McPhall 199a9d6ac1 Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 18:28:38 -06:00
Aaron J. McPhall 2e4a53853c Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 18:28:38 -06:00
Neale Pickett 2af405c40b Have claim.cgi look in $STATE/tokens.db again 2012-05-30 18:10:04 -06:00
Neale Pickett 664bbd0644 Have claim.cgi look in $STATE/tokens.db again 2012-05-30 18:10:04 -06:00
Aaron J. McPhall 374db515b5 Fixed the build 2012-05-30 18:09:51 -06:00
Aaron J. McPhall e09428cf16 Fixed the build 2012-05-30 18:09:51 -06:00
Neale Pickett c352563d40 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-30 18:04:32 -06:00
Neale Pickett 2db590e8e4 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-30 18:04:32 -06:00
Neale Pickett d95aecd25d move mcp to new points architecture 2012-05-30 18:04:24 -06:00
Neale Pickett a2279e94ab move mcp to new points architecture 2012-05-30 18:04:24 -06:00
Aaron J. McPhall 672482b2c8 updates to parsing on puzzles.cgi 2012-05-30 13:51:40 -06:00
Aaron J. McPhall c4affbbd5f updates to parsing on puzzles.cgi 2012-05-30 13:51:40 -06:00
Aaron J. McPhall 64f0be973e Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 12:21:11 -06:00
Aaron J. McPhall 06a8e6da8d Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 12:21:11 -06:00
Aaron J. McPhall f9db9d1cf9 puzzles.cgi now inspects map files 2012-05-30 12:19:07 -06:00
Aaron J. McPhall 780fc4f437 puzzles.cgi now inspects map files 2012-05-30 12:19:07 -06:00
Neale Pickett 34d4dae4a4 Lower probability of line noise 2012-05-30 11:17:35 -06:00
Neale Pickett 4a3df9a3a2 Lower probability of line noise 2012-05-30 11:17:35 -06:00
Neale Pickett 760e60c311 Console work + modem.c 2012-05-29 22:45:20 -06:00
Neale Pickett 24df97d2f7 Console work + modem.c 2012-05-29 22:45:20 -06:00
Neale Pickett 92c69c2226 debugged p2 console 2012-05-25 22:38:46 -06:00
Neale Pickett 63887f7c53 debugged p2 console 2012-05-25 22:38:46 -06:00
Neale Pickett 58fd89db50 Remove more legacy junk 2012-05-25 21:39:59 -06:00
Neale Pickett d39b643ba4 Remove more legacy junk 2012-05-25 21:39:59 -06:00
Neale Pickett 23ff62ce16 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-25 12:27:05 -06:00
Neale Pickett 91f765f598 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-25 12:27:05 -06:00
Neale Pickett 52e33de102 begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett 376c1aaf7b begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett 87afa1b75e Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00