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
38,806 Commits 34 Branches 187 Tags
fc8142db8b51a38b04afa8cd66e19de340ab6fc3
Commit Graph

1258 Commits

Author SHA1 Message Date
Jamin W. Collins
848df654fa set relative font sizes in Card Detail Panel 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-26 17:28:08 -06:00
Jamin W. Collins
9ab50c4d9d create and use getRelativeFontSize() method 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-26 17:27:15 -06:00
Jamin W. Collins
970931bcfd create a new user preference for default font size 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-25 07:49:23 -06:00
Jamin W. Collins
7781660c11 make font sizes relative to default (12) 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-25 07:49:23 -06:00
Jamin W. Collins
bbf63d9083 fix Quest Draft Editor 
Closes: core-developers/forge#724

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-23 13:33:17 -06:00
Jamin W. Collins
781400c0a3 fix Draft mode editor 
The recent changes to bring Commander style editors into the normal Deck
Editor tab appear to have broken the drafting editor.  This change set
appears to resolve that issue.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-23 13:04:19 -06:00
Michael Kamensky
5a500b857b Merge branch 'checkstyle' into 'master' 
implement basic checkstyle configuration

See merge request core-developers/forge!911
 2018-09-13 12:45:22 +00:00
Jamin W. Collins
fc62a41e46 implement basic checkstyle configuration 
Remove all unused or redundant imports

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-11 18:16:43 -06:00
Hanmac
1cac53b4f0 update Project files for newer eclipse 2018-09-11 10:31:33 +02:00
Jamin W. Collins
58a1ad2dd0 create new model before potentially adding cards 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-10 18:19:43 -06:00
Jamin W. Collins
df91964573 add dated serial to layout file 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:27 -06:00
Jamin W. Collins
33d7a0adcc move Brawl next to Commander 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:27 -06:00
Jamin W. Collins
66fa0c5820 ensure deck name references are cleared on New Deck 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:27 -06:00
Jamin W. Collins
749eea6f57 default to creating a new deck of a given gameType 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:27 -06:00
Jamin W. Collins
f0830c8595 reflow a few oneline if statements 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
6a4423a476 automatically edit preferred deck on tab load 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
3fcb03d3ed support deleting Brawl, Commander, and TL decks 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
5ab2efdc05 reflow DeckManager deleteDeck 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
c4cf7d3c99 rename All Decks deck listing to Constructed 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
5472421765 remove additional tabs when creating special editor 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
e5281987a5 catch unlikely null sectionMode 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
78b02c08db remove old Commander, Brawl, TL deck editor route 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
29263d2e2d Add Commmander, Brawl, and TL to Deck Editor 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
3f6a02b4b8 add Commander and Brawl to DeckManager case 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
2a48819d2b reflow DeckManager case statement 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
c4683677b3 Add commander decks to normal Deck Editor tab 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
Jamin W. Collins
cad9139e9d deck section dropdown 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-09 10:00:26 -06:00
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