Commit Graph

440 Commits

Author SHA1 Message Date
Andy Janata 4a023e2986 update eclipse settings so it can deal with jsp files properly 2015-02-21 18:10:38 -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 07e2ac72c4 sqlite support for local cards 2015-02-15 17:29:45 -08:00
Andy Janata 737b468ad4 update sql dump 2015-02-15 12:26:13 -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
Andy Janata 90c133587a ACTUALLY fix /removecardcast 2014-09-13 16:03:57 -07:00
Andy Janata 72edc11ebf Merge pull request #118 from drbild/patch-1
correctly render cardcast codes with leading zeros
2014-09-13 15:34:32 -07: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 9903bbae55 Merge pull request #113 from Vir4030/cardcast
Cardcast formatting fix
2014-08-21 20:42:15 -07:00
Vir4030 05325c01bc convert cardcast white cards into pyx format
capitalize the first letter and add a period if there's no punc
2014-08-21 22:02:20 -05:00
Vir4030 5b43fd1dd0 convert cardcast white cards into pyx format
capitalize the first letter and add a period if there's no punctuation
at the end of the card
2014-08-21 21:43:18 -05:00
Andy Janata 1d98a78f8c Add Cardcast decks in use to log output when starting game 2014-08-14 08:29:48 -07:00
Andy Janata 194cf11c7f fix /removecardcast 2014-08-12 19:42:38 -07:00
Andy Janata 9d894f747a Actually use the goddamn cardcast decks. 2014-08-12 19:28:34 -07: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 8638dcadd4 Initial Cardcast support. Hard-coded to pull the Reject Pack for testing.
WARNING: This disables the JVM's SSL certificate checking, and only allows 'api.cardcastgame.com' when checking hosts. The proper solution would be to ensure that the JVM's trust store will accept that certificate.
2014-08-10 15:55:43 -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 3acc200bf0 switch to java 7 2014-08-10 14:50:56 -07:00
Andy Janata c7a130b4ee fix a warning from #101 2014-07-19 13:28:50 -07:00
Andy Janata 740abc0900 Fix a compile error from #101 2014-07-19 13:27:02 -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
Andy Janata dae20ee332 Merge pull request #101 from uecasm/options
Refactor game options into subobject.
2014-04-30 23:46:48 -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 a0e9c1d974 Improve logging. Stop using toString() on Player/User outside of logging. 2014-04-06 01:00:15 -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 de65ad2383 Don't load card sets until the game starts. Loading every card for every selected card set every time any option changed was a stupid idea. 2014-02-22 19:03:27 -08:00
Andy Janata 93203d3029 Update changelog. 2014-02-17 11:34:36 -08:00
Andy Janata e183cf5ffb Explicitly declare we want 1.6.0_45. Remove 1.7-only method call. 2014-02-17 11:34:28 -08:00
Andy Janata 6a158cde8f update sql dump 2014-02-16 23:04:35 -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 0e45c4f886 Switch to using a ScheduledThreadPoolExecutor instead of a Timer for scheduled tasks. This will allow 2 * CPU count threads to handle background tasks instead of using a single thread, which could cause the server to effectively die if a task gets stuck for some reason. This addresse the symptom of #89, but not the cause (which is yet to be determined). 2014-02-16 00:43:13 -08:00
Andy Janata fd3dce4c62 Reduce Hibernate Session lifetimes for games, which may be related to #89. Now, we're loading the cards out of the database when the game host tells us which card sets to use, and never touching the database again if the card sets never change.
Also, don't load every card in every card set when loading the card sets when a player connects to the server. We only need a count of the cards in the card set at that point.
2014-02-16 00:18:54 -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