Commit Graph

172 Commits

Author SHA1 Message Date
Andy Janata 014495007a Kick non-admins after being idle for an hour. Any user activity resets this timer. This is a roundabout way of addressing #52, but brings more to the table in general and is significantly simpler than making each game have a timer task to manage it.
Increase the ping timeout delay from 45 seconds to 90 seconds, while reducing the timeout on long poll requests on the client side to 30 seconds. (This is still less than the 25 seconds that LongPollServlet will wait.)
2013-12-02 04:00:57 +00:00
Andy Janata 9a571804aa Use max_users config option and deny access to new users if there are too many connected. 2013-12-01 18:18:35 +00:00
Andy Janata ef4c172fca add cookie domain to pyx.properties so all servers can share the same cookie 2013-11-30 22:35:53 -08:00
Andy Janata 3ecb4f59a6 Merge branch 'score-cmd' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-score-cmd 2013-11-30 05:04:09 +00:00
Andy Janata 76959c3b2a refactor emote code to have withEmote in one place. 2013-11-30 04:54:56 +00:00
Andy Janata b679412cb0 Merge branch 'emotes' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-emotes 2013-11-30 04:52:29 +00:00
Andy Janata 93abb3a29d Looks like cah.constants.js wasn't updated for BLANKS_LIMIT. 2013-11-30 04:47:09 +00:00
Andy Janata 4ccd8b4c59 Merge branch 'blanks' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-blanks 2013-11-30 04:26:22 +00:00
Andy Janata 632ce7f4b0 Disable being able to click card while waiting for the server to acknowledge the previous card play. This should fix the client removing the incorrect card from the hand. Also fixes losing a card when it is selected but not confirmed, but you run out of time to play, the card was removed from your hand. This ought to fix #55. 2013-11-30 00:07:40 +00:00
uecasm fba2652fd9 Fix formatting. 2013-11-29 21:12:25 +13:00
uecasm 0dc7a56e79 Merge upstream changes. 2013-11-29 21:03:12 +13:00
Andy Janata 4584f06e25 Merge branch 'uecasm-resync-hand'
Eclipse auto-formatted some other stuff, too.
2013-11-29 03:57:14 +00:00
Andy Janata d334abccdc formatting; change /hand to /sync 2013-11-29 03:52:19 +00:00
Andy Janata 2392883c32 Merge branch 'resync-hand' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-resync-hand 2013-11-29 03:50:34 +00:00
Andy Janata 75efccf4e9 Merge pull request #59 from uecasm/disable-animation
Add option to disable card animation
2013-11-28 19:48:11 -08:00
Andy Janata e7cf798040 Merge pull request #57 from uecasm/aWinnerIsYou
Announce who won the round
2013-11-28 19:46:45 -08:00
Andy Janata 3c58dcba3c Merge pull request #58 from uecasm/lobby-no-czar
Hide "you are the czar" filter in the lobby (fixes #67)
2013-11-28 19:46:14 -08:00
Andy Janata 72e1a061bc formatting 2013-11-29 03:18:55 +00:00
uecasm 6e32e81bee Merge branch 'upstream' into spectator
NOTE: I have not yet considered how to support spectators with the new hash URLs; it's likely something will go funny with the current implementation.
2013-11-21 23:01:00 +13:00
uecasm da52328828 Merge branch 'upstream' into emotes 2013-11-21 22:57:25 +13:00
uecasm be47508843 Bugfix: assign unique (negative) ids to blank cards; previously the wrong card could win if multiple blanks were being judged in the same round. 2013-11-21 22:32:40 +13:00
uecasm d0e8e1e33f Merge branch 'upstream' into blanks 2013-11-21 22:18:56 +13:00
uecasm 249a308b5b Add "score" command, which can be used by any user to view the current score of any other user (even across games). Also allows admins to modify a user's current score, which can be useful on private servers where admins are playing and can "repair" a score if someone gets disconnected or kicked accidentally. 2013-11-15 23:27:30 +13:00
uecasm 5da2e97f53 Add /hand command to resync hand 2013-11-15 00:14:22 +13:00
uecasm 6369f2ab8f Add option to disable card animation 2013-11-14 23:59:56 +13:00
uecasm 3238dd1136 Hide "you are the czar" filter in the lobby 2013-11-14 23:46:29 +13:00
uecasm 7e15eddcc3 Announce who won the round
Fixes #39.
2013-11-14 23:39:03 +13:00
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
uecasm 2a6b81e4dd Add /me command to support emotes. 2013-10-03 00:28:16 +13: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
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
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
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 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 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 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 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 30e7966222 reserve the nick "xyzzy" for future use 2013-03-30 08:10:00 -07:00
Andy Janata 660fd2d5f1 prevent wrapping in the middle of cardset names 2013-03-26 20:31:46 -07:00
Andy Janata c662bf954d admins can send chat to all connected users 2013-03-26 20:17:49 -07:00
Andy Janata a768677eaf allow html in card text 2013-03-26 18:07:09 -07:00