external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,815 Commits 31 Branches 187 Tags
211b51e5164976e50b36f85e85995a105d3ea34d
Commit Graph

3382 Commits

Author SHA1 Message Date
Hanmac
90b46f4c0f Card & CardState: add has functions to check for SpellAbility, Trigger and ReplacementEffects 2018-01-28 12:31:13 +01:00
swordshine
f53a54a126 - Fixed blockedByRemembered when two or more cards are remembered 2018-01-27 19:56:41 +08:00
swordshine
a40a6e8023 - Rescue from the Underworld now uses delayed triggers 2018-01-27 17:00:38 +08:00
swordshine
22982178e2 - Attempt to fix the CopyPermanent effect when Crafty Cutpurse is in play 2018-01-27 16:23:55 +08:00
Agetian
b866338197 - Only copy the intrinsic abilities in CardState#copyFrom, fixes clone abilities copying too much (e.g. copied tokens from Splinter Twin gaining the copy ability). 2018-01-26 09:16:13 +03:00
Sol
d48c93938f Merge branch 'patch-2' into 'master' 
Simplify string generation in a few files

See merge request core-developers/forge!128
 2018-01-26 01:51:30 +00:00
Hanmac
466eac71a1 Spell: Bestow now works with StaticAbilities again 2018-01-23 21:32:45 +01:00
Agetian
7d57af98fd - FIXME: Temporarily disabling preList in a checkStaticAbilities call for Bestow (causes P/T flickering on cards and related game state corruption, resulting in unwanted P/T changes between game phases). 2018-01-23 10:57:48 +03:00
Michael Kamensky
d16a197651 Merge branch 'assorted-fixes' into 'master' 
- Fixed the AI for Hunt the Weak/Savage Storm, prevented a crash when trying to exec a trigger with a non-existent SVar

See merge request core-developers/forge!130
 2018-01-21 18:04:27 +00:00
Hanmac
56f05c54f9 CardFactoryUtil: fixed Haunt for non creature 2018-01-21 17:53:45 +01:00
Agetian
b20c5acf75 - Issue a warning when trying to execute a trigger that references a SVar which does not exist and abort the execution of that trigger instead of hard-crashing the game (makes the issue with a manifested Hideaway land dying non-fatal). 2018-01-21 19:49:04 +03:00
Rob Schnautz
429ac3c072 TextUtil not needed in this file. 2018-01-21 16:17:13 +00:00
Hans Mackowiak
b8ac0819aa Merge branch 'Keywordcache' into 'master' 
Cache keywords to fix the slowdown issues on mobile Forge

See merge request core-developers/forge!127
 2018-01-21 07:31:04 +00:00
Rob Schnautz
cb7922fe15 Don't need TextUtils here 2018-01-21 04:57:51 +00:00
Hanmac
c294e1f6df Card cached keywords move to CardState, tests still run 2018-01-20 18:52:34 +01:00
Michael Kamensky
f0ad9083a5 Merge branch 'volrath-fix' into 'master' 
Fixed Volrath's Shapeshifter

See merge request core-developers/forge!124
 2018-01-20 11:58:37 +00:00
Hanmac
e66194fb9d Card: getUnhiddenKeywords uses cache 
that is updated by CardStateView#updateKeywords
 2018-01-20 08:09:56 +01:00
