external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,617 Commits 32 Branches 187 Tags
edfbc6ac958aeddc960b51e9a4d342bf4ce314f0
Commit Graph

1826 Commits

Author SHA1 Message Date
CCTV-1
5a3db18220 Merge remote-tracking branch 'upstream/master' 2020-04-28 16:21:04 +08:00
Anthony Calosa
ac9636c44e Fix uncleared selectables when a player concedes and restarts next game 2020-04-23 14:07:15 +08:00
Anthony Calosa
d24fa32175 add flash indicator for desktop 2020-04-18 05:57:17 +08:00
CCTV-1
e85ed216be Merge remote-tracking branch 'upstream/master' 2020-04-15 13:58:10 +08:00
Anthony Calosa
d87d825bce Network Improvements 2020-04-15 02:40:18 +00:00
Anthony Calosa
d6c5d7f04d Network Improvements 2020-04-13 15:42:56 +08:00
Anthony Calosa
ccf2abc391 fix desktop generated name 2020-04-09 08:46:37 +08:00
CCTV-1
190be3f7ea translate new option 2020-04-06 18:23:37 +08:00
CCTV-1
7642d588a4 Merge remote-tracking branch 'upstream/master' 2020-04-06 18:12:05 +08:00
Anthony Calosa
a18f142add Update SettingsPage Desktop 2020-04-05 12:34:56 +08:00
Anthony Calosa
b466ff38a3 Update SettingsPage 2020-04-05 11:41:21 +08:00
Anthony Calosa
52307c02d0 Add option to turn on Experimental Network Compatibility 
the user can try to turn on this option to test compatibility, defaults to OFF
 2020-04-05 07:14:03 +08:00
CCTV-1
9a2f2368e9 Merge remote-tracking branch 'upstream/master' 2020-04-04 16:47:07 +08:00
Anthony Calosa
da984227b1 Use Netty Default Object Decoder/Encoder 2020-04-03 21:35:05 +08:00
Anthony Calosa
bd5cc06504 remove unused imports 2020-04-03 19:02:48 +08:00
Anthony Calosa
8f99034a02 Fix crash 2020-04-03 19:01:03 +08:00
Anthony Calosa
d66700cbf3 Preference for Desktop 2020-04-03 18:47:33 +08:00
Anthony Calosa
13652e30ac Add Elsa Serializer Option (Off by default) 2020-04-03 18:00:10 +08:00
Anthony Calosa
fa93702bc8 fix android - pc network (disables elsa atm, needs investigation since this work before) 2020-04-03 12:53:43 +08:00
CCTV-1
d3e83b2601 translate new option 2020-04-02 21:35:12 +08:00
CCTV-1
0aee987536 Merge remote-tracking branch 'upstream/master' 2020-04-02 21:32:41 +08:00
Anthony Calosa
7c9849f845 Add preference to enable/disable loading of Unknown Cards. 
If a user don't wants to load a certain cards from deleted set/s in edition folder,
you can do so by disabling this option.
 2020-03-31 10:54:27 +08:00
CCTV-1
040b4cf7fb Merge remote-tracking branch 'upstream/master' into display_localization_cardname 2020-03-21 22:18:46 +08:00
CCTV-1
5005cf9102 Merge remote-tracking branch 'upstream/master' 2020-03-20 11:07:17 +08:00
Blacksmith
4cfcbaf603 [maven-release-plugin] prepare for next development iteration 2020-03-20 00:35:58 +00:00
Blacksmith
22dc1a27a0 [maven-release-plugin] prepare release forge-1.6.33 2020-03-20 00:35:52 +00:00
Hans Mackowiak
33d83dc0c5 Vote: replace hidden keywords with timestamped properties 2020-03-19 06:22:44 +00:00
CCTV-1
27eda6f9b2 Merge remote-tracking branch 'upstream/master' 2020-03-14 12:18:50 +08:00
Jamin W. Collins
c488ab4772 increase maximal heap size to 4096m 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-13 18:43:06 -06:00
Jamin W. Collins
f1f480d16a explicitly set the encoding to UTF-8 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-13 18:43:06 -06:00
Tim Mocny
3be58fee75 Make Planeswalkers poss commander for Tiny Leaders, cleanup Brawl commander syntax 
Legendary Planeswalkers only

Clean up Commander syntax for TL and Brawl
 2020-03-12 16:00:03 +00:00
CCTV-1
c769a8adcf Merge remote-tracking branch 'upstream/master' 2020-03-09 19:21:43 +08:00
Michael Kamensky
b9618509be Merge branch 'desktop-autoupdate' into 'master' 
check for updates button

See merge request core-developers/forge!2537
 2020-03-09 03:59:40 +00:00
CCTV-1
e0c9d5e6e0 Merge remote-tracking branch 'upstream/master' 2020-03-08 16:11:00 +08:00
Jamin Collins
726b8bfbe5 correct sprite load progress bar to 100% max 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-01 02:44:30 +00:00
CCTV-1
85b2409a66 Merge remote-tracking branch 'upstream/master' 2020-02-26 17:52:04 +08:00
CCTV-1
5a133686ec translate online game message 2020-02-25 21:14:04 +08:00
Anthony Calosa
40478a45ac Update Icons 2020-02-25 18:43:57 +08:00
CCTV-1
82e520ca67 translate desktop sideboard dialog message 2020-02-25 12:24:22 +08:00
CCTV-1
453f14760c translate desktop phase tooltip 2020-02-24 20:06:34 +08:00
CCTV-1
9f19b3f93f translate desktop deck import 2020-02-24 20:06:04 +08:00
CCTV-1
cc5d2c47ee translate some text 2020-02-24 20:05:44 +08:00
CCTV-1
f4dfa6038c fix translation format 2020-02-23 21:10:22 +08:00
CCTV-1
e195fe40b9 translate some message text 2020-02-21 20:47:38 +08:00
CCTV-1
b2526523d8 fix key typo 2020-02-20 18:48:08 +08:00
CCTV-1
f0a6760312 translate quest starting pool type 2020-02-20 10:15:08 +08:00
CCTV-1
11c5283014 translate some desktop quest text 2020-02-19 21:18:58 +08:00
CCTV-1
7ea0a5268c translate deck viewer 2020-02-19 11:37:26 +08:00
CCTV-1
456083d2b0 translate tip text 2020-02-19 11:36:52 +08:00
friarsol
133f1656d8 Some more progress with autoupdate button 2020-02-17 21:51:18 -05:00