Michael Kamensky
|
3d2b6e7008
|
Merge branch 'vessel' into 'master'
archfiends_vessel.txt trigger fix
See merge request core-developers/forge!2954
|
2020-07-03 05:03:38 +00:00 |
|
Michael Kamensky
|
2e3721e19d
|
Merge branch 'fix-repeat-each' into 'master'
Fix repeat each not looping over cards
See merge request core-developers/forge!2955
|
2020-07-03 05:02:56 +00:00 |
|
CCTV-1
|
92928d4a5b
|
fix:missing some translation.
|
2020-07-03 10:05:59 +08:00 |
|
friarsol
|
6388ac84a1
|
Fix repeat each not looping over cards
|
2020-07-02 21:56:31 -04:00 |
|
Zachary Kline
|
6b7eb0422f
|
Remove event listeners which cause issues with keyboard accessibility.
|
2020-07-02 17:23:01 -07:00 |
|
Northmoc
|
6f5be80b6b
|
archfiends_vessel.txt trigger fix
|
2020-07-02 20:01:23 -04:00 |
|
Sol
|
e3da34061c
|
Merge branch 'ogw_ed' into 'master'
More edition file token corrections
See merge request core-developers/forge!2953
|
2020-07-02 20:44:57 +00:00 |
|
Tim Mocny
|
b3803e7b4f
|
More edition file token corrections
|
2020-07-02 20:44:57 +00:00 |
|
Sol
|
81cdf186c5
|
Merge branch 'tutorial-prototype' into 'master'
Add Tutorial mode
See merge request core-developers/forge!2949
|
2020-07-02 20:44:37 +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
|
65cb1d805c
|
Fix mobile
|
2020-07-01 23:31:19 -04:00 |
|
friarsol
|
bd820bea5d
|
Add Tutorial mode
|
2020-07-01 23:13:38 -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 |
|
Zachary Kline
|
4eb6c00527
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
|
2020-06-30 19:06:13 -07: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 |
|
Zachary Kline
|
409bfb1d23
|
Merge remote-tracking branch 'upstream/master'
|
2020-06-30 09:06:18 -07: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 |
|
Zachary Kline
|
8349a306e1
|
Merge branch 'tapStatus'
|
2020-06-29 21:11:23 -07:00 |
|
Zachary Kline
|
33c907a3a5
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
|
2020-06-29 21:09:05 -07: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 |
|
Zachary Kline
|
d13310ebce
|
Merge branch 'DeckEditorKeyboardAccess'
|
2020-06-29 19:31:17 -07:00 |
|
Zachary Kline
|
52cf9920b5
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
|
2020-06-29 19:29:05 -07: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 |
|