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

44968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Blacksmith
91bc90f819 [maven-release-plugin] prepare for next development iteration 2020-06-29 02:47:45 +00:00
friarsol
3c171b2cbc Update companion rules to move to hand for 3 mana 2020-06-28 22:47:44 -04:00
Blacksmith
4049d23562 [maven-release-plugin] prepare release forge-1.6.35 forge-1.6.35 2020-06-29 02:47:40 +00:00
Blacksmith
50e2cf1f88 Update README.txt for release 2020-06-29 02:44:57 +00:00
friarsol
ba1533e8e8 Use the union of both players phase stops when Mindslavering an opponent 2020-06-28 22:29:40 -04:00
swordshine
7f5a56fe4f Merge branch 'migrate-m21' into 'master' 
Migrate m21 cards

See merge request core-developers/forge!2929
 2020-06-29 01:40:00 +00:00
friarsol
bf74bd2f09 Update announcements 2020-06-28 21:29:42 -04:00
Sol
8f20aa39ca Merge branch 'm21' into 'master' 
Updated deck legality

See merge request core-developers/forge!2925
 2020-06-29 01:23:30 +00:00
friarsol
922c1fb541 Update block data for M21 2020-06-28 21:06:53 -04:00
friarsol
55973e8c75 Migrate new cards 2020-06-28 21:00:39 -04:00
swordshine
54e8c6f0ec Merge branch 'patch' into 'master' 
Add Ormos, Archive Keeper

See merge request core-developers/forge!2927
 2020-06-29 01:00:15 +00:00
friarsol
0837e0de8c Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2020-06-28 20:57:59 -04:00