Commit Graph

7258 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
3ca4fb47d4 Added in-game decision audio.
Added an audio prompt to most in-game decision prompts, which should be low-intrusion enough to not be terribly annoying over the course of the game.  This should probably be gated behind a user setting at some point.
2021-03-04 23:44:13 -06:00
Christian 'ketura' McCarty
c76ba3624d Fixed game ready fanfare audio
Converted fanfare audio file to mp3 (the specific WAV encoding appears to be a form that has been deprecated in support by various browsers).
Converted audio to use the HTML5 <audio> tag, which has support from every major browser.
Updated gitignore to ignore replay folders.
2021-03-04 23:39:20 -06:00
Christian 'ketura' McCarty
48708f7293 Fixed Elven Armaments errata image incorrectly missing the dual item class 2021-02-24 21:58:25 -06:00
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
ae83ccf9e5 Merge branch 'master' into gemp-dev 2021-02-21 18:31:24 -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
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