external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,300 Commits 31 Branches 187 Tags
2f88b45d67a23ceee644b6b6b61b9743e35e94e2
Commit Graph

1281 Commits

Author SHA1 Message Date
Michael Kamensky
810d55931d Merge branch 'fixups' into 'master' 
Fixups

Closes #680, #676, and #673

See merge request core-developers/forge!905
 2018-09-09 05:27:21 +00:00
Jamin W. Collins
353dc885c1 gracefully handle port already in use 
Closes: core-developers/forge#676

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-08 10:39:28 -06:00
Hanmac
61a627a36a Surveil Effect 2018-09-08 15:50:32 +02:00
Blacksmith
e7d09e8918 [maven-release-plugin] prepare for next development iteration 2018-09-08 00:24:29 +00:00
Blacksmith
c2f62998fc [maven-release-plugin] prepare release forge-1.6.15 2018-09-08 00:24:26 +00:00
Sol
58ee5a12eb Merge branch 'xstream' into 'master' 
XStream Security Settings

See merge request core-developers/forge!868
 2018-09-06 03:04:26 +00:00
Jamin Collins
925ae63071 Merge branch 'token_phase_two' into 'master' 
Add more support for migrating Editions to TokenScripts

See merge request core-developers/forge!885
 2018-09-06 01:16:27 +00:00
Sol
50a2ee70b6 Merge branch 'sentry' into 'master' 
Implement Sentry

Closes #650

See merge request core-developers/forge!889
 2018-09-05 00:59:46 +00:00
tehdiplomat
d220f5fb78 Fetch token script images even if they aren't in the token image file 2018-09-03 11:37:44 -04:00
Jamin W. Collins
19be7f51ae configure XStream security for QuestDataIO 
The printing of the exception caught in FControl is very helpful for any
future issues caused by the security settings as it indicates which
class was present in the stream, but not allowed.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-02 11:44:37 -06:00
Jamin W. Collins
cc044978fb configure XStream security for GauntletIO 
Catching the ConversionException prevents Gauntlet saves from being
deleted in the event of improper or incomplete security settings on
XStream.  The null check in CSubmenuGauntletContests avoids an exception
should there be no Gauntlet saves.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-02 11:44:36 -06:00
Jamin W. Collins
881bd7adf2 add more information to Sentry reports 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-02 11:30:38 -06:00
Jamin W. Collins
b0e2450a0e initial Sentry integration 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-02 11:30:38 -06:00
Jamin W. Collins
6c99a911f2 add TD1 to special rounding case 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-02 11:27:15 -06:00
NikolayHD
66e52cbd6a Support Import, Open, New deck, Save As 
in all deck editors with finite catalog
 2018-08-29 01:15:27 +03:00
Jamin W. Collins
97e6657bfc move everything to guava android for compatibility 
There appear to be incompatibilities between guava 24.1-jre and
24.1-android with regard to serialization.  As long as networking
is dependent upon serialization desktop and android need to use
the exact same guava package.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-26 11:26:38 -06:00
Jamin W. Collins
b19eca2aff only display the ante tab when playing for ante 
Closes: core-developers/forge#381

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-16 23:48:13 -06:00
Jamin W. Collins
ab959890b8 fix a comment typo 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-16 17:32:45 -06:00
Sol
c45cf8df10 Merge branch 'network-play' into 'master' 
Network play

See merge request core-developers/forge!854
 2018-08-13 15:09:27 +00:00
