Commit Graph

471 Commits

Author SHA1 Message Date
Andy Janata b5fef60a7e use constant value in error message 2017-02-20 16:50:01 -08:00
Andy Janata 32aac1bb15 update admin ip addresses, make chat spam filter more aggressive 2017-02-20 16:47:55 -08:00
Andy Janata f3f9dbe265 escape the set name and description too 2017-02-14 20:27:01 -08:00
Andy Janata d919c07a89 escape card text from cardcast. fixes xss issues. 2017-02-14 20:21:47 -08:00
Andy Janata 15aced170f add instructions on how to avoid buildnumber plugin errors to readme 2017-02-14 20:18:54 -08:00
Andy Janata a9d3fefd03 Merge pull request #148 from SSederberg/patch-1
Make the README file have the correct information.
2017-02-14 20:00:56 -08:00
Andy Janata 141876f0c7 Merge pull request #150 from rootatdebian/master
Fix typo of "hard" to "hand"
2017-02-14 20:00:19 -08:00
Andy Janata d206ed8384 another warning turned on in eclipse 2017-02-14 19:51:44 -08:00
Andy Janata a390743735 add git commit id to pyx.properties 2017-02-14 19:51:19 -08:00
Andy Janata eb66ccd054 Remove the CORS filter.
I've spent multiple hours trying to figure out why it isn't actually working, and at this point I'm giving up on it. If you want an alternate web UI, send pull requests or run your own servers. My servers will only officially support my UI, though you are free to use other UIs if you can make them work with them (but I provide no guarantees that updates won't break things).
2017-02-14 19:19:49 -08:00
rootatdebian 9a776fb801 Fix typo of "hard" to "hand" 2016-09-10 16:14:12 -04:00
Spencer S 1e23f40ef9 Update and rename README to README.md
The README file needs an update. As Eclipse will no longer compile the WAR correctly. Using Maven will compile PYX correctly.
2016-04-13 10:01:41 -05:00
Andy Janata a94b99fb58 Turn the CORS filter off since it isn't working for me and I don't have time to investigate right now. 2016-04-03 22:27:43 -07:00
Andy Janata 281ce6d8c0 Update card database dump. 2016-04-03 21:58:20 -07:00
Andy Janata 50d48e8b8d Merge pull request #146 from allquixotic/adjustable-timers
Feature: Adjustable timer multiplier instead of idle timer checkbox.
2016-04-03 21:38:23 -07:00
Andy Janata e79c44e672 Merge pull request #147 from allquixotic/update-jquery
Update jQuery and jQuery UI dependencies to the latest (1.x).
2016-04-03 21:37:16 -07:00
Andy Janata fad2225db7 Merge branch 'Voltasalt-master' 2016-04-03 21:33:15 -07:00
Andy Janata 00ee426d07 Merge branch 'master' of https://github.com/Voltasalt/PretendYoureXyzzy into Voltasalt-master 2016-04-03 21:32:39 -07:00
Sean McNamara ff6cc099df Fix substring math for timer duration. 2016-01-02 22:49:47 -05:00
Sean McNamara 795bf48fde Let game hosts adjust the timer duration as a multiplier of the defaults. 2016-01-02 22:07:39 -05:00
Sean McNamara ec859e37d0 Update jQuery and jQuery UI dependencies to the latest (1.x). 2016-01-02 20:25:32 -05:00
Andy Janata 3ba14f079c Skip blank text segments on cards from Cardcast, and skip white cards that are entirely blank 2015-09-12 09:16:40 -07:00
Andy Janata 7c2b08c81d Update admin IP address (really need to make this a config option...) 2015-09-12 09:14:34 -07:00
Andy Janata aa43eac98b Repackage timer tasks. Add new timer task to broadcast game list updates every 60 seconds instead of every time a game changes (massive bandwidth use). Change chat rate limit from 5 per 10 sec to 6 per 30 sec. 2015-05-03 13:52:05 -07:00
Andy Janata 7a574d39b8 Use hibernate second-level cache when loading card sets on initial page load. Room for improvement here by using a more production-ready cache provider, but the immediate need is to not crash the database server under crush load. 2015-02-28 11:58:47 -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 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
Voltasalt 872da6e275 Add CORS support 2014-11-08 22:00:24 +01: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