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
43,989 Commits 32 Branches 187 Tags
e0c9d5e6e08cd4fb3a1774560360067029cda48c
Commit Graph

43989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CCTV-1
e0c9d5e6e0 Merge remote-tracking branch 'upstream/master' 2020-03-08 16:11:00 +08:00
Michael Kamensky
be52fb772e Merge branch 'onceupon' into 'master' 
Once Upon a Time (lowercase "a" throughout Forge)

See merge request core-developers/forge!2589
 2020-03-06 15:30:37 +00:00
Tim Mocny
633c106708 Once Upon a Time (lowercase "a" throughout Forge) 2020-03-06 15:30:36 +00:00
Michael Kamensky
aec62cbffb Merge branch 'mysteryboost' into 'master' 
Mystery Booster support!

See merge request core-developers/forge!2588
 2020-03-06 15:30:25 +00:00
Tim Mocny
5b61712d70 Mystery Booster support! 2020-03-06 15:30:25 +00:00
Michael Kamensky
7fa248db4c Merge branch 'patch-joust' into 'master' 
Update joust: add missing AILogic$ Fight

See merge request core-developers/forge!2586
 2020-03-05 14:32:18 +00:00
Hans Mackowiak
33f04148d3 Update joust: add missing AILogic$ Fight 2020-03-05 14:32:17 +00:00
Michael Kamensky
3aa33be214 Merge branch 'patch-collector-number-thb' into 'master' 
Update Theros Beyond Death: add missing CollectorNumber

See merge request core-developers/forge!2587
 2020-03-05 14:32:11 +00:00
Hans Mackowiak
612045f8c0 Update Theros Beyond Death: add missing CollectorNumber 2020-03-05 14:32:11 +00:00
Michael Kamensky
0bd6b16247 Merge branch 'edition-fixes' into 'master' 
Edition fixes

See merge request core-developers/forge!2583
 2020-03-05 03:35:42 +00:00
Michael Kamensky
eaa7d296d2 Merge branch 'newBranch' into 'master' 
Fix jerky animation on Conquest Reward Dialog

See merge request core-developers/forge!2581
 2020-03-05 03:32:26 +00:00
Jamin W. Collins
235162fb84 fixing the collector numbers for Magic 2015 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 20:06:09 -07:00
Jamin W. Collins
fc4a491111 fixing collector numbers for Magic 2014 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 20:04:36 -07:00
Jamin W. Collins
0cd9b1435b fixing collector numbers for Khans of Tarkir 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 20:02:16 -07:00
Sol
61184ade4c Merge branch 'collector_number' into 'master' 
change collector number to be a String

See merge request core-developers/forge!2578
 2020-03-05 02:55:36 +00:00
Jamin W. Collins
f2e29c9c93 fixing collector numbers for Fate Reforged 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 19:54:54 -07:00
Sol
e676073548 Merge branch 'network-play-fixes' into 'master' 
Network play fixes

See merge request core-developers/forge!2582
 2020-03-05 02:51:16 +00:00
Jamin W. Collins
6b315b2571 adding missing card for Conspiracy Take the Crown 
Kaya, Ghost Assassin is a foil-only booster card

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 19:46:40 -07:00
Jamin W. Collins
6e028a1c45 correct the rarities for Beatdown 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 19:40:27 -07:00
Jamin W. Collins
f07e2bc2ec correct the rarities for Battlebond 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 19:40:04 -07:00
Jamin W. Collins
3bc4124fe8 correct the rarities for Battle Royale 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 19:37:55 -07:00
Jamin W. Collins
bb5af6298e correct the collect numbers for Aether Revolt 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 19:32:28 -07:00
Jamin W. Collins
3c6c0f534d correct the tokens delimeter for Weatherlight 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 19:29:44 -07:00
Jamin W. Collins
4f3a8590dd semi-ignore non-fatal IndexOutOfBoundsException 
Not entirely sure why there are IndexOutOfBoundsException being seen
currently, but they are not fatal and do not appear to result in game
state skew between client and server.  So, logging and moving on.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 19:08:02 -07:00
Jamin W. Collins
2a993eb0e0 fixing openZones method signature for network-play 
Changes introduced in ef0a1a84 altered the method signature for
openZones, but did not fully update the signature for network-play
calls.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 19:06:07 -07:00
Anthony Calosa
f99e819ff0 Add puzzle improvements to Mobile Forge 2020-03-05 05:45:11 +08:00
Anthony Calosa
0f6b65a9ff Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-04 19:40:09 +08:00
Jamin W. Collins
ff31718839 correct how collectorNumber is located 
The existing logic will always return the first match for a given card
name, even if there are multiple different printings of the same card
name within a set. This change aligns the collectorNumber with the
alternate art index.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-03 21:27:05 -07:00
Michael Kamensky
2ab5a286c5 Merge branch '030320' into 'master' 
March 3 fixes

