ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,367 Commits 1 Branch 0 Tags
8c336cb9d1c6fd7964de189a907f62186ba9b208
Commit Graph

32 Commits

Author SHA1 Message Date
Christian 'ketura' McCarty
a7e9fa03ca Merge branch 'master' into v2-cards 
# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
#	gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-shire.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set19/set19.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_shire.hjson
 2024-09-06 18:16:07 -05:00
Christian 'ketura' McCarty
5cd095a585 sql script updates, docker comment 2024-08-30 08:04:33 -05:00
Christian 'ketura' McCarty
a260edd435 Explicitly setting default docker volume bindings to "consistent", which may be necessary with new versions of Docker Desktop 2024-06-20 00:03:11 -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
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
e3d6633137 Upgrading Java from 17 -> 21 and upgrading all dependencies 
- Updating all dependencies to their latest non-beta versions
(except for junit, as junit 5 is significantly different from junit4)
- Converted the log4j configuration as the XML format changed.  Switched the rolling appenders to random access rolling appenders and turned on asynchronous logging, as this is supposed to be dramatically faster in all cases.
- Altered some DB POJO classes whose field names did not match exactly, as fastjson is now more strict about capitalization
- Altered JSON deserialization of arrays to use modern APIs which are much more readable
- Minor improvements to the Docker setup, including automatic working directory movement
 2024-04-16 23:58:49 -05:00
Christian 'ketura' McCarty
759f4cbc58 Minor updates 
- Updating readme with useful command.
- Checking in a missed logger update and some minor formatting.
- Checking in some useful sql scripts
- Fixing a minor site issue with unit tests
 2024-04-12 22:00:58 -05:00
Christian 'ketura' McCarty
bb6c7a0b6b Upgrading Java from 17 -> 21 and upgrading all dependencies 
- Updating all dependencies to their latest non-beta versions
(except for junit, as junit 5 is significantly different from junit4)
- Converted the log4j configuration as the XML format changed.  Switched the rolling appenders to random access rolling appenders and turned on asynchronous logging, as this is supposed to be dramatically faster in all cases.
- Altered some DB POJO classes whose field names did not match exactly, as fastjson is now more strict about capitalization
- Altered JSON deserialization of arrays to use modern APIs which are much more readable
- Minor improvements to the Docker setup, including automatic working directory movement
 2024-04-12 21:52:23 -05:00
Christopher Lund
0537ac7703 HJSON Conversion (#30) 
* Converting lotrFormats and setConfig to HJSON
 2023-07-06 00:48:23 -05:00
Christian McCarty
4a9cbb6ae6 Update indentation in readme 2023-07-05 22:16:41 -05:00
Christian 'ketura' McCarty
cf9568015b Fixing indentation typo in docker compose yaml 2023-07-02 10:30:10 -05:00
Christian 'ketura' McCarty
4794e371f8 Fixing the network not being discoverable by default under new docker versions. Fixed there being two targets for the replay binding, somehow 2023-06-29 21:52:46 -05:00
Christian 'ketura' McCarty
79b1372744 Updating gemp_db dockerfile to pull a specific version of mariadb; later versions used different naming conventions that will need to be accounted for 2023-06-29 18:40:02 -05:00
Christian 'ketura' McCarty
758d2cfe9f Adding missing table to the init db script, adding missing log file, dockerfile updates 2023-06-10 21:45:16 -05:00
Christian 'ketura' McCarty
fab938d280 readme updates 2023-06-10 19:03:35 -05:00
Christian 'ketura' McCarty
36d760198f readme updates 2023-06-10 18:46:43 -05:00
Christian 'ketura' McCarty
b7f3af7352 docker readme updates 2023-06-10 18:41:30 -05:00
Christian McCarty
d0056b0340 Merge pull request #29 from nheinbaugh/patch-1 
Update Docker Readme
 2023-06-10 18:32:44 -05:00
Christian 'ketura' McCarty
c3d786695d Merge branch 'master' of https://github.com/PlayersCouncil/gemp-lotr 2023-06-10 18:00:11 -05:00
Christian 'ketura' McCarty
e012ac161b Updating initial DB user setup to include the Librarian user. 2023-06-10 18:00:00 -05:00
Christian McCarty
20de5989a2 Update docker-compose.yml 
Removing commented lines that shouldn't have made it in
 2023-06-10 17:39:24 -05:00
Nick Heinbaugh
0a9c68f873 Update readme.txt 
convert readme to markdown and updated some of the out of dated information
 2023-03-10 13:26:34 -08:00
Christian 'ketura' McCarty
6cf416ef56 Adding binding for the nohup.out file into the logs folder, which should make it less annoying to debug when a startup failure is occuring 2022-09-10 03:56:35 -05:00
Christian 'ketura' McCarty
feba359b0a Merge branch 'update' 2022-08-04 18:04:21 -05:00
Christian 'ketura' McCarty
b1ed7a0497 Adding convenient debug option 2022-08-04 18:04:11 -05:00
Christian 'ketura' McCarty
f5ab47b116 Fixed out-of-date MYSQL driver reference not working in the new environment. 2022-08-04 15:46:03 -05:00
Christian 'ketura' McCarty
e316984ce9 Updated java version from 8 to 17. Updated all dependencies. 
The tournament and league tests now all fail, due to poorly designed mock tests for tournaments.  That will require a rewrite of the base classes to take a more IOC approach.
 2022-07-28 19:52:24 -05:00
Christian 'ketura' McCarty
f3661d2e76 Altered the default app image to permit for performing git operations within the container via manipulating the /gemp-src folder 2022-01-06 01:28:07 -06:00
Christian 'ketura' McCarty
5db1f1fc6f Fixing replay sync folder target in docker 2021-04-11 01:05:04 -05:00
Christian 'ketura' McCarty
0d9209a83d Binding replay folder outside the docker container 2021-03-22 01:44:37 -05: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
09f7cf4851 Introduced Docker, which permits an instance of gemp to be rolled out with a minimum of environmental setup. Readme includes instructions on how to use it. 2021-02-06 18:36:58 -06:00