Commit Graph

381 Commits

Author SHA1 Message Date
Andy Janata 7e7be6c54e Fix reloading page when inside a game from trying to rejoin the game twice. Fixes #30, again. 2013-11-11 03:27:23 +00:00
Andy Janata 844ce99cdb Update the URL bar with a deeplink to the current game, and process these deeplinks when the app loads. Fixes #30. 2013-11-11 03:22:54 +00:00
Andy Janata 0cbf74b915 Move the "click outside to apply password" message closer to the box. 2013-11-11 03:21:20 +00:00
Andy Janata b5d3c5c37b Card numbering support for the 13PAX set. 2013-11-11 02:24:58 +00:00
uecasm 2a6b81e4dd Add /me command to support emotes. 2013-10-03 00:28:16 +13:00
Gavin Lambert e0e5638ef1 Increase max number of blank cards to 30. (10 still seems like a reasonably comfortable number for most games, but if you're playing with a lot of decks enabled you might want a few more.) 2013-10-02 23:41:47 +13:00
Gavin Lambert 7ac328f227 Merge latest upstream changes. 2013-10-02 23:28:15 +13:00
Gavin Lambert cdfba970f9 Merge latest upstream code. 2013-10-02 22:22:20 +13:00
Andy Janata d03dac9db7 add more custom card sets 2013-08-10 16:51:16 -07:00
Andy Janata 638fac780a Remove several game list refresh broadcasts:
- never broadcast when a player joins a game (unless it's a new game)
 - removed a duplicate broadcast in this situation as well
- never broadcast when a player leaves a game (unless the game no longer exists)
- never broadcast when a game's options change (unless the state of it having or having not a password changes)
- DO broadcast when a game resets to the lobby state (we were broadcasting when a game started but not when it ended)

In an effort to reduce deadlocks, do not actually hold a lock over the list of players in a game and instead make a copy into an array for looping, in several locations.
2013-08-07 08:01:47 +01:00
Andy Janata fe0b3552b3 Resolve confusion between ns and ms, which should not have actually changed much except the fuzz time around idle returns (which seem to never happen in production anymore).
Increased number of messages returned at one time to 20.
Increased wait time for more messages before returning to 50ms.
2013-08-07 07:58:28 +01:00
Andy Janata 2187eaa320 Increase max games to 250. 2013-08-07 07:52:27 +01:00
Andy Janata 4bd065845e Fix z-index for game options so you can actually click into the password field when there are a lot of cardsets. 2013-07-20 11:11:01 -07:00
Gavin Lambert 3fb715e73c Missed edit 2013-06-20 00:51:23 +12:00
Gavin Lambert a67eedd4ba New feature: blank cards
Add support for blank white cards, that allow the player to enter their
own answer.  (Game host can choose how many to include in the deck; the
default is none.)
2013-06-20 00:23:10 +12:00
Andy Janata 40c8c1e09b Update README
Add Tomcat 6 issues to readme.
2013-06-12 22:57:11 -06:00
Gavin Lambert 81268d9e1d Improve spectator scoreboard panels
Players will now always be inserted above spectators (ie. spectators
will always appear last), making it easier to see who is actually
playing.
2013-06-12 22:04:33 +12:00
Andy Janata 172c782f12 Merge pull request #42 from uecasm/webxml
Fix up web.xml config (issue #36)
2013-06-11 17:22:23 -07:00
Andy Janata 797ae6341e Merge pull request #43 from uecasm/leavegame
Improvements to error handlers
2013-06-11 17:20:12 -07:00
Gavin Lambert 4ac0de4ff6 Add spectator feature 2013-06-11 00:14:32 +12:00
Gavin Lambert 84d191d30c Fix logout error handler
Looks like a missed edit.
2013-06-11 00:09:31 +12:00
Gavin Lambert 07d87c9c91 Add some error handlers for leaving games.
Trying to leave an invalid game always succeeds.  Trying to get game
info about an invalid game (that you think you're still in) makes you
leave it.
2013-06-11 00:09:23 +12:00
Gavin Lambert 467725641f Fix gamelist refresh on leaving game
Game list update was skipped if the game list wasn't visible.  Fix up a
couple of cases when switching back to the game list the update was
called in the wrong order.
2013-06-11 00:09:15 +12:00
Gavin Lambert 6459f8e5bc Fix up web.xml config
Add missing WebServlet annotation to JavascriptConfigServlet class, for
consistency.
Remove redundant configuration items from web.xml, as on Tomcat 7 with
default settings these cause the following error:
java.lang.IllegalArgumentException: The servlets named
[JavascriptConfigServlet] and
[net.socialgamer.cah.servlets.JavascriptConfigServlet] are both mapped
to the url-pattern [/js/cah.config.js] which is not permitted
2013-06-11 00:08:21 +12:00
Andy Janata 014258fcf2 don't refresh game list if the browser tab/window isn't active, and refresh immediately when it becomes active if an update was missed 2013-04-28 10:11:28 -07:00
Andy Janata ef4a558137 use a single selector 2013-04-28 10:10:56 -07:00
Andy Janata 14bfccfc55 Make the View Cards page actually respect card set weight. 2013-04-27 23:23:32 -07:00
Andy Janata 6423d86f11 Changelog; view cards button. 2013-04-27 23:22:52 -07:00
Andy Janata 03c8c6a4d3 Finish up the view cards page. 2013-04-27 23:11:04 -07:00
Andy Janata 2ae18ca6eb Support for sort weights for card sets. 2013-04-27 23:10:56 -07:00
Andy Janata 361ad4202b Add version 1.3 of the game. Clean up some card formatting. Add sort weights to card sets. 2013-04-27 23:09:55 -07:00
Andy Janata debd603532 Skeleton of page to view and filter all cards in the game. Currently just gets all of the data to javascript-land. 2013-04-24 23:25:36 -07:00
Andy Janata 7e8b8d4df3 Updated card dump. 2013-04-24 23:24:54 -07:00
Andy Janata 8d83afc18a Merge branch 'master' of github.com:ajanata/PretendYoureXyzzy 2013-04-20 12:21:50 -07:00
Andy Janata 743cdbf6c1 Add a bunch of WAI-ARIA stuff for accessibility, #37. I'm not ready to call this fixed yet. 2013-04-20 12:21:28 -07:00
Andy Janata 2847891201 Wow, I still had some 'PYZ's in there. 2013-04-19 15:56:30 -07:00
Andy Janata 83eaf8628a changelog 2013-04-13 17:31:47 -07:00
Andy Janata 1efb350c41 Make gamelist lobby cards bigger. Fix HTML entities in gamelist lobby cards. Add mouseover help to "Use idle timer" game option. Fix background on even-numbered rows when that player has won the round. 2013-04-13 17:28:42 -07:00
Andy Janata 9d47959f13 Make the client re-try the first load request once if it got a no session error, otherwise it won't know anything about card sets which causes the game list to break. This is marginally related to #35.
Had to actually return the client's serial number to them when returning errors. Whoops.
2013-04-13 17:13:11 -07:00
Andy Janata 313890f263 comment typo 2013-04-13 17:10:35 -07:00
Andy Janata 00f264a121 changelog 2013-04-13 10:56:11 -07:00
Andy Janata 715e94c099 Remove isNew() check on session when processing client actions. This should fix #35, not being able to log in if you take too long to enter a name. 2013-04-13 10:52:58 -07:00
Andy Janata b84e2ec16c Increase delay before returning new messages to clients, in an attempt to reduce bandwidth consumption. 2013-04-13 10:51:19 -07:00
Andy Janata bdf288a379 Add game option for using idle timer. Implementation when not using idle timer is it instead uses Integer.MAX_VALUE as the number of milliseconds. 2013-04-13 10:39:38 -07:00
Andy Janata 5d26113605 Checkbox to locally hide a game password. Fixes #31. 2013-04-06 14:30:12 -07:00
Andy Janata 7d46a96b65 Adjust chat flood limits. 2013-04-01 19:24:30 -07:00
Andy Janata 253268c18e Update cah_cards.sql with Third Expansion and PAX East 2013 packs. Removed unused columns from black_cards and white_cards. 2013-04-01 19:24:21 -07:00
Andy Janata a5221b6700 changelog 2013-03-30 08:10:10 -07:00
Andy Janata 30e7966222 reserve the nick "xyzzy" for future use 2013-03-30 08:10:00 -07:00
Andy Janata e8970ccddb increase game limit again 2013-03-30 08:09:40 -07:00