Commit Graph

400 Commits

Author SHA1 Message Date
Andy Janata 5ad372ee19 Force a higher z-index when mousing over a card in your hand. This should help with the face-down cards other people have played covering your own hand while deciding what to play. 2014-02-16 22:45:22 -08:00
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 0e45c4f886 Switch to using a ScheduledThreadPoolExecutor instead of a Timer for scheduled tasks. This will allow 2 * CPU count threads to handle background tasks instead of using a single thread, which could cause the server to effectively die if a task gets stuck for some reason. This addresse the symptom of #89, but not the cause (which is yet to be determined). 2014-02-16 00:43:13 -08:00
Andy Janata fd3dce4c62 Reduce Hibernate Session lifetimes for games, which may be related to #89. Now, we're loading the cards out of the database when the game host tells us which card sets to use, and never touching the database again if the card sets never change.
Also, don't load every card in every card set when loading the card sets when a player connects to the server. We only need a count of the cards in the card set at that point.
2014-02-16 00:18:54 -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
Andy Janata 13be0fdbbb Merge pull request #79 from uecasm/keep-cards-join
Keep playfield intact when players join/leave.
2014-01-25 07:52:48 -08:00
Andy Janata bcaeae6f18 Merge pull request #78 from uecasm/judge-twice-fix
Don't judge twice when player leaves.
2014-01-25 07:51:43 -08:00
Andy Janata 2a46c26c49 Merge pull request #77 from uecasm/skip-kick-fix
Don't reset game when kicking idle players
2014-01-25 07:51:13 -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
uecasm 502a2b10b6 Fixes #33. 2014-01-24 23:35:59 +13:00
uecasm cccd08266c Fixes #32. Finally. Hallelujah. 2014-01-24 23:20:35 +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 645e307acc Purge TimerTasks in the ping timeout task. Fixes #70. 2013-12-21 20:42:47 -08:00
Andy Janata 0701e80a52 Update cards. 2013-12-08 10:06:02 -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 c01bc3cd37 Wrap TimerTask.run in a try-catch so an exception can't kill all processing. 2013-12-02 04:51:52 +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 e58e436285 Comment and variable name cleanup. Change default spectators to 0. 2013-12-02 03:28:46 +00:00
Andy Janata 97414c287a switch my postgres host. this shouldn't even be checked in but whatever 2013-12-02 03:28:11 +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 8221ab7b54 - Remove some pointless @Provides methods and .bind().toInstance().
- Use a single global Timer and schedule multiple TimerTasks on it. Moving to a ScheduledThreadPoolExecutor may be preferable as now all TimerTasks are serialized.
- Fix tests that were broken by changed behavior in 638fac780a (shows how often I run the few crappy tests I have...)
2013-12-01 09:53:47 +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 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