marcin.sciesinski
6834d5d3cf
Changed links to images to be on https
2021-03-20 09:25:27 -07:00
Christian 'ketura' McCarty
6c73323e55
Merge branch 'master' into gemp-dev
2021-03-20 11:15:05 -05:00
marcin.sciesinski
00fcb54d79
Fixed event serialization
2021-03-20 09:08:28 -07:00
Christian 'ketura' McCarty
5974a5402a
last-minute visual changes
2021-03-20 09:02:57 -05:00
Christian 'ketura' McCarty
59f54e2c44
Imported login screen improvements from playtest branch. Fixed hard-coded breakpoint in the server status.
2021-03-20 00:42:21 -05:00
Christian 'ketura' McCarty
7ec64ad448
Merge remote-tracking branch 'marcin/master' into gemp-dev
2021-03-19 12:38:00 -05:00
marcin.sciesinski
87916afc83
Improving reading from stream in serialization
2021-03-19 08:11:08 -07:00
Christian 'ketura' McCarty
304c9535c2
Adding lines to the docker configuration that enables remote debugging for java
2021-03-19 00:19:21 -05:00
Christian 'ketura' McCarty
c420d4e483
Fixing PC unit tests to fit with the new fixes
2021-03-18 22:08:03 -05:00
Christian 'ketura' McCarty
46707410a5
Farin tests
2021-03-17 13:51:43 -05:00
Christian 'ketura' McCarty
4bb17bebf7
Merge branch 'gemp-dev' into card-dev
2021-03-17 13:40:27 -05:00
Christian 'ketura' McCarty
a3a1112151
Merge branch 'master' into gemp-dev
2021-03-17 13:40:09 -05:00
marcin.sciesinski
9b9f7cfacc
Cleaned up event serialization
2021-03-17 05:28:07 -07:00
marcin.sciesinski
7f6553ce34
Cleaning up
2021-03-17 05:19:59 -07:00
marcin.sciesinski
fe9bc890f6
Cleaned up decisions
2021-03-17 05:16:17 -07:00
marcin.sciesinski
3a76d33635
Cleaned up the GameState sending warnings, but also fixed tests double-modifiers issue
2021-03-17 05:04:03 -07:00
Christian 'ketura' McCarty
1fa0e8e61d
Merge branch 'gemp-dev' into card-dev
2021-03-14 18:30:09 -05:00
Christian 'ketura' McCarty
8deb97d804
Fixing .gitignore directive causing the entire "cards/build" directory to get ignored when attempting to check in.
2021-03-14 18:29:50 -05:00
Christian 'ketura' McCarty
7c6be3e2ae
Adding two Wargs from vpack1
...
These cards are broken + new Boromir; strength modifiers seem to be applied on the stack twice. Pushing to verify in-client behavior.
2021-03-14 00:15:38 -06:00
Christian 'ketura' McCarty
7013252197
Removing christmas starter supplements for now
2021-03-13 02:55:01 -06:00
Christian 'ketura' McCarty
8644dfbd05
Hiding christmas starter supplement images
2021-03-13 02:50:21 -06:00
Christian 'ketura' McCarty
cb093c1ef8
Fixing erroneous padding in new card ids
2021-03-13 02:44:18 -06:00
Christian 'ketura' McCarty
32fe008342
Fixing missing images
2021-03-13 02:41:07 -06:00
Christian 'ketura' McCarty
f8d7c6b5a3
VPack1 Gondor Implementation
...
The five gondor cards are now implemented. Lords of Gondor requires additional development to be complete (see commented out failing test). Added ReplaceInAssignment effect. Updated DiscardFromHand effect to be sensitive to the side performing the discarding.
2021-03-13 02:36:56 -06:00
Christian 'ketura' McCarty
769badd132
fixing savagery
2021-03-12 23:53:10 -06:00
Christian 'ketura' McCarty
935f3c10e5
Fixed missing Saruman's Snows image
2021-03-12 22:39:24 -06:00
Christian 'ketura' McCarty
9461ed755c
Updating image js file with all X-list images
2021-03-12 22:37:39 -06:00
Christian 'ketura' McCarty
b0cd05e0a9
Merge branch 'master' into card-dev
...
# Conflicts:
# gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json
# gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json
# gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json
# gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt
# gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json
# gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
2021-03-12 22:26:53 -06:00
Christian 'ketura' McCarty
8fe56b02f0
Reverting brand test removal
2021-03-12 21:59:02 -06:00
Christian 'ketura' McCarty
e64f8acdba
Committing missing unit test file
2021-03-12 21:57:57 -06:00
Christian 'ketura' McCarty
1ee5611dd5
removing tests temporarily
2021-03-12 20:30:57 -06:00
Christian 'ketura' McCarty
b1a42431d8
Quick Savagery test
2021-03-12 20:23:36 -06:00
Marcin Sciesinski
2b47d26fdb
Merge pull request #98 from PlayersCouncil/pc-formats
...
Fixing rarity file issues with the PC errata sets
2021-03-12 06:20:10 -08:00
Christian 'ketura' McCarty
d7115f13f7
Fixing rarity file issues with the PC errata sets
2021-03-12 06:44:39 -06:00
Christian 'ketura' McCarty
a1d809778c
Adjusting merged errata
...
Fixing some issues that weren't compiling. Removed the unneeded cantBeAssignedToSkirmishByFpPlayer modifier and replaced references to it with cantBeAssignedToSkirmishAgainst, which has a side filter. Fixed affected unit tests to pass.
2021-03-11 08:52:06 -06:00
Christian McCarty
72efdd039a
Merge pull request #1 from Tbiesty/card-dev
...
Help implement FOTR block errata
2021-03-11 06:44:49 -06:00
Troy Biesterfeld
08b99c36ae
Updates to JSON files for FOTR errata
2021-03-10 19:14:54 -06:00
Troy Biesterfeld
07a406744a
Merge branch 'card-dev' into card-dev
2021-03-10 03:50:13 -06:00
Troy Biesterfeld
1a2593bb2c
Help implement FOTR block errata
2021-03-10 03:43:33 -06:00
Christian 'ketura' McCarty
33eb217ef2
Updated all errata unit tests to contain the text of the card that it is tested against. Fixed Horn of Boromir not having its regroup duration tested.
2021-03-10 01:10:11 -06:00
Christian 'ketura' McCarty
862d90d42e
Fixing Keeper of Isengard errata fierce not applying until regroup
2021-03-09 12:57:21 -06:00
Marcin Sciesinski
9683ccca24
Merge pull request #97 from PlayersCouncil/pc-formats
...
Incorporating PC Formats on a limited basis for use in the PC March League
2021-03-09 04:24:56 -08:00
Marcin Sciesinski
2d48823cfb
Merge pull request #96 from PlayersCouncil/gemp-improvements
...
Gemp improvements
2021-03-09 04:22:41 -08:00
Christian 'ketura' McCarty
a1e98128f2
Fixing Horn of Boromir having old text.
2021-03-07 18:20:09 -06:00
Christian 'ketura' McCarty
e5aac72822
Completing unit tests for the last cards of Errata Pack 2
2021-03-07 01:08:40 -06:00
Christian 'ketura' McCarty
e050e16e62
Incorporating PC Formats on a limited basis for use in the PC March League.
2021-03-06 20:18:37 -06:00
Christian 'ketura' McCarty
19cab722c4
Errata Pack 1 and most of Errata Pack 2 complete
2021-03-06 19:50:16 -06:00
Christian 'ketura' McCarty
bb251bbfb7
Merge branch 'gemp-dev' into card-dev
2021-03-05 21:57:48 -06:00
Christian 'ketura' McCarty
7094e78963
Added a restriction to the in-game audio cue restricting play to only occur if the window is minimized and/or does not have focus.
2021-03-05 21:54:24 -06:00
Christian 'ketura' McCarty
815ee8e65a
Fixed Debug format not having the set 52/53 errata.
2021-03-04 23:47:13 -06:00
