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
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
cdfba970f9
Merge latest upstream code.
2013-10-02 22:22:20 +13: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
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
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
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
debd603532
Skeleton of page to view and filter all cards in the game. Currently just gets all of the data to javascript-land.
2013-04-24 23:25:36 -07:00
8d83afc18a
Merge branch 'master' of github.com:ajanata/PretendYoureXyzzy
2013-04-20 12:21:50 -07:00
743cdbf6c1
Add a bunch of WAI-ARIA stuff for accessibility, #37 . I'm not ready to call this fixed yet.
2013-04-20 12:21:28 -07:00
2847891201
Wow, I still had some 'PYZ's in there.
2013-04-19 15:56:30 -07:00
83eaf8628a
changelog
2013-04-13 17:31:47 -07:00
1efb350c41
Make gamelist lobby cards bigger. Fix HTML entities in gamelist lobby cards. Add mouseover help to "Use idle timer" game option. Fix background on even-numbered rows when that player has won the round.
2013-04-13 17:28:42 -07:00
9d47959f13
Make the client re-try the first load request once if it got a no session error, otherwise it won't know anything about card sets which causes the game list to break. This is marginally related to #35 .
...
Had to actually return the client's serial number to them when returning errors. Whoops.
2013-04-13 17:13:11 -07:00
00f264a121
changelog
2013-04-13 10:56:11 -07:00
bdf288a379
Add game option for using idle timer. Implementation when not using idle timer is it instead uses Integer.MAX_VALUE as the number of milliseconds.
2013-04-13 10:39:38 -07:00
5d26113605
Checkbox to locally hide a game password. Fixes #31 .
2013-04-06 14:30:12 -07:00
a5221b6700
changelog
2013-03-30 08:10:10 -07:00
30e7966222
reserve the nick "xyzzy" for future use
2013-03-30 08:10:00 -07:00
622f50aa89
update changelog
2013-03-26 20:43:39 -07:00
660fd2d5f1
prevent wrapping in the middle of cardset names
2013-03-26 20:31:46 -07:00
c662bf954d
admins can send chat to all connected users
2013-03-26 20:17:49 -07:00
a768677eaf
allow html in card text
2013-03-26 18:07:09 -07:00
61b567e2ec
add watermark to add card page
2013-03-26 18:06:43 -07:00
a43e087fa2
card set descriptions
2013-03-26 17:19:01 -07:00
526911bc0e
Don't update the game list when it isn't visible (i.e. you're already in a game). The client will refresh it when the player leaves their game anyway. This will hopefully cut down on a lot of bandwidth usage -- that's a lot of data sent around whenever anybody joins or leaves any game, and nobody sees it.
2013-03-02 23:50:24 -08:00
e70874cbcf
update changelog
2013-02-24 23:57:22 -08:00
ccca422b8c
show game-related log messages in the game's log instead of the global log
2013-02-24 18:57:04 -08:00
300e7e09b7
Fix up per-game chats so global chat still works. Fix graphical glitch with game chat tab. Make enter work in game chat box. Clear game chat log when joinging game.
2013-02-24 18:47:05 -08:00
b1c8e52dd4
Remove the chat tab when leaving a game
2013-02-24 17:48:49 -08:00
9cbd699109
Display Per-game chat messages in the correct tab
...
Errors are displayed in all chat tabs, including the global chat and
all in-game chats.
2013-02-24 17:48:49 -08:00
b74aed03c1
make per-game chats resize with the window like global chat.
2013-02-23 14:32:00 -08:00
d110b59b9c
Create a new tab for game-specific chat.
...
Signed-off-by: Matt Mullins <mmullins@mmlx.us>
2013-02-23 14:18:22 -08:00
3183af0a45
Add generalized arguments to chatsubmit_click
...
These parameters are used as a closure, so that the generated handler knows
which game it is attached to.
Signed-off-by: Matt Mullins <mmullins@mmlx.us>
2013-02-23 14:18:18 -08:00
Andy Janata
uecasm
Gavin Lambert
Matt Mullins