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
2a6b81e4dd
Add /me command to support emotes.
2013-10-03 00:28:16 +13: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
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
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
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
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
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
3e7e948052
updated news
2013-01-08 23:35:41 -08:00
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
9f14e33880
Moving padding inside container divs
2012-12-23 09:30:53 -08:00
45375abaf7
Added point title class to shrink "awesome pts"
2012-12-23 09:30:52 -08:00
2fc43c3e27
Bolding scores and player on scorecard
2012-12-23 09:30:52 -08:00
a2ac914817
Update WebContent/cah.css
...
Removing margin from h3 in game lobby description
2012-12-23 09:30:51 -08:00
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
0c2dfb659a
Update WebContent/cah.css
...
Changing selected card style
2012-12-23 09:30:51 -08:00
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
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
45312306c9
update vsTerminus's IP address for admin, and fix cardsets.jsp for new jquery version
2012-12-07 18:46:46 -08:00
c66ffa6e1f
Now fix the chat box font.
2012-10-27 08:51:12 -07:00
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
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
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
63b8f3eaaf
Player and score limit options dynamically generated. Allow up to 69 point score goal.
2012-10-11 21:40:41 -07:00
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
c6c6feb49f
Display non-passworded games before passworded games. Fixes #20 .
2012-10-11 20:05:06 -07:00
842598fd46
Fix name of JavascriptConfigServlet
2012-10-11 19:51:46 -07:00
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
68998c3244
Remove defunct TestServlet from web.xml.
2012-10-11 19:31:31 -07:00
b0b1f5fbf2
Fix @Nullable annotations.
2012-10-11 19:31:17 -07:00
ec1e85ec5d
Check X-Forwarded-For on the admin pages. Fixes #22 .
2012-10-01 20:12:14 -07:00
b57ee2de7e
add google analytics. why did I wait so long?
2012-09-22 07:51:23 -07:00
86703070ec
show brief welcome banner on nickbox screen
2012-09-09 22:08:24 -07:00
554510ea3a
fix addcard
2012-09-09 22:08:06 -07:00
38224cf81a
Chat flood protection. Limits users to 5 messages per 15 seconds currently.
2012-08-28 23:00:47 -07:00
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
69ec34e072
Allow up to 20 players per game.
2012-08-20 22:39:06 -07:00
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
7e577add21
close hibernate Session in addcard and cardsets
2012-07-14 15:04:11 -07:00
2dbdc1c2c7
index changelog
2012-07-07 15:06:15 -07:00
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
7f8c2f9dbf
fix eclipse warning
2012-07-07 14:05:44 -07:00
5bba53ef7d
client parses CardSet data the server sends it when connecting
2012-07-07 10:48:22 -07:00
973f18ea80
return list of card sets during first load
2012-07-07 10:21:14 -07:00
9f57d3ad94
add "base deck" option to CardSet
2012-07-07 10:19:25 -07:00
8d3a393de3
card sets, and a way to edit them
2012-07-01 23:55:12 -07:00
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
e01359df45
don't pull in the new cards that aren't in v1 or v2, oops
2012-07-01 23:54:29 -07:00
b06ad5d5d5
fix z-order on Confirm button to always be on top
2012-07-01 23:52:52 -07:00
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
3a81301c93
change log in index
2012-03-23 00:01:47 -07:00
bc4f0818f1
Fix the log in Opera. Fixes #5 .
2012-03-22 23:38:18 -07:00
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
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
uecasm
Gavin Lambert
Matt Mullins
timsookram