Commit Graph

7203 Commits

Author SHA1 Message Date
Christian 'ketura' McCarty
fcac24c02d log4j fixes
Renamed and moved the log4j xml to the proper location in gemp-lotr-server to be found on startup.  Added the log folder to gitignore.  Put references to log4j in all project pom.xml files.
2021-01-26 20:33:22 -06:00
Christian 'ketura' McCarty
167ff78801 Code reformat
Reformatted new unit tests to follow existing java style.  Fleshed out existing helper functions to have shadow variants where any freeps variants existed.
2021-01-26 01:11:02 -06:00
Christian 'ketura' McCarty
2a08b6c063 Set up individual card unit testing
Added GenericCardTest, a helper class that extends AbstractAtTest with a focus on easily and clearly setting up unit tests for testing the implementation of card game text.  Set up the PC errata for Elrond, Lord of Rivendell as a proof of concept.
2021-01-26 00:47:46 -06:00
Christian 'ketura' McCarty
ef901ca907 FOTR Errata
Added all set 1 errata and a couple set 2 errata.  Hooked up the images and rarities.
2021-01-24 11:05:22 -06:00
Christian 'ketura' McCarty
a5987b1a70 Fixing missing rarities for errata test 2021-01-22 12:41:10 -06:00
Christian 'ketura' McCarty
6ed561b89a Fixing server crash when a rarity is not provided for a card 2021-01-22 12:40:51 -06:00
Christian 'ketura' McCarty
68d35845dc Merge branch 'master' into card-dev 2021-01-22 03:22:26 -06:00
Christian 'ketura' McCarty
ad9ac42b91 Merge remote-tracking branch 'marcin/master' 2021-01-22 03:22:05 -06:00
Christian 'ketura' McCarty
15646a9cf7 Testing concealed inclusion 2021-01-22 02:05:14 -06:00
marcin.sciesinski
7669779bb5 Fixed all reported issues 2021-01-19 14:13:25 -08:00
marcin.sciesinski
ca5a95daae Added LiberaPay donations and removed the Covid theme 2021-01-16 13:37:13 -08:00
marcin.sciesinski
7bb28ec721 Consolidating card resolving 2021-01-16 13:21:40 -08:00
marcin.sciesinski
601b3c4764 Consolidating card resolving 2021-01-16 13:14:34 -08:00
marcin.sciesinski
0b21422f0e Consolidating self resolving 2021-01-16 12:34:10 -08:00
marcin.sciesinski
735dafce14 Consolidating memory resolving 2021-01-16 12:25:22 -08:00
marcin.sciesinski
d513fc8820 Cleaning up 2021-01-15 15:54:19 -08:00
marcin.sciesinski
33d0cc9a6d Fixed issue with checking playability for cards playing themselves from discard 2021-01-15 15:35:04 -08:00
marcin.sciesinski
c4cb1d7768 Fixed Azog (or any card playing another card) interaction with Rivendell 2021-01-15 15:00:14 -08:00
marcin.sciesinski
19a36808f1 Fixed Ulaire Nartea (and all other cards using Duplicate or Optional effect) to not be able to play cards from discard on Great River 2021-01-15 11:10:07 -08:00
marcin.sciesinski
df41bc41f5 Added test for "The Balrog, Flame of Udun" 2021-01-15 10:34:46 -08:00
marcin.sciesinski
ef2b6ae805 Added test for "The Balrog, Flame of Udun" 2021-01-15 10:32:50 -08:00
marcin.sciesinski
f54363f2ef Added test for "They Are Coming" 2021-01-15 10:18:58 -08:00
Marcin Sciesinski
74f8afc744 Merge pull request #88 from PhallenCassidy/patch-1
Removing Forces of Mordor from Fellowship R-list
2021-01-13 23:27:16 +07:00
Christian 'ketura' McCarty
9d62d4bb03 Merge branch 'master' into card-dev 2021-01-09 02:13:00 -06:00
Christian 'ketura' McCarty
89749672ba Altered docker compose file to be parameterized. 2021-01-09 02:12:21 -06:00
Christian 'ketura' McCarty
f6493a1ecd Checking in stubs for the FOTR starter supplements
Added set 21, which is intended to represent set 1+.  Added this set to the card builder.  Added a PC FOTR format.  Updated the Race enum to include Warg.
2021-01-06 00:15:56 -06:00
Christian 'ketura' McCarty
8ba8c6fd1f Default docker config changes and startup improvements
Altered the default configuration to be more compatible with parallel installations out-of-the-box.  Added a SQL script that runs when the database is first created to add a pair of default users.
2021-01-05 21:07:49 -06:00
Christian 'ketura' McCarty
55e7fc1645 Docker file cleanup
Cleaned up and simplified all docker files to remove all commented-out lines (now that they are in VC).  Removed obsolete files.  Cleaned up the readme.txt to make all the specific steps clearer and to remove excess chatty language.
2021-01-05 14:06:41 -06:00
Christian 'ketura' McCarty
77ff3ad4f4 Merge remote-tracking branch 'marcin/master' 2021-01-03 13:36:24 -06:00
Christian 'ketura' McCarty
96828398d2 Committing missed *.env file and including a readme explaining how to set up docker and how to host/compile/run gemp using this repository. 2020-12-12 00:48:58 -06:00
PhallenCassidy
f61ce177ef Removing Forces of Mordor from Fellowship R-list 2020-11-30 10:08:54 -05:00
Marcin Sciesinski
8a2d3b66b9 Merge pull request #81 from PhallenCassidy/set40
Hiding set 40
2020-11-26 00:58:04 +07:00
Marcin Sciesinski
bcb9e7cf62 Merge pull request #80 from PhallenCassidy/deck-import
Deck import tool
2020-11-26 00:57:51 +07:00
PhallenCassidy
344c1f2fb6 Corrected "Not Bound To His Fate" twilight cost 2020-11-24 12:03:54 -05:00
PhallenCassidy
f143a2371a Corrected Typo 2020-09-26 22:34:19 -04:00
PhallenCassidy
8ceee984be Corrected typo 2020-08-25 20:48:19 -04:00
Phallen Cassidy
8c371f8b8c Removing set 40 after website went down 2020-08-13 21:56:04 -04:00
PhallenCassidy
b708064499 Moved Deck Import Button
Muscle memory takes me to the last button to open the stored decks every time.
2020-07-27 08:07:38 -04:00
Christian 'ketura' McCarty
79ff6d7da7 Docker rough draft works
Created a docker-compose script with 2 containers, one for the app/web, and one for the db.  This will in the future ideally be split into 3, one each for app/db/web, but baby steps.  Committing before I accidentally break it again.
2020-07-27 03:06:25 -05:00
Phallen Cassidy
c203fe0399 Corrected card names 2020-07-22 14:22:38 -04:00
Phallen Cassidy
4812bc6976 Deck import tool 2020-07-22 13:28:47 -04:00
marcin.sciesinski
4595ae17e6 Updated to Netty version 4. 2020-05-06 06:48:43 -07:00
marcin.sciesinski
de557f71bd Updated to Netty version 4. 2020-05-06 06:46:16 -07:00
marcin.sciesinski
ac1462f490 Refactored out Http handling out of server itself 2020-05-06 03:29:43 -07:00
marcin.sciesinski
83172e7add Update to latest version of Netty. 2020-05-06 02:48:44 -07:00
marcin.sciesinski
8c8afe7458 Merge remote-tracking branch 'origin/master' 2020-05-06 02:10:24 -07:00
marcin.sciesinski
42a6a2fccd Checking Origin header, only if it is sent in. 2020-05-06 02:10:03 -07:00
Marcin Sciesinski
e09b9df9b9 Merge pull request #76 from dmasalin/patch-45
Add some crowd control support for Hunters Sealed
2020-05-01 14:13:44 -07:00
marcin.sciesinski
ef4acdde24 Added same Origin protection for API calls 2020-05-01 09:45:12 -07:00
dmasalin
e75e5716c0 Add some crowd control support for Hunters Sealed 2020-04-25 10:57:40 -04:00