Commit Graph

273 Commits

Author SHA1 Message Date
Andy Janata d027e0d175 Only show "hand" cursor over cards in your hand, not the entire area. Fixes #34. 2014-02-16 22:40:47 -08:00
Andy Janata 4448a90ccd add background color to game options so they are readable when overlapping other UI elements. fixes #87 2014-02-16 22:37:17 -08:00
Andy Janata be7768e03b Refactor preferences code out to its own file. Add game list filters, allowing users to ban and require card sets for a game to be in their game list. 2014-01-26 23:22:37 -08:00
Andy Janata ed3e619883 update changelog 2014-01-26 10:15:21 -08:00
Andy Janata 50666cee12 change google analytics url 2014-01-26 10:15:13 -08:00
Andy Janata 65830a11fc increase user/game limits 2014-01-26 10:14:59 -08:00
Andy Janata 0a349cd04f Merge pull request #81 from uecasm/typo1
Fix typo in HTML.
2014-01-25 07:56:43 -08:00
Andy Janata e50a19f19d Merge pull request #80 from uecasm/stop-games
Add a button to Stop an in-progress game.
2014-01-25 07:56:28 -08:00
uecasm 82272a7035 Fix typo in HTML. 2014-01-25 00:46:13 +13:00
uecasm bb83cef8a3 Add a button to Stop an in-progress game. 2014-01-25 00:33:15 +13:00
uecasm 8bca23ed9d Keep playfield intact when players join/leave. 2014-01-25 00:17:09 +13:00
Andy Janata 2c6df92d01 Fix being able to change maximum number of games at runtime. Increase maximum users and games. 2013-12-31 10:13:14 -08:00
Andy Janata 0bdf8b60bd update changelog 2013-12-22 12:11:37 -08:00
Andy Janata 77151e327b Let all players adjust the 'hide password' checkbox. 2013-12-07 19:40:29 -08:00
Andy Janata f7b3a48010 Fix cookie domain, and increase user cap. 2013-12-02 04:59:14 +00:00
Andy Janata d03eaf88c1 changelog 2013-12-02 04:53:53 +00:00
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 00d93e73ab update changelog 2013-12-01 18:05:54 +00:00
Andy Janata 495683c206 Add config option to use inactive cardsets. Rename cookie domain config option to be more consistent. 2013-12-01 09:00:19 +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 7be74010a6 properties file support for game and player limits. add this information to stats.jsp 2013-11-30 22:09: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
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 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 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