external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,904 Commits 33 Branches 187 Tags
cb1b8024b4162b67a7e40bc376c0038d2213f37e
Commit Graph

43904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans Mackowiak
931d08d3ac AttachEffect: ChooseAnObject if list is empty and chosen is null, don't add to list 2020-02-26 11:05:23 +00:00
Michael Kamensky
ea582088a6 Merge branch 'newBranch' into 'master' 
Updated Sprite Buttons on Mobile Forge

See merge request core-developers/forge!2552
 2020-02-26 04:00:34 +00:00
Sol
468dd46205 Merge branch 'bronzetablet' into 'master' 
Bronze Tablet

Closes #37

See merge request core-developers/forge!2493
 2020-02-25 16:39:46 +00:00
Tim Mocny
b03f263fce Bronze Tablet 2020-02-25 16:39:45 +00:00
Anthony Calosa
15b69d3d70 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-02-26 00:07:16 +08:00
Hans Mackowiak
8004892058 Merge branch '1298-wrong-player-controls-etb-trigger-of-clone' into 'master' 
Resolve "Wrong player controls ETB trigger of Clone"

Closes #1302 and #1298

See merge request core-developers/forge!2553
 2020-02-25 15:03:21 +00:00
Hans Mackowiak
f03e386399 Resolve "Wrong player controls ETB trigger of Clone" 2020-02-25 15:03:20 +00:00
Anthony Calosa
40478a45ac Update Icons 2020-02-25 18:43:57 +08:00
Anthony Calosa
01a17b4b2c Upscaled Zone Icons and FlipCard Icons 2020-02-25 12:23:04 +08:00
Michael Kamensky
c916c4da31 Merge branch 'tempest_efreet' into 'master' 
Tempest Efreet

Closes #115

See merge request core-developers/forge!2550
 2020-02-24 09:01:45 +00:00
Tim Mocny
9e79d7810f Tempest Efreet 2020-02-24 09:01:44 +00:00
Michael Kamensky
0dbbcd4edc Merge branch 'newBranch' into 'master' 
Upscaled Start Button

See merge request core-developers/forge!2549
 2020-02-24 09:00:58 +00:00
Anthony Calosa
eb039b3bdd Update Start Button 2020-02-23 22:38:33 +08:00
Michael Kamensky
9be6a5a6a3 Merge branch 'newBranch' into 'master' 
Add Support for HD Buttons on Mobile Forge

See merge request core-developers/forge!2547
 2020-02-23 12:44:06 +00:00
Anthony Calosa
81c06f230a Add Support for Upscaling Buttons on Mobile Forge 2020-02-23 19:10:11 +08:00
Michael Kamensky
645a11f9c3 Merge branch 'master' into 'master' 
Initial logic implementation for Mercenaries

See merge request core-developers/forge!2546
 2020-02-23 05:19:38 +00:00
Agetian
68ca9ec622 - Initial logic implementation for Mercenaries 2020-02-23 08:14:48 +03:00
Michael Kamensky
b4883eb77e Merge branch 'mercenaries' into 'master' 
Mercenaries!

See merge request core-developers/forge!2545
 2020-02-23 04:39:16 +00:00
Tim Mocny
7e57ffb62d Mercenaries! 2020-02-23 04:39:14 +00:00
Michael Kamensky
820666b278 Merge branch 'fumble' into 'master' 
Fumble - Ready!

See merge request core-developers/forge!2535
 2020-02-23 04:31:23 +00:00
Tim Mocny
9d0c2968aa Fumble - Ready! 2020-02-23 04:31:23 +00:00
Michael Kamensky
d3f2b07c83 Merge branch 'emergencypowers' into 'master' 
Emergency Powers Addendum

See merge request core-developers/forge!2544
 2020-02-23 04:31:04 +00:00
Tim Mocny
57ebad948d Emergency Powers Addendum 2020-02-23 04:31:04 +00:00
Michael Kamensky
3f1b9df62a Merge branch '1290-trigger-needs-cleanup-after-cost-is-paid' into 'master' 
Resolve "Trigger needs cleanup after cost is paid"

Closes #1290

See merge request core-developers/forge!2543
 2020-02-22 14:46:44 +00:00
Hans Mackowiak
f990f19795 Resolve "Trigger needs cleanup after cost is paid" 2020-02-22 14:46:44 +00:00
Michael Kamensky
b2e1855949 Merge branch '1295-runtimeexception-abilityfactory-getability-startled-awake-has-no-svar-trigbounce' into 'master' 
Resolve "RuntimeException: AbilityFactory : getAbility -- Startled Awake has no SVar: TrigBounce"

Closes #1295

See merge request core-developers/forge!2540
 2020-02-22 11:10:19 +00:00
