external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,641 Commits 34 Branches 187 Tags
c1a56f95d21a0cf014d6d8facce8b45e45a729ca
Commit Graph

53641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamin W. Collins
ce6d142f6e fix transitive dependency vulnerabilites 
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-1048058
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-451097
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-32018
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-31517
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-30647
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-30644
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-30646

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 21:24:46 -07:00
Jamin W. Collins
1aa64bac4a fix transitive dependency vulnerabilites 
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHELOGGINGLOG4J-567761
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHELOGGINGLOG4J-31409

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 21:04:00 -07:00
Jamin W. Collins
920c5bceea upgrade to fix known vulnerabilities 
* https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415
* https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-32236

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 20:54:11 -07:00
Jamin W. Collins
dc2fa6a78e update to fix known vulnerability 
* https://snyk.io/vuln/SNYK-JAVA-COMBEUST-174815

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 20:46:12 -07:00
Jamin W. Collins
859c170e75 update to fix known vulnerabilities 
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569178
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569179
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569180
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569181
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569182
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569183
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569185
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569186
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569187
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569189
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569190
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569191
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569176
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569177
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1294540
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088338
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088336
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088337
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088335
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088334
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088332
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088331
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088330
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088333
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088329
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088328
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1051966
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1051967
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1040458
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-456705

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 20:37:38 -07:00
Jamin W. Collins
4f6096bd3a update to fix known vulnerabilities 
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHELOGGINGLOG4J-567761
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHELOGGINGLOG4J-31409

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 20:34:42 -07:00
Michael Kamensky
a3385b2430 Merge branch 'johnwilliams7-master-patch-65807' into 'master' 
Pioneer Challenge Decks 2021 Promos

See merge request core-developers/forge!5574
 2021-10-17 03:14:55 +00:00
Michael Kamensky
f6aac5e419 Merge branch 'hasManaAbility' into 'master' 
Fix hasManaAbility

See merge request core-developers/forge!5552
 2021-10-17 03:14:16 +00:00
Michael Kamensky
351298f1ff Merge branch 'cleanup' into 'master' 
Fix NPE when starting Quick Gauntlet with no deck selected

See merge request core-developers/forge!5575
 2021-10-17 03:14:07 +00:00
tool4EvEr
18eace5fbb Fix card 2021-10-16 23:33:31 +02:00
tool4EvEr
654e671afb Clean up 2021-10-16 23:16:32 +02:00
tool4EvEr
fd9ee82b53 Fix NPE when starting Quick Gauntlet with no deck selected 2021-10-16 22:52:28 +02:00
tool4EvEr
1a1088399e Cleanup 2021-10-16 21:34:12 +02:00
John Williams
e00faa8ffc Add new file 2021-10-16 19:29:45 +00:00
Michael Kamensky
6c217f56aa Merge branch 'master' into 'master' 
Fix compile and tests

See merge request core-developers/forge!5573
 2021-10-16 18:15:50 +00:00
Michael Kamensky
67b4e31a5a - Fix compile and tests 2021-10-16 21:15:09 +03:00
Michael Kamensky
1c39eae563 Merge branch 'revert-c89c0181' into 'master' 
Revert "Merge branch 'adventure' into 'master'"

See merge request core-developers/forge!5572
 2021-10-16 18:10:05 +00:00
Michael Kamensky
e69cf66ec8 Revert "Merge branch 'adventure' into 'master'" 
This reverts merge request !5318
 2021-10-16 18:09:31 +00:00
Michael Kamensky
6cda07f5ea Merge branch 'twosat-master-patch-31634' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5571
 2021-10-16 17:55:07 +00:00
Andreas Bendel
5a9fea3f55 Update de-DE.properties 
translation #VStatisticsImporter
 2021-10-16 16:57:12 +00:00
Michael Kamensky
87521416b2 Merge branch 'deck-importer-decks-file-format' into 'master' 
NEW Deck Importer

See merge request core-developers/forge!5296
 2021-10-16 16:47:29 +00:00
Michael Kamensky
c89c0181d3 Merge branch 'adventure' into 'master' 
Add Adventure mode

See merge request core-developers/forge!5318
 2021-10-16 16:47:21 +00:00
Michael Kamensky
79518f43d6 Merge branch 'master' into 'master' 
Prepare Forge for Android publish 1.6.45.001

See merge request core-developers/forge!5570
 2021-10-16 16:02:46 +00:00
