Commit Graph

300 Commits

Author SHA1 Message Date
Administrator d8e8185b5d Too tired to deal with git, so I just reforked to be even with @ajanata | 768f8f5a0a. 2015-02-22 00:49:45 -08:00
Andy Janata 768f8f5a0a update change logs 2015-02-21 20:06:35 -08:00
Andy Janata c49787d1df fix card set filters. fixes #114 2015-02-21 20:03:51 -08:00
Andy Janata bdf18c0423 Better handling of properties via Guice. Add property to turn off connect/disconnect notices. 2015-02-21 19:38:23 -08:00
Andy Janata 2ba7acc87c disable viewcards.jsp and remove its link as this can be a database DoS 2015-02-21 19:25:54 -08:00
Andy Janata f6c92be98a update google analytics code 2015-02-21 19:25:13 -08:00
Andy Janata b8e499647e add missing semicolon; pull pyx.properties properties out to build.properties 2015-02-21 18:09:43 -08:00
Andy Janata 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
Andy Janata 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
Andy Janata 2b84c84c0b fix cardsets.jsp not loading after adding cardcast support 2015-02-15 18:48:30 -08:00
Andy Janata 94bce3b416 remove local jars and add missing dependency to pom 2015-02-15 17:50:31 -08:00
Andy Janata 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
David R. Bild 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
Andy Janata 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
Andy Janata 05239299e3 Initial Cardcast UI, with chat commands. Javascript formatter stuff in the project. 2014-08-10 22:16:15 -07:00
Andy Janata 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
Andy Janata 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
John Hutchison 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
John Hutchison 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
uecasm f14348ab01 Fix a couple of missed changes. 2014-04-09 00:15:03 +12:00
uecasm 417c97f1b3 Refactor game options into subobject. 2014-04-08 23:20:40 +12:00
Andy Janata 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
Andy Janata 0264de8035 tweak user/game limits again 2014-04-06 00:34:02 -07:00
Andy Janata 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
uecasm fadc80709b Since we already have a handy list of Admins, why not use it? (Fixes TODO.) 2014-04-02 23:19:50 +13:00
Andy Janata 93203d3029 Update changelog. 2014-02-17 11:34:36 -08:00
Andy Janata 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
Andy Janata d027e0d175 Only show "hand" cursor over cards in your hand, not the entire area. Fixes #34. 2014-02-16 22:40:47 -08:00
Andy Janata 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
Andy Janata 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
Andy Janata ed3e619883 update changelog 2014-01-26 10:15:21 -08:00
Andy Janata 50666cee12 change google analytics url 2014-01-26 10:15:13 -08:00
Andy Janata 65830a11fc increase user/game limits 2014-01-26 10:14:59 -08:00
Andy Janata 0a349cd04f Merge pull request #81 from uecasm/typo1
Fix typo in HTML.
2014-01-25 07:56:43 -08:00
Andy Janata 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
uecasm 82272a7035 Fix typo in HTML. 2014-01-25 00:46:13 +13:00
uecasm bb83cef8a3 Add a button to Stop an in-progress game. 2014-01-25 00:33:15 +13:00
uecasm 8bca23ed9d Keep playfield intact when players join/leave. 2014-01-25 00:17:09 +13:00
Andy Janata 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
Andy Janata 0bdf8b60bd update changelog 2013-12-22 12:11:37 -08:00
Andy Janata 77151e327b Let all players adjust the 'hide password' checkbox. 2013-12-07 19:40:29 -08:00
Andy Janata f7b3a48010 Fix cookie domain, and increase user cap. 2013-12-02 04:59:14 +00:00
Andy Janata d03eaf88c1 changelog 2013-12-02 04:53:53 +00:00
Andy Janata 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
Andy Janata 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
Andy Janata 00d93e73ab update changelog 2013-12-01 18:05:54 +00:00
Andy Janata 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
Andy Janata ef4c172fca add cookie domain to pyx.properties so all servers can share the same cookie 2013-11-30 22:35:53 -08:00
Andy Janata 7be74010a6 properties file support for game and player limits. add this information to stats.jsp 2013-11-30 22:09:55 -08:00
Andy Janata 3ecb4f59a6 Merge branch 'score-cmd' of https://github.com/uecasm/PretendYoureXyzzy into uecasm-score-cmd 2013-11-30 05:04:09 +00:00