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
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