Commit Graph

257 Commits

Author SHA1 Message Date
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
Gavin Lambert 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
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 14bfccfc55 Make the View Cards page actually respect card set weight. 2013-04-27 23:23:32 -07:00
Andy Janata 6423d86f11 Changelog; view cards button. 2013-04-27 23:22:52 -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 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
Andy Janata 8d83afc18a Merge branch 'master' of github.com:ajanata/PretendYoureXyzzy 2013-04-20 12:21:50 -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 2847891201 Wow, I still had some 'PYZ's in there. 2013-04-19 15:56:30 -07:00
Andy Janata 83eaf8628a changelog 2013-04-13 17:31:47 -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 00f264a121 changelog 2013-04-13 10:56: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 a5221b6700 changelog 2013-03-30 08:10:10 -07:00
Andy Janata 30e7966222 reserve the nick "xyzzy" for future use 2013-03-30 08:10:00 -07:00
Andy Janata 622f50aa89 update changelog 2013-03-26 20:43:39 -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 61b567e2ec add watermark to add card page 2013-03-26 18:06:43 -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 e70874cbcf update changelog 2013-02-24 23:57:22 -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 3e7e948052 updated news 2013-01-08 23:35:41 -08:00
Andy Janata 5a52a48976 fix code formatting, formatting for the 's' for 'Awesome Points', and formatting for 'Your Hand' text 2012-12-23 09:48:00 -08:00
timsookram 9f14e33880 Moving padding inside container divs 2012-12-23 09:30:53 -08:00
timsookram 45375abaf7 Added point title class to shrink "awesome pts" 2012-12-23 09:30:52 -08:00
timsookram 2fc43c3e27 Bolding scores and player on scorecard 2012-12-23 09:30:52 -08:00
timsookram a2ac914817 Update WebContent/cah.css
Removing margin from h3 in game lobby description
2012-12-23 09:30:51 -08:00
timsookram 9d55c49ccb Update WebContent/game.jsp
Reformatting Game Lobby entry to prioritize Host name and Player Count
Hiding Game ID
2012-12-23 09:30:51 -08:00
timsookram 0c2dfb659a Update WebContent/cah.css
Changing selected card style
2012-12-23 09:30:51 -08:00
timsookram ce20c55807 Update WebContent/cah.css
-Adding gradients to bottom of cards and game lobbies
-Styling Join button
2012-12-23 09:30:50 -08:00
timsookram a8fd92cf66 Update WebContent/cah.css
General:
 -Removing borders and using grey background to add contrast

Game Lobby:
 -Bolding Game Status & Join Button
 -Padding Game Description
Game:
 -Adding rounded corners and thinner borders to cards
 -Subtler blue selected card state