Hans Mackowiak
850e54fbbc Resolve "RuntimeException: AbilityFactory : getAbility -- Startled Awake has no SVar: TrigBounce" 2020-02-22 11:10:19 +00:00
Michael Kamensky
9931b33be7 Merge branch '1294-anax-hardened-in-the-forge-power-abnormal' into 'master' 
Resolve "'Anax, Hardened in the Forge' power abnormal"

Closes #1294

See merge request core-developers/forge!2542
 2020-02-22 10:17:40 +00:00
Hans Mackowiak
040518d094 Resolve "'Anax, Hardened in the Forge' power abnormal" 2020-02-22 10:17:40 +00:00
Michael Kamensky
823c651532 Merge branch 'master' into 'master' 
Added puzzle PS_THB4 - Possibility Storm - Theros Beyond Death 04

See merge request core-developers/forge!2541
 2020-02-22 10:17:32 +00:00
Agetian
b412a361b9 - Added puzzle PS_THB4. 2020-02-22 11:33:32 +03:00
Michael Kamensky
022ea1bb75 Merge branch 'PSLD1292' into 'master' 
Secret Lair Promos.txt update

Closes #1292

See merge request core-developers/forge!2538
 2020-02-22 06:33:58 +00:00
Tim Mocny
f08f7b09d5 Secret Lair Promos.txt update 2020-02-22 06:33:58 +00:00
Michael Kamensky
16452dd11a Merge branch 'tezzeret21Feb' into 'master' 
Forum fixes

See merge request core-developers/forge!2539
 2020-02-22 06:33:45 +00:00
Tim Mocny
b0791a0c6a Forum fixes 2020-02-22 06:33:45 +00:00
Michael Kamensky
900ba9ec5b Merge branch '1276-display-divided-value' into 'master' 
Display Divided Values in stack description

Closes #1276

See merge request core-developers/forge!2524
 2020-02-21 04:08:16 +00:00
Michael Kamensky
8db0281f91 Merge branch '559' into 'master' 
Search zones for any number of cards named X and exile (or something else)

Closes #559

See merge request core-developers/forge!2527
 2020-02-20 08:43:39 +00:00
Tim Mocny
9637091ab5 Search zones for any number of cards named X and exile (or something else) 2020-02-20 08:43:39 +00:00
Michael Kamensky
45771ec8c0 Merge branch 'mausoleum_wanderer' into 'master' 
Mausoleum Wanderer proofread

See merge request core-developers/forge!2532
 2020-02-20 08:42:39 +00:00
Tim Mocny
5c3ff8297e Mausoleum Wanderer proofread 2020-02-20 08:42:39 +00:00
Michael Kamensky
722f512e53 Merge branch '504-shared-fate-can-not-cast-spell-queller-via-flash' into 'master' 
Resolve "Shared Fate -- can not cast Spell Queller via Flash"

Closes #504

See merge request core-developers/forge!2534
 2020-02-20 08:42:33 +00:00
Michael Kamensky
0cceaf0485 Merge branch '1286' into 'master' 
Challenger 2020 Precon Decks (Quest Mode)

Closes #1286

See merge request core-developers/forge!2531
 2020-02-20 08:40:55 +00:00
Tim Mocny
23d0d70478 Challenger 2020 Precon Decks (Quest Mode) 2020-02-20 08:40:55 +00:00
Hans Mackowiak
2eea49a8e4 Spell: add getAlternateHost for spells that would change the CardState 2020-02-20 07:03:24 +01:00
Michael Kamensky
a7d8a62a69 Merge branch '1288-unstable-shapeshifter-not-unstable' into 'master' 
Resolve "Unstable Shapeshifter not unstable"

Closes #1288

See merge request core-developers/forge!2530
 2020-02-18 17:03:10 +00:00
Hans Mackowiak
c8fdc6f272 Resolve "Unstable Shapeshifter not unstable" 2020-02-18 17:03:10 +00:00
Sol
9990062ec1 Merge branch '1281-general-ui-display-commander-tax' into 'master' 
Resolve "[General / UI] Display Commander Tax"

Closes #1281

See merge request core-developers/forge!2528
 2020-02-18 14:23:48 +00:00
Hans Mackowiak
6817b4af66 Resolve "[General / UI] Display Commander Tax" 2020-02-18 14:23:48 +00:00
Hans Mackowiak
c42202a140 Merge branch 'Hanmac-master-patch-75614' into 'master' 
Anax, Hardened in the Forge: updated triggers, need two for itself and other

See merge request core-developers/forge!2496
 2020-02-16 15:36:07 +00:00
Hans Mackowiak
d6c0cf6ef8 Anax, Hardened in the Forge: updated triggers, need two for itself and other 2020-02-16 15:36:07 +00:00