Christian 'ketura' McCarty
88cc4ed21c
Merge branch 'master' into gemp-dev
2021-02-24 21:57:40 -06:00
Marcin Sciesinski
1d1d2e4297
Merge pull request #94 from PhallenCassidy/lotr-fixes
...
Lotr fixes
2021-02-25 00:23:04 +07:00
marcin.sciesinski
de22c9fd44
Fixed problem with Glorfindel
2021-02-22 10:19:52 -08:00
marcin.sciesinski
a23efdc542
Fixed problem with Glorfindel
2021-02-22 10:13:40 -08:00
marcin.sciesinski
aba6e3e2a1
Fixed case-problem with site detection
2021-02-22 09:11:58 -08:00
marcin.sciesinski
88f8e3bab6
Improving the client side performance - doing just one layout after all cards are added
2021-02-22 09:10:16 -08:00
marcin.sciesinski
235a76f067
Deck building's import now respects card counts
2021-02-22 09:05:08 -08:00
Christian 'ketura' McCarty
18b9dd3e6e
Merge branch 'gemp-dev' into card-dev
2021-02-21 18:36:27 -06:00
Christian 'ketura' McCarty
ae83ccf9e5
Merge branch 'master' into gemp-dev
2021-02-21 18:31:24 -06:00
Christian 'ketura' McCarty
518da3c40b
Merge branch 'gemp-dev' into card-dev
2021-02-21 18:12:22 -06:00
Christian 'ketura' McCarty
8b7e46e1b1
Fixed errata slash handling to include all PC errata sets and not just 51
2021-02-21 17:58:39 -06:00
Christian 'ketura' McCarty
3eb5ada978
Merge branch 'gemp-dev' into card-dev
2021-02-21 17:54:14 -06:00
Christian 'ketura' McCarty
05dc479a71
Changed hasErrata function in the front end to apply errata div slash to all set 51 cards.
2021-02-21 17:53:36 -06:00
PhallenCassidy
cb1ceba250
Merge branch 'master' into lotr-fixes
2021-02-21 10:11:00 -05:00
marcin.sciesinski
9c82ceecde
Jarnsmid modifies cost only of your cards
2021-02-19 13:29:30 -08:00
marcin.sciesinski
4b8bd7d14c
Revert NPE fix - it should throw a problem.
2021-02-19 13:23:13 -08:00
marcin.sciesinski
caa1c9699d
Fixing a weird NPE, probably because of some card that was removed
2021-02-19 13:20:32 -08:00
Phallen Cassidy
ea460a13e9
Performing player specified in chat log
2021-02-19 11:43:20 -05:00
Phallen Cassidy
e300b37630
Discard from play checks performing player
...
instead of only card owner
2021-02-19 11:33:53 -05:00
Phallen Cassidy
4bc9076594
Mordor Assassin
...
No longer crashes the game if the RB is overwhelmed
2021-02-19 08:42:41 -05:00
Phallen Cassidy
09ad118f5d
Narya, Ring of Fire
2021-02-19 08:15:26 -05:00
Phallen Cassidy
910aef1216
Jarnsmid, Merchant from Dale
...
No longer discounts Shadow items
2021-02-19 08:13:22 -05:00
marcin.sciesinski
bf129ce387
Getting rid of the MtG stuff in the project
2021-02-18 21:32:15 -08:00
marcin.sciesinski
81fb37cc67
Fixed ConcurrentModificationException
2021-02-16 23:09:21 -08:00
marcin.sciesinski
cb8621e2f4
Fixed ByteBuffer memory leak
2021-02-16 23:01:20 -08:00
marcin.sciesinski
937351bce3
Replaced try {...} finally {...} with try (resource) {...}
2021-02-16 22:45:14 -08:00
Marcin Sciesinski
9ddf4d25a9
Merge pull request #91 from PhallenCassidy/hobbit-random-draft
...
Hobbit Draft Overhaul
2021-02-17 13:23:21 +07:00
Marcin Sciesinski
a51d95e015
Merge pull request #93 from PlayersCouncil/gemp-improvements
...
Gemp improvements
2021-02-17 13:22:56 +07:00
marcin.sciesinski
158f7ae447
Added .gitignore
2021-02-16 22:20:45 -08:00
marcin.sciesinski
d019180bad
Fixed possible parsing issue
2021-02-16 22:15:22 -08:00
Christian 'ketura' McCarty
f3579adea6
Merge branch 'gemp-dev' into card-dev
2021-02-15 12:50:10 -06:00
Christian 'ketura' McCarty
e71b03e77d
Merge remote-tracking branch 'marcin/master' into gemp-dev
2021-02-15 12:49:35 -06:00
Christian 'ketura' McCarty
cdcf986262
Fixing the new 51/101 sets not showing up in the deckbuilder set filter UI
2021-02-15 12:23:58 -06:00
Christian 'ketura' McCarty
1bd2e2b001
Fixed Gimli errata test (site 3 in movie is underground)
2021-02-15 11:43:54 -06:00
Christian 'ketura' McCarty
863279c6b9
Fixing set 101 and 51 cards still being listed as 21 in various places, including unit tests.
2021-02-15 11:37:07 -06:00
Christian 'ketura' McCarty
7823c36fcf
Rearranged PC set numbering
...
Moved all errata cards to set 51 (with the intent being to use sets 50-69 as errata proxies for sets 0-19). Moved original PC cards to set 101, with the intent being for sets 101-119 to reflect supplements for sets 1-19, and sets 120+ to be original PC sets.
2021-02-15 11:21:13 -06:00
Christian 'ketura' McCarty
b6a15e14fb
Importing format changes from playtest branch
2021-02-15 11:17:16 -06:00
marcin.sciesinski
a22d9c0b9b
Simplified deck import
2021-02-08 15:16:30 -08:00
Christian 'ketura' McCarty
dc3e9db40c
Fixing a typo in the errata image for Whisper in the Dark
2021-02-08 11:47:24 -06:00
Phallen Cassidy
af51b2830a
Corrected overwhelm multiplier text
2021-02-08 09:26:35 -05:00
Christian 'ketura' McCarty
a2906e6956
Fixing HttWC strength 7 -> 8
2021-02-07 11:11:07 -06:00
Christian 'ketura' McCarty
5e643e59e0
merging gemp improvements branch into card-dev
2021-02-06 20:11:31 -06:00
Christian 'ketura' McCarty
166ba64228
Converting all errata images to jpg and replacing their images with output from the PC card generator. Edited the errata image javascript to read all images from the dictionary instead of just pngs.
2021-02-06 20:08:24 -06:00
Christian 'ketura' McCarty
7ba8203fa6
Adding new PC keywords Concealed and Exposed, with associated rules and unit tests. Adding new PC race Warg. Adding new PC possession type Pony.
2021-02-06 19:11:09 -06:00
Christian 'ketura' McCarty
6465cbfb35
Updated PreventWound to permit memorizing of the unit that had its wound prevented. Updated RevealCardsFromHand to permit targeting either player. Added CantBeAssignedToSkirmish modifier (mostly for Saruman's sake).
2021-02-06 19:06:41 -06:00
Christian 'ketura' McCarty
dadd6c4479
Added new filters for picking allies in a given region, or the fellowship's current region. Altered blueprint ally home definition to support multiple home sites.
2021-02-06 19:02:20 -06:00
Christian 'ketura' McCarty
246e4a6274
Fixing typos in messages.
2021-02-06 18:57:44 -06:00
Christian 'ketura' McCarty
998acd4888
Added some package namespaces for less haphazard individual card testing. Added GenericCardTestHelper, which is intended to be used to make unit tests less obscure. Altered the default AbstractAtTest format to multipath instead of movie.
2021-02-06 18:54:34 -06:00
Christian 'ketura' McCarty
da7da8b8b6
Fixing some server crashes caused by malformed json card definitions.
2021-02-06 18:52:39 -06:00
Christian 'ketura' McCarty
a23d2ae7d1
log4j fixes that prevent constant log spam and actually pipes the output of log errors to file
2021-02-06 18:44:08 -06:00