Jamin W. Collins
385fa74c6e round image corners when No Border is selected 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-12 23:53:59 -06:00
Jamin W. Collins
2aa8d4bb1a use CardFaceView for selecting CardFaces 
needed for Runed Halo and similar

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-11 13:27:26 -06:00
Agetian
b91261bc06 - Fixed an issue with some cards still being shown an incorrect (transformed) image in a "choose a card name" dialog box in Desktop GUI (e.g. Treasure Map shown as Treasure Cove). 2018-08-07 07:47:52 +03:00
tehdiplomat
ab77d97e59 Improve resilience for Quest Loading 2018-08-03 21:19:14 -04:00
Blacksmith
87c0ab7b7d [maven-release-plugin] prepare for next development iteration 2018-08-03 22:08:24 +00:00
Blacksmith
aea32aee62 [maven-release-plugin] prepare release forge-1.6.14 2018-08-03 22:08:21 +00:00
Blacksmith
9ca15ae635 Clear out release files in preparation for next release 2018-08-03 21:20:17 +00:00
Blacksmith
bb5102e311 [maven-release-plugin] prepare for next development iteration 2018-08-03 21:13:58 +00:00
Blacksmith
4d9b98bc94 [maven-release-plugin] prepare release forge-1.6.13 2018-08-03 21:13:55 +00:00
Blacksmith
1e1640b292 Update README.txt for release 2018-08-03 21:11:47 +00:00
Blacksmith
0d15166137 [maven-release-plugin] prepare for next development iteration 2018-07-31 01:38:47 +00:00
Blacksmith
1d273d1c70 [maven-release-plugin] prepare release forge-1.6.12 2018-07-31 01:38:44 +00:00
Agetian
fe49c460eb - Added a break statement to GuiChoose. 2018-06-29 08:55:41 +03:00
Agetian
eafc717dd8 - GuiChoose (desktop Forge): show the right card face in the card detail panel when choosing a card name. 2018-06-29 08:08:03 +03:00
austinio7116
5cf63692a8 Fixed legacy and vintage deck generation for gauntlets on desktop and android 2018-06-15 22:01:20 +01:00
austinio7116
4612dbbc59 Updated deck generation to include Legacy and Vintage - fixed a few bugs that lead to incorrect land counts and random cards being added. Fixed Snow land issue so Skred red should be more playable. 2018-06-15 21:51:26 +01:00
Blacksmith
e2c57c0973 [maven-release-plugin] prepare for next development iteration 2018-06-10 00:42:03 +00:00
Blacksmith
6ec968cd85 [maven-release-plugin] prepare release forge-1.6.11 2018-06-10 00:42:00 +00:00
Michael Kamensky
dc3efbc739 Merge branch 'filteredhands' into 'master' 
Filtered Hands

See merge request core-developers/forge!607
 2018-06-09 05:33:30 +00:00
Michael Kamensky
a89106211f Merge branch 'FriendOrFoe' into 'master' 
Friend or foe

See merge request core-developers/forge!619
 2018-06-08 08:00:43 +00:00
austinio7116
85ad236693 Changed card-based deck generation to archetype based making better use of the new LDA models. Decks can now be selected by archetype with names generated from the source decklists. Archetypes are ordered by popularity. 
(cherry picked from commit e993b00)
 2018-06-07 19:55:41 +01:00
Rob Schnautz
be778e451e Revert "Merge branch 'no_card' into 'master'" 
This reverts merge request !620
 2018-06-04 02:28:40 +00:00
Hanmac
dc7f692f38 Game: Counters Put effects need to have Putter as Source 2018-06-03 18:21:02 +02:00
Rob Schnautz
7fb93a4f1d Add new images to help identify cards. 2018-06-02 22:34:03 +00:00
Hanmac
e97b814089 chooseSingleSpellAbility has map params now 2018-06-02 20:34:04 +02:00
austinio7116
e61c2f1554 Fixed broken tests due to oracle changes 2018-05-30 08:44:01 +01:00
austinio7116
e6af43b060 Implemented hand filtering properly using deck land ratio 
Made hand filtering optional and disabled by default
 2018-05-30 07:19:54 +01:00
Hanmac
31113133fc Oracle: update base code for their effects 2018-05-26 13:38:55 +02:00
Hanmac
2bf72bca6e fixed any Target Damage 2018-05-26 13:11:29 +02:00
austinio7116
89fef80d05 Using brawl banlist wherever needed 2018-05-23 22:18:58 +01:00
Michael Kamensky
ed034bdec7 Merge branch 'performancemode' into 'master' 
Bandaid temporary performance preference to disable additional static abilities…

See merge request core-developers/forge!558
 2018-05-16 04:43:30 +00:00