0a349cd04f
Merge pull request #81 from uecasm/typo1
...
Fix typo in HTML.
2014-01-25 07:56:43 -08:00
e50a19f19d
Merge pull request #80 from uecasm/stop-games
...
Add a button to Stop an in-progress game.
2014-01-25 07:56:28 -08:00
82272a7035
Fix typo in HTML.
2014-01-25 00:46:13 +13:00
bb83cef8a3
Add a button to Stop an in-progress game.
2014-01-25 00:33:15 +13:00
8bca23ed9d
Keep playfield intact when players join/leave.
2014-01-25 00:17:09 +13:00
2c6df92d01
Fix being able to change maximum number of games at runtime. Increase maximum users and games.
2013-12-31 10:13:14 -08:00
0bdf8b60bd
update changelog
2013-12-22 12:11:37 -08:00
77151e327b
Let all players adjust the 'hide password' checkbox.
2013-12-07 19:40:29 -08:00
f7b3a48010
Fix cookie domain, and increase user cap.
2013-12-02 04:59:14 +00:00
d03eaf88c1
changelog
2013-12-02 04:53:53 +00:00
014495007a
Kick non-admins after being idle for an hour. Any user activity resets this timer. This is a roundabout way of addressing #52 , but brings more to the table in general and is significantly simpler than making each game have a timer task to manage it.
...
Increase the ping timeout delay from 45 seconds to 90 seconds, while reducing the timeout on long poll requests on the client side to 30 seconds. (This is still less than the 25 seconds that LongPollServlet will wait.)
2013-12-02 04:00:57 +00:00
9a571804aa
Use max_users config option and deny access to new users if there are too many connected.
2013-12-01 18:18:35 +00:00
00d93e73ab
update changelog
2013-12-01 18:05:54 +00:00
495683c206
Add config option to use inactive cardsets. Rename cookie domain config option to be more consistent.
2013-12-01 09:00:19 +00:00
ef4c172fca
add cookie domain to pyx.properties so all servers can share the same cookie
2013-11-30 22:35:53 -08:00
7be74010a6
properties file support for game and player limits. add this information to stats.jsp
2013-11-30 22:09:55 -08:00
3ecb4f59a6
Merge branch 'score-cmd' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-score-cmd
2013-11-30 05:04:09 +00:00
76959c3b2a
refactor emote code to have withEmote in one place.
2013-11-30 04:54:56 +00:00
b679412cb0
Merge branch 'emotes' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-emotes
2013-11-30 04:52:29 +00:00
93abb3a29d
Looks like cah.constants.js wasn't updated for BLANKS_LIMIT.
2013-11-30 04:47:09 +00:00
4ccd8b4c59
Merge branch 'blanks' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-blanks
2013-11-30 04:26:22 +00:00
632ce7f4b0
Disable being able to click card while waiting for the server to acknowledge the previous card play. This should fix the client removing the incorrect card from the hand. Also fixes losing a card when it is selected but not confirmed, but you run out of time to play, the card was removed from your hand. This ought to fix #55 .
2013-11-30 00:07:40 +00:00
f3df28cdbb
Fix layout derp from merge.
2013-11-29 21:24:43 +13:00
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
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
da52328828
Merge branch 'upstream' into emotes
2013-11-21 22:57:25 +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
249a308b5b
Add "score" command, which can be used by any user to view the current score of any other user (even across games). Also allows admins to modify a user's current score, which can be useful on private servers where admins are playing and can "repair" a score if someone gets disconnected or kicked accidentally.
2013-11-15 23:27:30 +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
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
Andy Janata
uecasm
Gavin Lambert
Matt Mullins