2012-12-23 09:30:50 -08:00
Andy Janata 45312306c9 update vsTerminus's IP address for admin, and fix cardsets.jsp for new jquery version 2012-12-07 18:46:46 -08:00
Andy Janata c66ffa6e1f Now fix the chat box font. 2012-10-27 08:51:12 -07:00
Andy Janata 11a343eb75 I hate CSS. "Fix" the game hand display. Not sure why it got broken, had to be related to using tabs. 2012-10-27 08:50:07 -07: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
Andy Janata 63b8f3eaaf Player and score limit options dynamically generated. Allow up to 69 point score goal. 2012-10-11 21:40:41 -07:00
Andy Janata de331e738a - User preferences. Can turn off (dis)connect messages except for kicks/bans (fixes #9), and can ignore chat from specific users (except admins). Also remembers the user's name. All of these are stored in js cookies.
- Update jQuery and jQuery Cookie plugin, and add jQuery UI.
2012-10-11 21:18:40 -07:00
Andy Janata c6c6feb49f Display non-passworded games before passworded games. Fixes #20. 2012-10-11 20:05:06 -07:00
Andy Janata 842598fd46 Fix name of JavascriptConfigServlet 2012-10-11 19:51:46 -07:00
Andy Janata 3b454c4552 Generate cah.config.js via a Servlet. Idea from d4472c1238/src/net/socialgamer/cah/servlets/JavascriptConfig.java 2012-10-11 19:49:16 -07:00
Andy Janata 68998c3244 Remove defunct TestServlet from web.xml. 2012-10-11 19:31:31 -07:00
Andy Janata b0b1f5fbf2 Fix @Nullable annotations. 2012-10-11 19:31:17 -07:00
Andy Janata ec1e85ec5d Check X-Forwarded-For on the admin pages. Fixes #22. 2012-10-01 20:12:14 -07:00
Andy Janata b57ee2de7e add google analytics. why did I wait so long? 2012-09-22 07:51:23 -07:00
Andy Janata 86703070ec show brief welcome banner on nickbox screen 2012-09-09 22:08:24 -07:00
Andy Janata 554510ea3a fix addcard 2012-09-09 22:08:06 -07:00
Andy Janata 38224cf81a Chat flood protection. Limits users to 5 messages per 15 seconds currently. 2012-08-28 23:00:47 -07:00
Andy Janata 7fccd69b15 Kicks and bans.
Admin chat in blue.
Chat commands (/names, /kick, /ban to start).
Close Hibernate session after loading card sets when a user connects -- Oops!
Games have their own Hibernate session for their duration, and this is used instead of a per-request session for loading card sets when changing options.
Fix changing game options without having a card set selected.
2012-08-20 22:41:06 -07:00
Andy Janata 69ec34e072 Allow up to 20 players per game. 2012-08-20 22:39:06 -07:00
Andy Janata 90788982c0 chat messages from admin users show up in blue. admins are defined by IP address for now. 2012-08-20 20:03:52 -07:00
Andy Janata 7e577add21 close hibernate Session in addcard and cardsets 2012-07-14 15:04:11 -07:00
Andy Janata 2dbdc1c2c7 index changelog 2012-07-07 15:06:15 -07:00
Andy Janata 7cf9413861 - add card set support to the game itself
- add watermark field to cards to indicate what to display over the logo
- display said watermark
2012-07-07 15:01:33 -07:00
Andy Janata 7f8c2f9dbf fix eclipse warning 2012-07-07 14:05:44 -07:00
Andy Janata 5bba53ef7d client parses CardSet data the server sends it when connecting 2012-07-07 10:48:22 -07:00
Andy Janata 973f18ea80 return list of card sets during first load 2012-07-07 10:21:14 -07:00
Andy Janata 9f57d3ad94 add "base deck" option to CardSet 2012-07-07 10:19:25 -07:00
Andy Janata 8d3a393de3 card sets, and a way to edit them 2012-07-01 23:55:12 -07:00
Andy Janata 9ef0d0eae0 page to add new cards, and let somebody else's IP address in since he was helping 2012-07-01 23:54:53 -07:00
Andy Janata e01359df45 don't pull in the new cards that aren't in v1 or v2, oops 2012-07-01 23:54:29 -07:00
Andy Janata b06ad5d5d5 fix z-order on Confirm button to always be on top 2012-07-01 23:52:52 -07:00
Andy Janata 269fd5b20a remove bit about the chat log not working right in opera, because I just fixed it (derp) 2012-03-23 00:05:03 -07:00
Andy Janata 3a81301c93 change log in index 2012-03-23 00:01:47 -07:00
Andy Janata bc4f0818f1 Fix the log in Opera. Fixes #5. 2012-03-22 23:38:18 -07:00
Andy Janata 97a822db6d Add in-game options viewing to index page news. The server already disallows changing options in the middle of a game. 2012-03-18 21:39:31 -07:00
Andy Janata 21e0aea9a3 add button to display game options in middle of game. do not allow host to change options in middle of game (on client, server should check this too) 2012-03-18 21:38:24 -07:00
Andy Janata 5bb9690ea4 add game passwords to index page 2012-03-18 21:22:56 -07:00
Andy Janata 315549d87f game passwords, and display more game information in the lobby list 2012-03-18 21:20:48 -07:00
Andy Janata 14746a6a69 update index page with new news 2012-03-18 11:45:27 -07:00
Andy Janata a1c2bbce80 allow to choose between first version cards, second version cards, or all cards at once. 2012-03-17 20:17:32 -07:00
Andy Janata c6659b3abb display the total duration of the current play timer. will make it count later 2012-03-16 18:35:13 -07:00
Andy Janata a8e7273e13 increase play timers.
fix play timer for people who have played a card but not all required cards (by removing their cards and returning them)
2012-03-16 18:34:59 -07:00
Andy Janata 1237d4c8a2 move round cards up the z-order again 2012-03-16 18:34:20 -07:00
Andy Janata dd117f05d2 fix constants for test 2012-03-16 17:05:27 -07:00
Andy Janata f2b5f2b623 PYX, not PYZ, you idiot. 2012-03-16 17:00:01 -07:00
Andy Janata e0391b8d4e skip and kick idle players 2012-03-16 16:59:50 -07:00
Andy Janata 95fe597184 add intermission after judge leaves game. it looks weird, and acts a bit oddly, especially for the previous judge: they can pick a winner but it won't let them choose on the server. still I think this is better than the old way of just starting the next round immediately. 2012-03-15 23:43:43 -07:00
Andy Janata 27a58856d8 fix host options with the card set hidden 2012-03-15 20:19:24 -07:00
Andy Janata a6f1a139be game host can configure maximum players and score goal 2012-03-15 20:06:23 -07:00
Andy Janata 2332c68f75 add a subheading to the index page that this is a cah clone 2012-03-15 14:04:12 -07:00
Andy Janata a679a7a36c - confirm leaving game
- initial game options. it never displays it right now since it isn't done
2012-03-15 13:50:42 -07:00
Andy Janata 5fa3bf5ece confirm logging out 2012-03-15 13:50:24 -07:00