2ba7acc87c
disable viewcards.jsp and remove its link as this can be a database DoS
2015-02-21 19:25:54 -08:00
f6c92be98a
update google analytics code
2015-02-21 19:25:13 -08:00
b8e499647e
add missing semicolon; pull pyx.properties properties out to build.properties
2015-02-21 18:09:43 -08:00
359c5e1140
Remove the UI distinction for base decks, but the back-end stuff remains to be removed later.
2015-02-16 01:06:53 -08:00
ea36f82897
Count the number of cards added to the game and compare to known minimums (statically determined for black cards, and based on player limit for white cards). This allows games to run only on Cardcast decks. Fixes #125 .
...
Update my IP address for admin purposes.
2015-02-16 00:58:01 -08:00
2b84c84c0b
fix cardsets.jsp not loading after adding cardcast support
2015-02-15 18:48:30 -08:00
94bce3b416
remove local jars and add missing dependency to pom
2015-02-15 17:50:31 -08:00
832bcd8fc4
Maven support.
...
This is still a bit clunky, but it seems to be working. This supports running both with Jetty directly, and making a .war to throw at Tomcat. You will still need Postgres to run via Jetty; this is super useful for debugging in Eclipse.
mvn clean package war:exploded jetty:run
mvn clean package war:war
You will need to copy build.properties.example to build.properties and fill in the appropriate information.
Also, use correct date format in the cache filter, as Jetty is more strict.
2015-02-14 00:24:38 -08:00
1c154efcaf
correctly render cardcast codes with leading zeros
...
The /listcardcast output drops leading zeros from the deck codes, due to the string -> number -> string conversion process.
This commit fixes the displayed output by zero-padding the code to ensure it has the full five digits.
I don't know if this same issue manifests elsewhere.
2014-09-10 17:40:07 -05:00
d948ea3879
Fix my IP address. Display a header before listing Cardcast decks in use (which will still show up when no decks are in use, to make the feature more discoverable). Show Cardcast messages in game chat in blue.
2014-08-12 18:33:43 -07:00
05239299e3
Initial Cardcast UI, with chat commands. Javascript formatter stuff in the project.
2014-08-10 22:16:15 -07:00
f5060113db
Refactor CardSet, BlackCard, and WhiteCard to enable adding Cardcast card set support.
...
Blank white cards are no longer indicated by an ID of less than -1. There is a new field on WhiteCardData. (They will still have a negative ID, but so will external cards.)
2014-08-10 15:55:42 -07:00
1f06fb0fac
Merge pull request #107 from clutterskull/master
...
Adds a simple regex based filter to the game list.
2014-05-03 19:40:20 -07:00
1ebd5cf831
Filtering on keyup, error catching, empty filters
...
Binds filtering to keyup instead of keydown.
Catches invalid regular expression errors (filter is not set unless
valid).
Fixes empty filter not setting properly.
2014-05-03 18:03:39 -07:00
92cd5dcd32
Adds a simple regex based filter to the game list.
...
Adds cah.GameList methods for creating and applying the filter, as well
as a filter text input element next to the create game button. Filtering
is bound to the input keydown.
2014-04-29 20:59:41 -07:00
f14348ab01
Fix a couple of missed changes.
2014-04-09 00:15:03 +12:00
417c97f1b3
Refactor game options into subobject.
2014-04-08 23:20:40 +12:00
4dcf39f5b7
Merge pull request #100 from uecasm/admins
...
Since we already have a handy list of Admins, why not use it?
2014-04-06 15:12:09 -07:00
0264de8035
tweak user/game limits again
2014-04-06 00:34:02 -07:00
17b4e92113
Check the bounds of the numerical game options on the server, and reject settings out of range. Fixes #103 . No more games with 9001 blank white cards. Also use constants for all of those values for min/max/default.
2014-04-06 00:33:52 -07:00
fadc80709b
Since we already have a handy list of Admins, why not use it? (Fixes TODO.)
2014-04-02 23:19:50 +13:00
93203d3029
Update changelog.
2014-02-17 11:34:36 -08:00
5ad372ee19
Force a higher z-index when mousing over a card in your hand. This should help with the face-down cards other people have played covering your own hand while deciding what to play.
2014-02-16 22:45:22 -08:00
d027e0d175
Only show "hand" cursor over cards in your hand, not the entire area. Fixes #34 .
2014-02-16 22:40:47 -08:00
4448a90ccd
add background color to game options so they are readable when overlapping other UI elements. fixes #87
2014-02-16 22:37:17 -08:00
be7768e03b
Refactor preferences code out to its own file. Add game list filters, allowing users to ban and require card sets for a game to be in their game list.
2014-01-26 23:22:37 -08:00
ed3e619883
update changelog
2014-01-26 10:15:21 -08:00
50666cee12
change google analytics url
2014-01-26 10:15:13 -08:00
65830a11fc
increase user/game limits
2014-01-26 10:14:59 -08:00
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
Andy Janata
David R. Bild
John Hutchison
uecasm
Gavin Lambert