Commit Graph

364 Commits

Author SHA1 Message Date
Andy Janata acfae4e67c Merge pull request #62 from uecasm/no-dealt
Stop tracking dealt cards in the server, as this is not actually used.
2013-11-29 21:14:55 -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
Andy Janata e8f20f1010 Add player name to idle judge skip log message 2013-11-29 23:45:32 +00:00
uecasm f3df28cdbb Fix layout derp from merge. 2013-11-29 21:24:43 +13: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
Andy Janata e6b3275071 Fix not loading black card when joining a game as a spectator. 2013-11-29 03:18:49 +00:00
Andy Janata f890244df0 Remove game list refresh broadcast when spectator joins a game (the related player join broadcast was removed in 638fac7) 2013-11-29 02:33:09 +00:00
Andy Janata 2a77c680fe change "View" button to "Spectate" 2013-11-29 02:24:47 +00:00
Andy Janata 4c686010c2 Merge branch 'spectator' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-spectator 2013-11-29 02:08:13 +00:00
Andy Janata 48d7ef36e9 Get log4j working. 2013-11-29 01:18:36 +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 0e44812f4b Stop tracking dealt cards in the server, as this is not actually used. 2013-11-15 23:11:26 +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
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