MarcinSc
|
ef7b427dd5
|
Merge remote-tracking branch 'upstream/grand-card-rework' into Converting-set-7-to-hjson
# Conflicts:
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Raider.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Ringwraith.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Rohan.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Sauron.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Shire.hjson
# gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_103_ErrataTests.java
|
2024-05-13 17:49:33 +07:00 |
|
MarcinSc
|
8b805959ac
|
Migrated Site cards in set 7 to hjson
|
2024-05-13 17:44:48 +07:00 |
|
MarcinSc
|
5a4259f964
|
Migrated Shire cards in set 7 to hjson
|
2024-05-13 17:12:20 +07:00 |
|
MarcinSc
|
8975ff1221
|
Migrated Sauron cards in set 7 to hjson
|
2024-05-13 16:52:18 +07:00 |
|
MarcinSc
|
959e02f198
|
Migrated Sauron cards in set 7 to hjson
|
2024-05-13 16:27:18 +07:00 |
|
MarcinSc
|
da54137936
|
Migrated Rohan cards in set 7 to hjson
|
2024-05-08 14:02:16 +07:00 |
|
Christian 'ketura' McCarty
|
42874ae705
|
Merge branch 'master' into grand-card-rework
|
2024-05-03 00:48:49 -05:00 |
|
Christian 'ketura' McCarty
|
3f63d8865b
|
Merge remote-tracking branch 'marcin/Converting-set-7-to-hjson' into grand-card-rework
# Conflicts:
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Dwarven.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Elven.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gandalf.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gollum.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gondor.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set7-gollum-freeps.hjson
|
2024-05-03 00:44:13 -05:00 |
|
Christian 'ketura' McCarty
|
0a836eeab7
|
Fixing existing unit tests. Fixing Towers Sam having 6 resistance.
|
2024-05-03 00:39:22 -05:00 |
|
Christian 'ketura' McCarty
|
245ad8605c
|
Mass regenerating unit tests
|
2024-05-03 00:29:54 -05:00 |
|
Christian 'ketura' McCarty
|
abf7a1bad4
|
Regenerating stubs; improvements include handling of resistance, target, and event default effects.
|
2024-05-03 00:14:27 -05:00 |
|
Christian 'ketura' McCarty
|
e457287c1b
|
Fixing sealed league json cap serialization snafu
|
2024-04-29 19:44:00 -05:00 |
|
MarcinSc
|
2d6f81e361
|
Migrated Ringwraith cards in set 7 to hjson
|
2024-04-29 13:00:52 +07:00 |
|
MarcinSc
|
0af7fc536a
|
Migrated Raider cards in set 7 to hjson
|
2024-04-29 10:37:09 +07:00 |
|
Christian 'ketura' McCarty
|
6299ceadc0
|
Adding promos for April weekend league
|
2024-04-28 22:19:27 -05:00 |
|
MarcinSc
|
35a1038172
|
Migrated Gondor cards in set 7 to hjson
|
2024-04-28 00:17:27 +07:00 |
|
MarcinSc
|
7157363214
|
Migrated Gollum cards in set 7 to hjson
|
2024-04-27 22:29:09 +07:00 |
|
MarcinSc
|
3c8ae395e1
|
Migrated Gollum cards in set 7 to hjson
|
2024-04-27 22:22:37 +07:00 |
|
MarcinSc
|
c7bee75744
|
Migrated Gandalf cards in set 7 to hjson
|
2024-04-27 20:34:46 +07:00 |
|
MarcinSc
|
c7d7cf51ea
|
Migrated Elven cards in set 7 to hjson
|
2024-04-27 19:39:10 +07:00 |
|
Christian 'ketura' McCarty
|
1661be53b8
|
Fixed Murder of Crows self-discarding
|
2024-04-26 09:25:31 -05:00 |
|
Christian 'ketura' McCarty
|
c0d85c4427
|
Fixing card image reference snafus with the Barlimen/Elronds errata.
|
2024-04-24 22:00:50 -05:00 |
|
Christian 'ketura' McCarty
|
4c290e8470
|
Fixing card image reference snafus with the Barlimen/Elronds errata.
|
2024-04-24 21:58:38 -05:00 |
|
Christian 'ketura' McCarty
|
9d96c056d3
|
Merge branch 'master' into grand-card-rework. Had to manually merge the yuletide errata changes.
# Conflicts:
# gemp-lotr/docker/docker-compose.yml
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-elven.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Sauron-errata.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Gandalf-errata-playtest.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set01-Gondor-errata-playtest.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set03-Sauron-errata-playtest.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set08-Raider-errata-playtest.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/yuletide/set101-Isengard-errata-playtest.hjson
# gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/BuiltLotroCardBlueprint.java
# gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
|
2024-04-24 21:23:42 -05:00 |
|
Christian 'ketura' McCarty
|
3b74de7f9b
|
Fixing json capitalization in league admin page
|
2024-04-24 01:02:09 -05:00 |
|
MarcinSc
|
4eb1877eeb
|
Migrated Dwarven cards in set 7 to hjson
|
2024-04-23 12:46:08 +07:00 |
|
MarcinSc
|
ad3c70b2a4
|
Migrated Ring cards in set 7 to hjson
|
2024-04-23 12:12:51 +07:00 |
|
Christian 'ketura' McCarty
|
d4cc5c0085
|
Fixing the wrong replay binding getting removed from the docker compose a year ago
|
2024-04-22 22:23:44 -05:00 |
|
Christian 'ketura' McCarty
|
b32a9ad123
|
Fixing deck sharing feature double-applying navigation prefix
|
2024-04-22 19:49:14 -05:00 |
|
Christian 'ketura' McCarty
|
32b93a5761
|
Fixed pre-game panel showing in the distant background when reconnecting after the game starts
|
2024-04-22 19:44:59 -05:00 |
|
Christian 'ketura' McCarty
|
0b8d462894
|
Fixing the Weta Collection not being legal in WOTR Standard
|
2024-04-22 19:38:32 -05:00 |
|
Christian 'ketura' McCarty
|
8320f8bb62
|
Removing debugger statements
|
2024-04-22 19:33:40 -05:00 |
|
Christian 'ketura' McCarty
|
7b053ff747
|
Fixing broken server info post-json-upgrade
|
2024-04-22 19:32:46 -05:00 |
|
MarcinSc
|
f4a1c6c97d
|
Migrated Site cards in set 6 to hjson
|
2024-04-23 00:17:28 +07:00 |
|
MarcinSc
|
7778643846
|
Migrated Site cards in set 6 to hjson
|
2024-04-23 00:05:41 +07:00 |
|
MarcinSc
|
43a16b8a1d
|
Migrated Shire cards in set 6 to hjson
|
2024-04-22 23:57:56 +07:00 |
|
MarcinSc
|
00c0f59465
|
Migrated Sauron cards in set 6 to hjson
|
2024-04-22 23:39:44 +07:00 |
|
MarcinSc
|
e41842d94c
|
Migrated Rohan cards in set 6 to hjson
|
2024-04-22 23:18:48 +07:00 |
|
MarcinSc
|
9eaa6d0d51
|
Migrated Ringwraith cards in set 6 to hjson
|
2024-04-22 22:59:10 +07:00 |
|
MarcinSc
|
1cf74b3f6e
|
Migrated Raider cards in set 6 to hjson
|
2024-04-22 22:41:42 +07:00 |
|
MarcinSc
|
20a2c14f7a
|
Migrated Moria cards in set 6 to hjson
|
2024-04-22 22:33:49 +07:00 |
|
MarcinSc
|
84e7b73592
|
Migrated Isengard cards in set 6 to hjson
|
2024-04-22 22:24:49 +07:00 |
|
MarcinSc
|
a1ec82ac27
|
Migrated Gondor cards in set 6 to hjson
|
2024-04-22 18:27:35 +07:00 |
|
MarcinSc
|
1459592b70
|
Migrated Gollum cards in set 6 to hjson
|
2024-04-22 16:22:33 +07:00 |
|
MarcinSc
|
1bc25f6d94
|
Migrated Gandalf cards in set 6 to hjson
|
2024-04-22 15:59:34 +07:00 |
|
MarcinSc
|
4f43220f17
|
Migrated Elven cards in set 6 to hjson
|
2024-04-22 14:41:53 +07:00 |
|
Christian 'ketura' McCarty
|
7f9195a5df
|
Fixing more strict json errors
|
2024-04-22 02:23:27 -05:00 |
|
Christian 'ketura' McCarty
|
1bb32eb774
|
Fixing fastJson case-sensitive parsing striking again
|
2024-04-22 02:15:38 -05:00 |
|
MarcinSc
|
dcd758d768
|
Migrated Dwarven cards in set 6 to hjson
|
2024-04-22 14:15:12 +07:00 |
|
MarcinSc
|
887b723faf
|
Migrated Dunland cards in set 6 to hjson
|
2024-04-22 13:50:04 +07:00 |
|