fba2652fd9
Fix formatting.
2013-11-29 21:12:25 +13:00
0dc7a56e79
Merge upstream changes.
2013-11-29 21:03:12 +13:00
4584f06e25
Merge branch 'uecasm-resync-hand'
...
Eclipse auto-formatted some other stuff, too.
2013-11-29 03:57:14 +00:00
d334abccdc
formatting; change /hand to /sync
2013-11-29 03:52:19 +00:00
2392883c32
Merge branch 'resync-hand' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-resync-hand
2013-11-29 03:50:34 +00:00
75efccf4e9
Merge pull request #59 from uecasm/disable-animation
...
Add option to disable card animation
2013-11-28 19:48:11 -08:00
e7cf798040
Merge pull request #57 from uecasm/aWinnerIsYou
...
Announce who won the round
2013-11-28 19:46:45 -08:00
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
72e1a061bc
formatting
2013-11-29 03:18:55 +00:00
e6b3275071
Fix not loading black card when joining a game as a spectator.
2013-11-29 03:18:49 +00:00
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
2a77c680fe
change "View" button to "Spectate"
2013-11-29 02:24:47 +00:00
4c686010c2
Merge branch 'spectator' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-spectator
2013-11-29 02:08:13 +00:00
48d7ef36e9
Get log4j working.
2013-11-29 01:18:36 +00:00
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
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
d0e8e1e33f
Merge branch 'upstream' into blanks
2013-11-21 22:18:56 +13:00
5da2e97f53
Add /hand command to resync hand
2013-11-15 00:14:22 +13:00
6369f2ab8f
Add option to disable card animation
2013-11-14 23:59:56 +13:00
3238dd1136
Hide "you are the czar" filter in the lobby
2013-11-14 23:46:29 +13:00
7e15eddcc3
Announce who won the round
...
Fixes #39 .
2013-11-14 23:39:03 +13:00
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
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
0cbf74b915
Move the "click outside to apply password" message closer to the box.
2013-11-11 03:21:20 +00:00
b5d3c5c37b
Card numbering support for the 13PAX set.
2013-11-11 02:24:58 +00:00
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
7ac328f227
Merge latest upstream changes.
2013-10-02 23:28:15 +13:00
cdfba970f9
Merge latest upstream code.
2013-10-02 22:22:20 +13:00
d03dac9db7
add more custom card sets
2013-08-10 16:51:16 -07:00
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
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
2187eaa320
Increase max games to 250.
2013-08-07 07:52:27 +01:00
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
3fb715e73c
Missed edit
2013-06-20 00:51:23 +12:00
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
40c8c1e09b
Update README
...
Add Tomcat 6 issues to readme.
2013-06-12 22:57:11 -06:00
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
172c782f12
Merge pull request #42 from uecasm/webxml
...
Fix up web.xml config (issue #36 )
2013-06-11 17:22:23 -07:00
797ae6341e
Merge pull request #43 from uecasm/leavegame
...
Improvements to error handlers
2013-06-11 17:20:12 -07:00
4ac0de4ff6
Add spectator feature
2013-06-11 00:14:32 +12:00
84d191d30c
Fix logout error handler
...
Looks like a missed edit.
2013-06-11 00:09:31 +12:00
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
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
6459f8e5bc
Fix up web.xml config
...
Add missing WebServlet annotation to JavascriptConfigServlet class, for
consistency.
Remove redundant configuration items from web.xml, as on Tomcat 7 with
default settings these cause the following error:
java.lang.IllegalArgumentException: The servlets named
[JavascriptConfigServlet] and
[net.socialgamer.cah.servlets.JavascriptConfigServlet] are both mapped
to the url-pattern [/js/cah.config.js] which is not permitted
2013-06-11 00:08:21 +12:00
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
ef4a558137
use a single selector
2013-04-28 10:10:56 -07:00
14bfccfc55
Make the View Cards page actually respect card set weight.
2013-04-27 23:23:32 -07:00
6423d86f11
Changelog; view cards button.
2013-04-27 23:22:52 -07:00
03c8c6a4d3
Finish up the view cards page.
2013-04-27 23:11:04 -07:00
2ae18ca6eb
Support for sort weights for card sets.
2013-04-27 23:10:56 -07:00
uecasm
Andy Janata
Gavin Lambert