Christian 'ketura' McCarty
|
eb54ab7f95
|
Merge branch 'grand-card-rework' into v2-cards
# Conflicts:
# gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
|
2024-10-30 21:34:12 -05:00 |
|
Christian 'ketura' McCarty
|
dd7f189a91
|
Fixing hobbit fix
|
2024-10-30 20:20:23 -05:00 |
|
Christian 'ketura' McCarty
|
f7ec85f803
|
Merge remote-tracking branch 'marcin/grand-card-rework' into grand-card-rework
|
2024-10-30 19:58:59 -05:00 |
|
Christian 'ketura' McCarty
|
df88f90568
|
Merge branch 'master' into grand-card-rework
# Conflicts:
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson
|
2024-10-30 19:55:04 -05:00 |
|
Christian McCarty
|
79ccf6cfa2
|
Merge pull request #120 from PhallenCassidy/patch-3
Fix for Moon-letters
|
2024-10-30 12:02:07 -05:00 |
|
PhallenCassidy
|
d13ec7c177
|
Fix for Moon-letters
Choice effects were swapped, they now line up with the text as expected.
|
2024-10-30 13:01:02 -04:00 |
|
Christian 'ketura' McCarty
|
e7b0818315
|
bad URL copy-paste
|
2024-10-29 21:49:12 -05:00 |
|
Christian 'ketura' McCarty
|
04f9219c83
|
2024 WC Promos
|
2024-10-29 21:45:42 -05:00 |
|
Christian 'ketura' McCarty
|
972d198cac
|
helper db script updates
|
2024-10-28 22:25:40 -05:00 |
|
Christian 'ketura' McCarty
|
9eb03df677
|
Unlocking full art Greenleaf and unbranded Goblin Runner for the PC promo packs
|
2024-10-27 20:02:05 -05:00 |
|
Christian 'ketura' McCarty
|
1ef242549a
|
Updating WC verbiage hack
|
2024-10-25 19:07:23 -05:00 |
|
Christian 'ketura' McCarty
|
f35970339b
|
Updating WC table verbiage
|
2024-10-19 07:09:53 -05:00 |
|
Marcin Sciesinski
|
70a97c0b0a
|
Merge remote-tracking branch 'upstream/grand-card-rework' into grand-card-rework
# Conflicts:
# gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
|
2024-10-18 22:14:47 +07:00 |
|
Marcin Sciesinski
|
42b9c57fca
|
Added more ATs
|
2024-10-18 22:12:40 +07:00 |
|
Christian 'ketura' McCarty
|
f2d642e839
|
Merge branch 'master' into grand-card-rework
# Conflicts:
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson
# gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
# gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java
# gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_224_Tests.java
# gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_338_Tests.java
|
2024-10-18 08:09:57 -05:00 |
|
Christian 'ketura' McCarty
|
9e6ebda4ed
|
Fleshing out RTIM test conclusion
|
2024-10-18 07:47:22 -05:00 |
|
Christian McCarty
|
4ae761e0ad
|
Merge pull request #118 from MarcinSc/master
Fixed issue with cards creating assignments during fierce skirmish
|
2024-10-18 07:33:05 -05:00 |
|
Marcin Sciesinski
|
f2fbe43ae7
|
Added more ATs
|
2024-10-18 17:26:13 +07:00 |
|
Marcin Sciesinski
|
b9546e5cc8
|
Merge remote-tracking branch 'upstream/grand-card-rework' into grand-card-rework
|
2024-10-18 15:10:50 +07:00 |
|
Marcin Sciesinski
|
f4ce01fc12
|
Fixed issue with cards creating assignments
|
2024-10-18 13:32:04 +07:00 |
|
Marcin Sciesinski
|
13fe76fcb9
|
Fixed issue with cards creating assignments
|
2024-10-18 13:31:24 +07:00 |
|
Marcin Sciesinski
|
010401554f
|
Fixed issue with cards creating assignments
|
2024-10-18 13:28:54 +07:00 |
|
Marcin Sciesinski
|
35ea56778a
|
Fixed issue with cards creating assignments
|
2024-10-18 13:23:32 +07:00 |
|
Marcin Sciesinski
|
f8d20f061b
|
Added more ATs
|
2024-10-18 12:48:50 +07:00 |
|
Christian 'ketura' McCarty
|
6dda33292b
|
Added unit tests to attempt and fix a bug with Return to its Master
|
2024-10-18 00:41:25 -05:00 |
|
Christian 'ketura' McCarty
|
66fa538dbc
|
Updating WC Swiss rounds from 8 to 10
|
2024-10-18 00:37:18 -05:00 |
|
Christian 'ketura' McCarty
|
5505bd346e
|
Fixed Ulaire Nertea causing Ford of Bruinen to apply its discount to all Nazgul played by Nertea's ability
|
2024-10-17 22:19:22 -05:00 |
|
Marcin Sciesinski
|
6854cd5bcc
|
Added more ATs
|
2024-10-17 21:30:56 +07:00 |
|
Marcin Sciesinski
|
c21c31a596
|
Added more ATs
|
2024-10-17 16:06:22 +07:00 |
|
Marcin Sciesinski
|
6dd2972c41
|
Added more ATs
|
2024-10-17 12:44:13 +07:00 |
|
Christian 'ketura' McCarty
|
a1d6ef18f6
|
Re-committing V2 changes that somehow got swallowed during branch-swapping.
|
2024-10-16 22:12:23 -05:00 |
|
Christian 'ketura' McCarty
|
ce230b9374
|
Adjusting V2 unit tests to match previous tweak
|
2024-10-16 21:50:34 -05:00 |
|
Christian 'ketura' McCarty
|
20ad2d30ab
|
Merge branch 'grand-card-rework' into v2-cards
|
2024-10-16 21:33:27 -05:00 |
|
Christian 'ketura' McCarty
|
2d4b5a11d3
|
Converting master fixes to grand card rework paradigms
|
2024-10-16 21:32:53 -05:00 |
|
Christian 'ketura' McCarty
|
947c2d3266
|
Fixing V2 Eastement Hills discarding from play and not from hand
|
2024-10-16 20:29:18 -05:00 |
|
Christian 'ketura' McCarty
|
5620ed6ff9
|
Merge branch 'grand-card-rework' into v2-cards
|
2024-10-16 20:27:23 -05:00 |
|
Christian 'ketura' McCarty
|
5880534d91
|
Merge branch 'master' into grand-card-rework
# Conflicts:
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Elven-errata.hjson
# gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_363_Tests.java
|
2024-10-16 20:27:02 -05:00 |
|
Christian 'ketura' McCarty
|
7d065bd550
|
Fixing Glimpse of Fate PC errata being required instead of optional
|
2024-10-16 18:16:02 -05:00 |
|
Marcin Sciesinski
|
0cd76e2cb7
|
Added more ATs
|
2024-10-17 03:07:01 +07:00 |
|
Marcin Sciesinski
|
06c7db4a6b
|
Added more ATs
|
2024-10-17 02:31:53 +07:00 |
|
Marcin Sciesinski
|
5400954588
|
Added more ATs
|
2024-10-17 01:49:26 +07:00 |
|
Marcin Sciesinski
|
5a32d8d20b
|
Added more ATs
|
2024-10-16 20:15:01 +07:00 |
|
Marcin Sciesinski
|
13de59179b
|
Added more ATs
|
2024-10-16 19:11:38 +07:00 |
|
Marcin Sciesinski
|
7507fc860d
|
Added tests for discounts and assignment costs
|
2024-10-15 00:03:58 +07:00 |
|
Christian 'ketura' McCarty
|
be20092bc8
|
Fixing Nertea and Tol Brandir playing one more minion than the player asked for
|
2024-10-07 09:09:57 -05:00 |
|
Christian 'ketura' McCarty
|
d3bf3de7f0
|
Deleting card.
|
2024-09-29 22:30:28 -05:00 |
|
Christian 'ketura' McCarty
|
e5bc543cce
|
Converting invitation to a tautological card instead of a card.
|
2024-09-29 22:29:44 -05:00 |
|
Christian 'ketura' McCarty
|
e20bf34fa0
|
Altered tournament rewards boosters to include far more PC promos more frequently. Added do-nothing promo "card" for the 2024 WC invitation.
|
2024-09-29 22:17:44 -05:00 |
|
Christian 'ketura' McCarty
|
626d8d5583
|
Fixing V2 Balrog threat trigger not being optional
|
2024-09-27 14:32:29 -05:00 |
|
Christian 'ketura' McCarty
|
8a483c4427
|
V2 Card title typo
|
2024-09-27 13:49:35 -05:00 |
|