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
44,880 Commits 32 Branches 187 Tags
b3803e7b4fe8105f11d0c8c5159b34b599bc6de4
Commit Graph

44880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Mocny
b3803e7b4f More edition file token corrections 2020-07-02 20:44:57 +00:00
Michael Kamensky
9a03ff7dd3 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!2946
 2020-07-02 18:21:16 +00:00
Sol
c503c7c500 Merge branch 'drudge' into 'master' 
Drudge Spell with CostDesc

See merge request core-developers/forge!2952
 2020-07-02 17:12:12 +00:00
Sol
605cf618e7 Merge branch 'garrukchtypo' into 'master' 
garruk_cursed_huntsman.txt typo fix

See merge request core-developers/forge!2951
 2020-07-02 17:11:49 +00:00
Northmoc
fc4446bb9e drudge_spell.txt with CostDesc 2020-07-02 12:58:20 -04:00
Northmoc
6a01128eb7 garruk_cursed_huntsman.txt typo fix 2020-07-02 12:31:22 -04:00
Michael Kamensky
8e66e4910e Merge branch 'C20ed' into 'master' 
Commander 2020.txt token fix

See merge request core-developers/forge!2950
 2020-07-02 14:55:42 +00:00
Michael Kamensky
fe355551a8 Merge branch 'fix-companion-ai' into 'master' 
Companion AI was broken

See merge request core-developers/forge!2948
 2020-07-02 14:55:16 +00:00
Northmoc
17e7178766 Commander 2020.txt token fix 2020-07-02 10:36:56 -04:00
friarsol
349ed796a3 Companion AI was broken 2020-07-01 17:10:01 -04:00
Michael Kamensky
718e745579 Merge branch 'master' into 'master' 
Current planeswalker achievements (contributed by Marek14).

See merge request core-developers/forge!2947
 2020-07-01 18:53:09 +00:00
Agetian
edc8804b25 - Current planeswalker achievements by Marek14. 2020-07-01 21:16:44 +03:00
Andreas Bendel
630a3c7d87 Update de-DE.properties 
3 new lines
 2020-07-01 15:36:30 +00:00
Sol
df2958ae09 Merge branch 'cattoken' into 'master' 
Add M21 cat token

See merge request core-developers/forge!2945
 2020-07-01 14:47:50 +00:00
Northmoc
76911fccd4 g_2_2_cat.txt 2020-07-01 09:22:44 -04:00
Sol
9d2329a7f7 Merge branch 'fix' into 'master' 
Forum fixes 30 June

See merge request core-developers/forge!2944
 2020-07-01 00:52:52 +00:00
Tim Mocny
c0a342e1f4 Forum fixes 30 June 2020-07-01 00:52:52 +00:00
Sol
a575599b7e Merge branch 'tapStatus' into 'master' 
Accessible Tap status

Closes #1464

See merge request core-developers/forge!2942
 2020-07-01 00:52:08 +00:00
Sol
376f660f06 Merge branch 'JMP.29' into 'master' 
JMP - 29 June

See merge request core-developers/forge!2941
 2020-06-30 14:45:48 +00:00
Tim Mocny
2d6c3f9589 JMP - 29 June 2020-06-30 14:45:47 +00:00
Michael Kamensky
923f8bdc84 Merge branch 'master' into 'master' 
Fix Ultimate specs on two planeswalkers for achievement purposes. Prepare Android release.

See merge request core-developers/forge!2943
 2020-06-30 05:54:06 +00:00
Agetian
befcd915b3 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2020-06-30 08:26:17 +03:00
Agetian
0cd82d89e7 - Fix Ultimate specs on two planeswalkers for achievement purposes. 
- Prepare Forge for Android publish 1.6.35.001 [incremental].
 2020-06-30 08:22:40 +03:00
Michael Kamensky
40b23e76a2 Merge branch 'DeckEditorKeyboardAccess' into 'master' 
Improved Deck Editor keyboard ACcess

Closes #1465

See merge request core-developers/forge!2926
 2020-06-30 03:56:52 +00:00