Michael Kamensky
2129a1dcf2 - Prepare Forge for Android publish 1.6.45.001 [incremental]. 2021-10-16 19:01:47 +03:00
Michael Kamensky
5520cd2a67 [maven-release-plugin] prepare for next development iteration 2021-10-16 18:52:21 +03:00
Michael Kamensky
340a6b2af5 [maven-release-plugin] prepare release forge-1.6.45 forge-1.6.45 2021-10-16 18:52:12 +03:00
Michael Kamensky
6c8ea1de96 Merge branch 'master' into 'master' 
Rudimentary Announcements update, part 2

See merge request core-developers/forge!5569
 2021-10-16 15:46:42 +00:00
Michael Kamensky
8653d97081 - Rudimentary Announcements update, part 2 2021-10-16 18:46:10 +03:00
Michael Kamensky
2d355be51d Merge branch 'master' into 'master' 
- Rudimentary Announcements update.

See merge request core-developers/forge!5568
 2021-10-16 15:44:39 +00:00
Michael Kamensky
0c998f971b - Rudimentary Announcements update. 2021-10-16 18:44:11 +03:00
Michael Kamensky
22469cd604 Merge branch 'master' into 'master' 
Migrate Upcoming (MID/MIC)

See merge request core-developers/forge!5567
 2021-10-16 15:41:24 +00:00
Michael Kamensky
dcb398f195 - Migrate Upcoming (MID/MIC) 2021-10-16 18:40:22 +03:00
Anthony Calosa
7c150c36b1 Merge branch 'master' into 'master' 
[Mobile] Auto Adjust Zoom Display on local Multiplayer (landscape mode)

See merge request core-developers/forge!5565
 2021-10-16 13:31:11 +00:00
Anthony Calosa
025c195a70 [Mobile] Auto Adjust Zoom Multiplayer Local 
When playing local multiplayer game on landscape mode, adjust zoom display automatically when 3rd/4th player has lost.
 2021-10-16 21:28:55 +08:00
Anthony Calosa
473cd7cfe0 Merge branch 'master' into 'master' 
Announce non doublefaced transform cards only

See merge request core-developers/forge!5564
 2021-10-16 13:24:30 +00:00
Anthony Calosa
c7864ee374 Announce non doublefaced transform cards only 
Doublefaced card transformation has trigger (except daybound/nightbound) when flipping back and forth making announcement redundant.
 2021-10-16 21:23:18 +08:00
Anthony Calosa
e3a1a5b7f4 Merge branch 'master' into 'master' 
[Mobile] fix facedown splitcard showing different cardbacks when zoomed

See merge request core-developers/forge!5563
 2021-10-16 13:06:44 +00:00
Anthony Calosa
9829ed36c7 Merge remote-tracking branch 'core/master' 2021-10-16 21:05:41 +08:00
Anthony Calosa
f5b0e3d068 [Mobile] fix facedown splitcard showing different cardbacks when zoomed 2021-10-16 21:04:46 +08:00
tool4EvEr
c82826cf09 Clean up 2021-10-16 14:39:56 +02:00
Michael Kamensky
d3a94167ab Merge branch 'johnwilliams7-master-patch-23793' into 'master' 
Update Resale Promos.txt

See merge request core-developers/forge!5562
 2021-10-16 09:59:06 +00:00
John Williams
804c1c2961 Update Resale Promos.txt 2021-10-16 09:53:09 +00:00
leriomaggio
2858abd551 reworded method name 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 09:25:28 +01:00
leriomaggio
700e4f1d8e Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-16 08:58:49 +01:00
leriomaggio
842e292537 Restored mobile options for DeckImporter + setup controller game type/format too 
This commit reinstate mobile old options to select card art.
The two components setup options in controller, and their initial state depends on current Card Art Preference Settings.

Moreover, now the dialog support (small) customisation based on current Game type to allow for some automation in DeckImporter to be triggered based on "editorType".

Changes in FDeckEditor reflects this change by passing the extra parameter to the constructor, and to allow checking that current editorType is not Limited (achieved via new public static method)

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 08:56:56 +01:00
leriomaggio
eb7f3d75c3 Restored FDeckImportDialog mobile translation entries 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 08:24:49 +01:00
Anthony Calosa
aaeb387f6c Merge branch 'master' into 'master' 
[Mobile] prevent crash empty deck

See merge request core-developers/forge!5561
 2021-10-16 07:20:28 +00:00
Anthony Calosa
7a25f0b5b8 [Mobile] prevent crash empty deck 2021-10-16 15:19:33 +08:00
leriomaggio
8b58f6caa2 Restored FDeckImportDialog mobile translation entries 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 08:12:16 +01:00
Anthony Calosa
9e29e98e89 Merge branch 'master' into 'master' 
[Mobile] prevent NPE on deck import

See merge request core-developers/forge!5560
 2021-10-16 06:46:36 +00:00