Commit Graph

211 Commits

Author SHA1 Message Date
Andy Janata 98ea63d26b update db dump with second expansion 2012-09-09 22:09:27 -07:00
Andy Janata 86703070ec show brief welcome banner on nickbox screen 2012-09-09 22:08:24 -07:00
Andy Janata 554510ea3a fix addcard 2012-09-09 22:08:06 -07:00
Andy Janata 38224cf81a Chat flood protection. Limits users to 5 messages per 15 seconds currently. 2012-08-28 23:00:47 -07:00
Andy Janata 7fccd69b15 Kicks and bans.
Admin chat in blue.
Chat commands (/names, /kick, /ban to start).
Close Hibernate session after loading card sets when a user connects -- Oops!
Games have their own Hibernate session for their duration, and this is used instead of a per-request session for loading card sets when changing options.
Fix changing game options without having a card set selected.
2012-08-20 22:41:06 -07:00
Andy Janata 69ec34e072 Allow up to 20 players per game. 2012-08-20 22:39:06 -07:00
Andy Janata 90788982c0 chat messages from admin users show up in blue. admins are defined by IP address for now. 2012-08-20 20:03:52 -07:00
Andy Janata 06e8ea4a07 Add cleanUp method to Handler base class, and call it from AjaxServlet. cleanUp uses reflection to inspect the impl instance for fields of type Session (Hibernate), and if one is found, attempts to close the Session if it was not already closed. 2012-07-14 15:06:36 -07:00
Andy Janata 7e577add21 close hibernate Session in addcard and cardsets 2012-07-14 15:04:11 -07:00
Andy Janata 2dbdc1c2c7 index changelog 2012-07-07 15:06:15 -07:00
Andy Janata 7cf9413861 - add card set support to the game itself
- add watermark field to cards to indicate what to display over the logo
- display said watermark
2012-07-07 15:01:33 -07:00
Andy Janata b5911f564b update sql to create database 2012-07-07 14:59:37 -07:00
Andy Janata 7f8c2f9dbf fix eclipse warning 2012-07-07 14:05:44 -07:00
Andy Janata 5bba53ef7d client parses CardSet data the server sends it when connecting 2012-07-07 10:48:22 -07:00
Andy Janata c2953d250c add some javadoc locations to classpath 2012-07-07 10:21:32 -07:00
Andy Janata 973f18ea80 return list of card sets during first load 2012-07-07 10:21:14 -07:00
Andy Janata e3d6958107 make Hibernate Session injectable 2012-07-07 10:19:47 -07:00
Andy Janata 9f57d3ad94 add "base deck" option to CardSet 2012-07-07 10:19:25 -07:00
Andy Janata 8d3a393de3 card sets, and a way to edit them 2012-07-01 23:55:12 -07:00
Andy Janata 9ef0d0eae0 page to add new cards, and let somebody else's IP address in since he was helping 2012-07-01 23:54:53 -07:00
Andy Janata e01359df45 don't pull in the new cards that aren't in v1 or v2, oops 2012-07-01 23:54:29 -07:00
Andy Janata b06ad5d5d5 fix z-order on Confirm button to always be on top 2012-07-01 23:52:52 -07:00
Andy Janata 269fd5b20a remove bit about the chat log not working right in opera, because I just fixed it (derp) 2012-03-23 00:05:03 -07:00
Andy Janata 3a81301c93 change log in index 2012-03-23 00:01:47 -07:00
Andy Janata 43ec8441fc Broadcast a game list refresh notification when a game starts. Fixes #7. 2012-03-22 23:51:30 -07:00
Andy Janata 368e890c07 Try to squash a lot of threading bugs in Game:
- Make players and roundPlayers be sychronizedLists. Remove all synchronizations on those except while iterating. (Just to reduce code clutter, since the lists still do the same thing internally).
- Rework some other code to reduce locking complexity.
- In skipIdleJudge, apparently getJudge() can return null. I have seen an exception because of this, so I make it check for that. Not entirely sure how that would happen in the first place.
- DEADLOCK FIX: Move getPlayerForUser() call outside of synchronized (playedCards) block in getWhiteCards().
2012-03-22 23:50:35 -07:00
Andy Janata ca226efdea Make all methods in PlayerPlayedCardsTracker synchronized to make it self-threadsafe. 2012-03-22 23:41:56 -07:00
Andy Janata 1860a96f81 Make all methods in BlackDeck and WhiteDeck be synchronized to make those classes self-threadsafe. 2012-03-22 23:41:33 -07:00
Andy Janata bc4f0818f1 Fix the log in Opera. Fixes #5. 2012-03-22 23:38:18 -07:00
Andy Janata d3178c16fb new sql for new cards. hibernate stuff seems to have dropped out, not that I'm presently using hibernate to save anything anyway... 2012-03-20 15:48:44 -07:00
Andy Janata 97a822db6d Add in-game options viewing to index page news. The server already disallows changing options in the middle of a game. 2012-03-18 21:39:31 -07:00
Andy Janata 21e0aea9a3 add button to display game options in middle of game. do not allow host to change options in middle of game (on client, server should check this too) 2012-03-18 21:38:24 -07:00
Andy Janata 5bb9690ea4 add game passwords to index page 2012-03-18 21:22:56 -07:00
Andy Janata 315549d87f game passwords, and display more game information in the lobby list 2012-03-18 21:20:48 -07:00
Andy Janata 14746a6a69 update index page with new news 2012-03-18 11:45:27 -07:00
Andy Janata a1c2bbce80 allow to choose between first version cards, second version cards, or all cards at once. 2012-03-17 20:17:32 -07:00
Andy Janata 0923d8f0f3 >= instead of == for winner score checking 2012-03-17 16:21:23 -07:00
Andy Janata 2203d8927d put session stuff in CahServlet in a try-catch because that sometimes blows up and seems to kill the server. 2012-03-17 16:21:09 -07:00
Andy Janata c6659b3abb display the total duration of the current play timer. will make it count later 2012-03-16 18:35:13 -07:00
Andy Janata a8e7273e13 increase play timers.
fix play timer for people who have played a card but not all required cards (by removing their cards and returning them)
2012-03-16 18:34:59 -07:00
Andy Janata 1237d4c8a2 move round cards up the z-order again 2012-03-16 18:34:20 -07:00
Andy Janata dd117f05d2 fix constants for test 2012-03-16 17:05:27 -07:00
Andy Janata 207ffc4f9e increase max games to 30 2012-03-16 17:00:52 -07:00
Andy Janata f2b5f2b623 PYX, not PYZ, you idiot. 2012-03-16 17:00:01 -07:00
Andy Janata e0391b8d4e skip and kick idle players 2012-03-16 16:59:50 -07:00
Andy Janata 95fe597184 add intermission after judge leaves game. it looks weird, and acts a bit oddly, especially for the previous judge: they can pick a winner but it won't let them choose on the server. still I think this is better than the old way of just starting the next round immediately. 2012-03-15 23:43:43 -07:00
Andy Janata 27a58856d8 fix host options with the card set hidden 2012-03-15 20:19:24 -07:00
Andy Janata a6f1a139be game host can configure maximum players and score goal 2012-03-15 20:06:23 -07:00
Andy Janata 9d627ed01b increase max games to 20 2012-03-15 20:06:06 -07:00
Andy Janata 16483c94b3 fix tests. I really need to run these more often, and write more. 2012-03-15 14:51:36 -07:00