ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,467 Commits 1 Branch 0 Tags
01b53ff00263eb819966aead641d9c8dbd209170
Commit Graph

7467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian 'ketura' McCarty
d551c51adb Fixing cards being in the wrong sets following a merge 2021-03-22 20:54:13 -05:00
Christian 'ketura' McCarty
d6548ebbbb Merge branch 'card-dev' into gemp-dev 
# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
#	gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
 2021-03-22 20:14:19 -05:00
Christian 'ketura' McCarty
90715d4f8b Switch 't' flag to 'p' 
Turns out 't' is used for 'tournament admin' lol.  Switched to 'p' for 'playtester'.
 2021-03-22 01:54:56 -05:00
Christian 'ketura' McCarty
7322c494a0 Merge branch 'gemp-dev' of https://github.com/PlayersCouncil/gemp-lotr into gemp-dev 2021-03-22 01:47:38 -05:00
Christian 'ketura' McCarty
edfa007ad0 Playtesting tab 
Adding a new playtesting tab that explains the PC playtesting initiative.  A new 't' flag is now part of the user type as a result.  The three PC Playtesting formats will not show unless the user opts in.
 2021-03-22 01:47:24 -05:00
Christian 'ketura' McCarty
0d9209a83d Binding replay folder outside the docker container 2021-03-22 01:44:37 -05:00
marcin.sciesinski
17a8e73c8c Fixed Berserker Torch (Toil on Shadow attachments) 2021-03-21 19:02:44 -07:00
PhallenCassidy
8cf772674e Typo in 4R157 "Leechcraft" 2021-03-21 19:24:45 -04:00
Christian McCarty
c443907f38 Merge pull request #3 from Tbiesty/gemp-dev 
Update STMTN for FOTR errata
 2021-03-21 14:48:40 -05:00
Troy Biesterfeld
80eee946d8 Update STMTN for FOTR errata 2021-03-21 14:15:18 -05:00
Christian 'ketura' McCarty
a8d84c929b Rearrange Playtest formats to be at the bottom of the format listing 2021-03-21 01:09:21 -05:00
Christian 'ketura' McCarty
f34030a00e Switching playtest formats on 2021-03-21 01:05:50 -05:00
Christian 'ketura' McCarty
8ec7262bcf Fixing incorrect card images 2021-03-21 01:02:52 -05:00
Christian 'ketura' McCarty
bfa0c526b3 Fixing missing rarity files and misconfigured rarity paths (accidentally committed to wrong branch) 2021-03-21 00:56:37 -05:00
Christian 'ketura' McCarty
f958f11dec Fixing missing rarity files and misconfigured rarity paths. 2021-03-21 00:54:19 -05:00
Christian 'ketura' McCarty
0e9dff96e5 Merge branch 'gemp-dev' into card-dev 
# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
 2021-03-21 00:29:07 -05:00
Christian 'ketura' McCarty
a68b89b424 Split the card errata into "release" series and "playtest" series json files 2021-03-21 00:28:20 -05:00
Christian 'ketura' McCarty
68516db945 Mass insertion of PC errata set definitions 
Created definitions for each of the 19 PC errata sets, as well as 19 more representing a "playtest" version of those sets
Created definitions for VSet1 and a playtest VSet1
Created three new playtest formats for the existing PC formats
Added all new sets to the various card filters on the deck builder
Added missing Expanded card filter
Added all the supplementary file changes required for all of these new set/format additions
 2021-03-21 00:21:12 -05:00
Christian 'ketura' McCarty
5713cede3a Fixing typo in header 2021-03-20 12:12:49 -05:00
Christian 'ketura' McCarty
1ceb8e5775 Altering the remote IP logging to use the x-forwarded-for header from the nginx proxy 2021-03-20 12:00:05 -05:00
Christian 'ketura' McCarty
ee3ad99f5b Merge branch 'master' into gemp-dev 2021-03-20 11:42:38 -05:00
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