See merge request core-developers/forge!2580
 2020-03-04 04:07:14 +00:00
Northmoc
e07208e81b dissenters_deliverance.txt correct filename 2020-03-03 14:15:54 -05:00
Hans Mackowiak
1ec9c6cade Merge branch 'glyphofdelusion' into 'master' 
Glyph of Delusion

Closes #63

See merge request core-developers/forge!2482
 2020-03-03 16:24:42 +00:00
Tim Mocny
04e94f68f5 Glyph of Delusion 2020-03-03 16:24:41 +00:00
Jamin W. Collins
e325f42ca8 change collector number to be a String 
This change moves the internal storage of collector number from Integer
to String.

The parsed pattern for valid collector numbers is any number of digits
followed by an optional single non-digit character. This follows the
format used by Scryfall for the alternate art WAR planeswalkers and
cards from older formats sucha as FEM.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-03 08:59:09 -07:00
Michael Kamensky
f3c078b23c Merge branch 'Hanmac-master-patch-40459' into 'master' 
CardProperty: extend blockedValidThisTurn and blockedByValidThisTurn using defined

Closes #1299

See merge request core-developers/forge!2579
 2020-03-03 14:30:40 +00:00
Hans Mackowiak
4f0deea15f CardProperty: extend blockedValidThisTurn and blockedByValidThisTurn using defined 2020-03-03 14:30:39 +00:00
Michael Kamensky
db396e6b5c Merge branch '020320' into 'master' 
Fixes - 2 Mar 2020

See merge request core-developers/forge!2577
 2020-03-03 04:07:39 +00:00
Tim Mocny
dfe7ea0ecc Fixes - 2 Mar 2020 2020-03-03 04:07:39 +00:00
Michael Kamensky
55cba2513f Merge branch 'witchHuntAi' into 'master' 
ControlGainAi: fix target logic for Witch Hunt

See merge request core-developers/forge!2576
 2020-03-02 06:08:02 +00:00
Hans Mackowiak
9bbc3c8ef2 ControlGainAi: fix target logic for Witch Hunt 2020-03-02 06:59:33 +01:00
Anthony Calosa
c473ecb827 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-02 12:30:51 +08:00
Anthony Calosa
f654982e38 Fix Card Reveal Animation for default display 2020-03-02 12:30:02 +08:00
Michael Kamensky
38394ee263 Merge branch 'fixes' into 'master' 
fix message when no cards in opponent's hand

See merge request core-developers/forge!2575
 2020-03-02 03:55:12 +00:00
Jamin W. Collins
c9010d4224 fix message when no cards in opponent's hand 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-01 14:04:08 -07:00
Michael Kamensky
cb1b8024b4 Merge branch '1303-control-change-and-cda-not-reset' into 'master' 
Resolve "Control Change and CDA not reset?"

Closes #1303

See merge request core-developers/forge!2573
 2020-03-01 17:15:39 +00:00
Hans Mackowiak
075a0e99af Merieke Ri Berit: use Effect for Destroy Trigger 2020-03-01 17:37:06 +01:00
Jamin Collins
5f4c86697a Merge branch 'sld37' into 'master' 
SLD - Thalia

See merge request core-developers/forge!2574
 2020-03-01 15:42:59 +00:00
Tim Mocny
1fee06c843 SLD - Thalia 2020-03-01 15:42:59 +00:00
Hans Mackowiak
23bc7a629b Fix controllerChangeZoneCorrection when ControlGain is undone 2020-03-01 11:47:51 +01:00
Hans Mackowiak
86ec94ca0d Merge branch '1300-crash-on-desktop-1-6-32-snapshot-r123-2020-01-27-1-pm' into 'master' 
Resolve "Crash on Desktop 1.6.32 Snapshot r123 (2020-01-27 ~1 PM)"

Closes #1300

See merge request core-developers/forge!2555
 2020-03-01 10:30:45 +00:00
Hans Mackowiak
93f0ade107 MustBlockEffect: use Choose Card for Crashing Boars 2020-03-01 10:30:45 +00:00