Zachary Kline
b7b36c7d03 Merge branch 'DeckEditorKeyboardAccess' of git.cardforge.org:elwin/forge into DeckEditorKeyboardAccess 2020-06-29 20:16:37 -07:00
Zachary Kline
12190eebfa Add announcement about the keyboard change. 2020-06-29 20:15:40 -07:00
Zachary Kline
126152d638 Make browsing the deck editor a little more keyboard friendly. 2020-06-29 20:14:11 -07:00
Zachary Kline
726418f8c5 Let screen readers recognize tapped status. 2020-06-29 20:13:15 -07:00
swordshine
8af416a13b Merge branch 'mill3' into 'master' 
Mill - cleanup a few missing spaces to facilitate searches

See merge request core-developers/forge!2939
 2020-06-30 02:42:59 +00:00
swordshine
6a67a71f65 Merge branch 'fix' into 'master' 
more M21

Closes #1483

See merge request core-developers/forge!2940
 2020-06-30 02:42:33 +00:00
Tim Mocny
be4d30b200 more M21 2020-06-30 02:42:32 +00:00
swordshine
0a8a5d6301 Merge branch 'fix' into 'master' 
eliminate.txt actual fix

See merge request core-developers/forge!2937
 2020-06-30 00:47:47 +00:00
Northmoc
b14e13a563 cleanup a few missing spaces to facilitate searches 2020-06-29 20:15:08 -04:00
Northmoc
760563e484 eliminate.txt actual fix 2020-06-29 19:36:30 -04:00
Michael Kamensky
2b8f5991f3 Merge branch 'master' into 'master' 
Improve Maze's End AI.

See merge request core-developers/forge!2938
 2020-06-29 19:47:57 +00:00
Zachary Kline
26a56ba764 Add announcement about the keyboard change. 2020-06-29 12:31:04 -07:00
Agetian
ad202355b2 - Improve Maze's End AI. 2020-06-29 22:18:05 +03:00
Michael Kamensky
9377bc5177 Merge branch 'master' into 'master' 
Catch exceptions when disposing ImageCache textures, otherwise certain modes crash (e.g. Quest Draft Tournaments)

See merge request core-developers/forge!2936
 2020-06-29 18:19:40 +00:00
Agetian
d1a63442c2 - Catch exceptions when disposing ImageCache textures, otherwise certain modes crash (e.g. Quest Draft Tournaments) 2020-06-29 21:12:34 +03:00
Michael Kamensky
5f7acbad2f Merge branch 'm21translations' into 'master' 
M21 Card Translations

See merge request core-developers/forge!2935
 2020-06-29 18:01:51 +00:00
Michael Kamensky
779155e27a Merge branch 'useControllersPhaseIndicator' into 'master' 
Use the union of both players phase stops when Mindslavering an opponent

See merge request core-developers/forge!2931
 2020-06-29 18:01:10 +00:00
Zachary Kline
19e6deae37 Merge remote-tracking branch 'upstream/master' 2020-06-29 10:36:27 -07:00
klaxnek
0710a8ff56 M21 cardnames translations 
Fixed script (big json from Scryfall changed its url)
 2020-06-29 19:26:58 +02:00
Michael Kamensky
97cfe3f2d6 Merge branch 'fix' into 'master' 
eliminate.txt fix

See merge request core-developers/forge!2934
 2020-06-29 16:57:21 +00:00
klaxnek
5949c4b4ef Merge remote-tracking branch 'core-developers/master' 2020-06-29 18:48:38 +02:00
Northmoc
2d331843dd eliminate.txt fix 2020-06-29 11:48:15 -04:00
swordshine
6da3c6dd4b Merge branch 'companion2.0' into 'master' 
Update companion rules to move to hand for 3 mana

See merge request core-developers/forge!2933
 2020-06-29 09:58:39 +00:00
swordshine
13350eee68 Merge branch 'JMP.28' into 'master' 
JMP - 28 June

See merge request core-developers/forge!2932
 2020-06-29 09:58:21 +00:00
Tim Mocny
c7137d952a JMP - 28 June 2020-06-29 09:58:20 +00:00
Blacksmith
7f6943bd4f Clear out release files in preparation for next release 2020-06-29 02:52:55 +00:00