Commit Graph

159 Commits

Author SHA1 Message Date
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
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 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 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
Gavin Lambert 3fb715e73c Missed edit 2013-06-20 00:51:23 +12:00
Gavin Lambert 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
Gavin Lambert 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
Gavin Lambert 4ac0de4ff6 Add spectator feature 2013-06-11 00:14:32 +12:00
Gavin Lambert 84d191d30c Fix logout error handler
Looks like a missed edit.
2013-06-11 00:09:31 +12:00
Gavin Lambert 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
Gavin Lambert 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
Andy Janata 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
Andy Janata ef4a558137 use a single selector 2013-04-28 10:10:56 -07:00
Andy Janata 03c8c6a4d3 Finish up the view cards page. 2013-04-27 23:11:04 -07:00
Andy Janata 2ae18ca6eb Support for sort weights for card sets. 2013-04-27 23:10:56 -07:00
Andy Janata 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
Andy Janata 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
Andy Janata 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
Andy Janata 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
Andy Janata 5d26113605 Checkbox to locally hide a game password. Fixes #31. 2013-04-06 14:30:12 -07:00
Andy Janata 30e7966222 reserve the nick "xyzzy" for future use 2013-03-30 08:10:00 -07:00
Andy Janata 660fd2d5f1 prevent wrapping in the middle of cardset names 2013-03-26 20:31:46 -07:00
Andy Janata c662bf954d admins can send chat to all connected users 2013-03-26 20:17:49 -07:00
Andy Janata a768677eaf allow html in card text 2013-03-26 18:07:09 -07:00
Andy Janata a43e087fa2 card set descriptions 2013-03-26 17:19:01 -07:00
Andy Janata 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
Andy Janata ccca422b8c show game-related log messages in the game's log instead of the global log 2013-02-24 18:57:04 -08:00
Andy Janata 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
Matt Mullins b1c8e52dd4 Remove the chat tab when leaving a game 2013-02-24 17:48:49 -08:00
Matt Mullins 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
Andy Janata b74aed03c1 make per-game chats resize with the window like global chat. 2013-02-23 14:32:00 -08:00
Matt Mullins 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
Matt Mullins 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
Matt Mullins 7b74529a2b Refactor chat button click-handler to be a closure.
This will support having multiple handlers, one per game, in the future.

Signed-off-by: Matt Mullins <mmullins@mmlx.us>
2013-02-23 14:18:13 -08:00
Matt Mullins 9594b542f6 Replace id= with class= for the chat panel.
This is in preparation to support multiple tabs, which will provide a
separate chat tab per running game.

Signed-off-by: Matt Mullins <mmullins@mmlx.us>
2013-02-23 14:18:07 -08:00
Andy Janata 22156e90ac add tabs, move user preferences to a tab, and fix the chat ui to fit the tab. it gets very bad at small window sizes though 2012-10-15 20:23:37 -07:00
Andy Janata 54974836c8 I don't like editing library files I'm pulling from elsewhere, but those JS errors in Eclipse were getting annoying. 2012-10-13 13:48:57 -07:00