Commit Graph

7175 Commits

Author SHA1 Message Date
Christian 'ketura' McCarty
55e7fc1645 Docker file cleanup
Cleaned up and simplified all docker files to remove all commented-out lines (now that they are in VC).  Removed obsolete files.  Cleaned up the readme.txt to make all the specific steps clearer and to remove excess chatty language.
2021-01-05 14:06:41 -06:00
Christian 'ketura' McCarty
77ff3ad4f4 Merge remote-tracking branch 'marcin/master' 2021-01-03 13:36:24 -06:00
Christian 'ketura' McCarty
96828398d2 Committing missed *.env file and including a readme explaining how to set up docker and how to host/compile/run gemp using this repository. 2020-12-12 00:48:58 -06:00
Marcin Sciesinski
8a2d3b66b9 Merge pull request #81 from PhallenCassidy/set40
Hiding set 40
2020-11-26 00:58:04 +07:00
Marcin Sciesinski
bcb9e7cf62 Merge pull request #80 from PhallenCassidy/deck-import
Deck import tool
2020-11-26 00:57:51 +07:00
PhallenCassidy
344c1f2fb6 Corrected "Not Bound To His Fate" twilight cost 2020-11-24 12:03:54 -05:00
PhallenCassidy
f143a2371a Corrected Typo 2020-09-26 22:34:19 -04:00
PhallenCassidy
8ceee984be Corrected typo 2020-08-25 20:48:19 -04:00
Phallen Cassidy
8c371f8b8c Removing set 40 after website went down 2020-08-13 21:56:04 -04:00
PhallenCassidy
b708064499 Moved Deck Import Button
Muscle memory takes me to the last button to open the stored decks every time.
2020-07-27 08:07:38 -04:00
Christian 'ketura' McCarty
79ff6d7da7 Docker rough draft works
Created a docker-compose script with 2 containers, one for the app/web, and one for the db.  This will in the future ideally be split into 3, one each for app/db/web, but baby steps.  Committing before I accidentally break it again.
2020-07-27 03:06:25 -05:00
Phallen Cassidy
c203fe0399 Corrected card names 2020-07-22 14:22:38 -04:00
Phallen Cassidy
4812bc6976 Deck import tool 2020-07-22 13:28:47 -04:00
marcin.sciesinski
4595ae17e6 Updated to Netty version 4. 2020-05-06 06:48:43 -07:00
marcin.sciesinski
de557f71bd Updated to Netty version 4. 2020-05-06 06:46:16 -07:00
marcin.sciesinski
ac1462f490 Refactored out Http handling out of server itself 2020-05-06 03:29:43 -07:00
marcin.sciesinski
83172e7add Update to latest version of Netty. 2020-05-06 02:48:44 -07:00
marcin.sciesinski
8c8afe7458 Merge remote-tracking branch 'origin/master' 2020-05-06 02:10:24 -07:00
marcin.sciesinski
42a6a2fccd Checking Origin header, only if it is sent in. 2020-05-06 02:10:03 -07:00
Marcin Sciesinski
e09b9df9b9 Merge pull request #76 from dmasalin/patch-45
Add some crowd control support for Hunters Sealed
2020-05-01 14:13:44 -07:00
marcin.sciesinski
ef4acdde24 Added same Origin protection for API calls 2020-05-01 09:45:12 -07:00
dmasalin
e75e5716c0 Add some crowd control support for Hunters Sealed 2020-04-25 10:57:40 -04:00
marcin.sciesinski
839398ba38 Covid message 2020-04-23 02:21:22 -07:00
marcin.sciesinski
8d35796f67 Covid message 2020-04-23 01:23:15 -07:00
marcin.sciesinski
a1c8835cfc Added message to main screen 2020-04-22 22:35:39 -07:00
marcin.sciesinski
8be8a3033b Added message to main screen 2020-04-22 22:31:35 -07:00
marcin.sciesinski
5d6f6d6769 Temporarily replaced images 2020-04-22 22:08:31 -07:00
Marcin Sciesinski
c3bea6f62e Merge pull request #75 from PhallenCassidy/master
Hobbit Fixes
2020-04-23 12:07:33 +07:00
Phallen Cassidy
9ba8fadca4 1R253 "Journey Into Danger" 2020-04-19 09:07:25 -04:00
Phallen Cassidy
7a3f0eb76b Fix for The Hobbit's "Trollshaw Forest" 2020-04-17 06:51:02 -04:00
Phallen Cassidy
0833230a23 Fix for The Hobbit's "Trollshaw Forest" 2020-04-16 21:49:49 -04:00
Phallen Cassidy
be0ba2f405 The Hobbit no longer needs loading 2020-04-16 21:24:03 -04:00
Phallen Cassidy
ce6cdc8bca Bringing fork up to date 2020-04-15 11:20:36 -04:00
Marcin Sciesinski
9be3c87e7c Merge pull request #73 from dmasalin/master
Narya fix and Dev
2020-04-15 05:49:21 +07:00
marcin.sciesinski
7fe1bd7d13 Merge remote-tracking branch 'origin/master' 2020-04-14 15:49:07 -07:00
marcin.sciesinski
5ef27fa071 Created card stubs with info from Card*.java card. 2020-04-14 15:48:55 -07:00
dmasalin
dd4eaa3e2f Update HU - Aragorn Starter.pack
typo
2020-04-14 15:26:59 -04:00
dmasalin
1b07150519 Update SealedLeagueProduct.java 2020-04-14 12:14:19 -04:00
dmasalin
6cd92a0fd7 Update RoS - Evil Man Starter.pack
fixing typo
2020-04-14 09:00:28 -04:00
Phallen Cassidy
4330287013 The Hobbit's Gollum, Small Slimy Creature 2020-04-14 07:22:59 -04:00
Phallen Cassidy
beacb264f5 Merge local branch 2020-04-13 23:38:35 -04:00
Phallen Cassidy
3ac888214f Moved The Arkenstone to json 2020-04-13 23:35:15 -04:00
Phallen Cassidy
d4619a2fe1 Added explicit call for shuffling deck
Fixes shuffling after taking revealing cards from the top/bottom of the draw deck
2020-04-13 11:39:32 -04:00
dmasalin
3be3d21a85 Set Narya from cost 1 to cost 0 2020-04-12 08:45:46 -04:00
dmasalin
7860f131df Merge pull request #2 from MarcinSc/master
Merge
2020-04-12 08:37:44 -04:00
Phallen Cassidy
b781fcd1ba Moving "An Invisible Ring" 2020-04-11 22:50:22 -04:00
Marcin Sciesinski
60eb17793f Merge pull request #72 from dmasalin/patch-44
Make a man out of Jarnsmid!
2020-04-11 21:00:08 +07:00
dmasalin
f628913624 Update set2-gandalf.json 2020-04-10 20:12:20 -04:00
marcin.sciesinski
e6399f56fc Fixed Cave Troll's Chain 2020-04-09 10:03:26 -07:00
marcin.sciesinski
1cea5cc458 Fixed Cave Troll's Chain 2020-04-09 09:55:27 -07:00