Agetian
042693bf53 - Volrath's Shapeshifter: unfortunately, the generic solution for AB Discard on a SVar didn't work (doesn't work with cloning, crashes the game), so resorting to a non-generic version specific to VS. 2018-01-19 22:16:16 +03:00
Agetian
1a9003c999 - Trim the spaces on TokenAltImages. 2018-01-19 21:51:20 +03:00
Agetian
056d66b865 - Apparently the extra copy for activated ABs is no longer necessary for Volrath's Shapeshifter. 2018-01-19 21:40:36 +03:00
Agetian
ceafaf5e2e - Fixing Volrath's Shapeshifter, pass 2. 2018-01-19 21:31:45 +03:00
Agetian
5207e697dd - Fixing Volrath's Shapeshifter, pass 1. 2018-01-19 12:06:14 +03:00
Hanmac
e15f826190 Blessing: need to do blessing before condition 2018-01-17 21:04:44 +01:00
Hanmac
d3020d591c StaticAbilityContinuous: use preList to check defined list other than zones 2018-01-17 20:34:24 +01:00
Hanmac
13cf87fa7a Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-01-17 20:28:53 +01:00
swordshine
c97d67e4fc - Added Imprison 2018-01-17 18:55:15 +08:00
Hanmac
a4e619fba2 CardPredicates: add inZone check 2018-01-17 07:40:03 +01:00
swordshine
c0ae7f42d9 - Added Orzhov Advokist (still need improved ai logic) 2018-01-17 13:47:03 +08:00
Chris H
c87a2bff23 Manually update Pom files and release changes to be ready for next release 2018-01-15 13:57:46 -05:00
swordshine
d8abdf1a2e - Merieke Ri Berit's ability has a delayed trigger 2018-01-15 09:25:10 +08:00
swordshine
8feaf0795f - Simplified the code 2018-01-14 10:53:21 +08:00
austinio7116
403550af5f Update ChooseCardEffect.java 2018-01-14 00:54:04 +00:00
maustin
d6ffdddfc6 Text correction "a creature" -> creature(s) for new WithTotalPower effect 2018-01-14 00:51:55 +00:00
Hanmac
3c3c64a11a AtEOT: add AtEOTCondition & AtEOTDesc 2018-01-13 17:11:23 +01:00
swordshine
2ac38e6639 - one more update 2018-01-13 20:02:59 +08:00
swordshine
3dc54790cc - Updated the chooseCard effect for Slaughter the Strong 2018-01-13 19:50:14 +08:00
swordshine
e050a62b0c - Added Slaughter the Strong 2018-01-13 16:21:59 +08:00
Michael Kamensky
ff4db64802 Merge branch 'patch-6' into 'master' 
Patch for Issue #8, coded by @friarsol

See merge request core-developers/forge!86
 2018-01-13 04:51:09 +00:00
swordshine
a12eedfa93 - Added cost for Timestream Navigator 2018-01-13 10:30:20 +08:00
Rob Schnautz
f79b326010 Patch for Issue #8, coded by @friarsol 2018-01-12 18:06:02 +00:00
Agetian
f0418b8d2a - Name the Blessing token as it is named on the physical card. 2018-01-11 18:42:27 +03:00
Agetian
f363ae0f1e - Fix capitalization in the name of The City's Blessing token. 2018-01-11 18:31:49 +03:00
swordshine
356bd9c635 - Fixed P/T of two cards 2018-01-11 21:07:53 +08:00
swordshine
fe8ec70159 - Added The Immortal Sun 2018-01-11 11:09:08 +08:00
Michael Kamensky
19f88d6e6d Merge branch 'RIX' into 'master' 
Fixed a few cards and added Peace Talks

See merge request core-developers/forge!64
 2018-01-10 15:17:59 +00:00
swordshine
7ba64ce136 - Added Peack Talks 2018-01-10 22:06:57 +08:00
Hanmac
052fb65518 CardFactoryUtil: add Ascend for non-permanent Spell 2018-01-10 07:30:03 +01:00
Michael Kamensky
941e25d7a7 Merge branch 'RIX' into 'master' 
- Added Sphinx's Decree

See merge request core-developers/forge!62
 2018-01-09 15:28:08 +00:00
swordshine
0bddb07ba0 - Added Sphinx's Decree 2018-01-09 22:11:45 +08:00
Agetian
9757fdb16b Merge branch 'Marek14/forge-master' 
# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/canal_monitor.txt
#	forge-gui/res/cardsfolder/upcoming/daring_buccaneer.txt
#	forge-gui/res/cardsfolder/upcoming/goblin_trailblazer.txt
#	forge-gui/res/cardsfolder/upcoming/impale.txt
#	forge-gui/res/cardsfolder/upcoming/orazca_raptor.txt
#	forge-gui/res/cardsfolder/upcoming/sadistic_skymarcher.txt
#	forge-gui/res/cardsfolder/upcoming/siegehorn_ceratops.txt
#	forge-gui/res/cardsfolder/upcoming/vampire_revenant.txt
 2018-01-09 16:56:27 +03:00