external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,379 Commits 31 Branches 187 Tags
14f3d77e7e5eb6d0adcf5e82ddb99b51ea7ce203
Commit Graph

2817 Commits

Author SHA1 Message Date
Michael Kamensky
dd7e2d933f Merge branch 'DumpTurn' into 'master' 
Dump/Setup game state will now save current game turn.

See merge request core-developers/forge!209
 2018-02-18 19:39:22 +00:00
Michael Kamensky
275e1be6be Revert "Merge branch 'Guavafix' into 'master'" 
This reverts merge request !217
 2018-02-18 18:54:20 +00:00
Hanmac
0c005bb3ff Commander: CommanderTax now is on the Player who casted the Commander 2018-02-18 18:47:59 +01:00
Hanmac
57b9a1b4c7 SpellAbility: copy manaPart 2018-02-18 18:07:41 +01:00
Hanmac
b29b1b3630 CardState: fixed copyState and LKI 2018-02-18 18:06:38 +01:00
Michael Kamensky
f5e095f345 Merge branch 'cantblock' into 'master' 
CantBlockBy as Static Ability

See merge request core-developers/forge!218
 2018-02-18 08:05:59 +00:00
Michael Kamensky
a9e15c2d33 Merge branch 'Guavafix' into 'master' 
The guava fix

See merge request core-developers/forge!217
 2018-02-18 07:17:15 +00:00
Hanmac
a829dc72bc CardFactoryUtil: make CantBeBlockedBy into new StaticAbility 2018-02-17 15:25:51 +01:00
Seravy
b6395aa463 The guava fix 2018-02-17 12:06:57 +01:00
Hanmac
3f1d6238ff CardFactoryUtil: add Battle cry as trigger 2018-02-17 12:01:53 +01:00
Hanmac
8490f8d90b Card: fixed CARDNAME & EFFECTSOURCE on the static abilties 2018-02-16 20:55:17 +01:00
Hanmac
8f1c7bf40a EffectEffect: add AtEOT, remembering host card 2018-02-16 20:44:48 +01:00
Hanmac
27eee4c8fa Card: show CantBlockBy on affected creature 2018-02-16 16:50:43 +01:00
Hanmac
af32152bcc CantBlockBy: now done as static ability 2018-02-16 16:49:25 +01:00
Hanmac
e72edb95b5 Manifest: fixed check with worms of the earth 2018-02-16 14:02:34 +01:00
Hanmac
efed143a11 ReplaceMoved: fixed zonetype check 2018-02-16 14:01:07 +01:00
Sol
7ade1b9a52 Merge branch 'multiplayer' into 'master' 
Multiplayer

See merge request core-developers/forge!207
 2018-02-16 01:07:35 +00:00
Jamin W. Collins
84874601a9 Continue but log NullPointerException in getMana 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-15 17:08:01 -07:00
Seravy
22846db1a3 Dump/Setup game state will now save current game turn. 
Needed to test cards and AI that care about how many turns it have been since the start of the game.
 2018-02-14 16:13:44 +01:00
Michael Kamensky
6d4cc6efcb Merge branch 'bloodyCardTraits' into 'master' 
CardTaits: make cardtraits inside LKI has the same id's as the in the original

See merge request core-developers/forge!197
 2018-02-14 03:28:25 +00:00
Jamin W. Collins
45a0c54fb8 Define getter for TrackableObject props 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-13 18:44:28 -07:00
Jamin W. Collins
3a6c5b0cd5 Allow arbitrarily setting a Tracker 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-13 18:36:19 -07:00
Hanmac
d455653f11 Debuff: with keyword changes, directly remove of keywords is not needed anymore, let changed keywords handle that 2018-02-11 14:53:27 +01:00
Hanmac
2e196fc41b CardTaits: make cardtraits inside LKI has the same id's as the in the original object\nReplaceMoved now works with Blood Moon and Blood Sun 2018-02-10 18:50:22 +01:00
Hanmac
35c499a074 Crafty Cutpurse: make it use a Control Layer for the Token Create Effect 2018-02-09 17:07:48 +01:00
Michael Kamensky
58d0921696 Merge branch 'morph' into 'master' 
Morph: some rework to use better KeywordInterfaces

See merge request core-developers/forge!172
 2018-02-08 12:07:45 +00:00
Seravy
36917c0d18 Fixes compile/run bugs in IntelliJ 2018-02-08 10:25:17 +01:00
Hanmac
fb3ffe679b Morph: some rework to use better KeywordInterfaces 2018-02-07 19:40:12 +01:00
Hanmac
068efaeba7 Card: RegenEffect: add the Effect as Shield 2018-02-06 13:50:04 +01:00
Hanmac
ff7a0f1ae6 Regeneration Rework: 
- Regenerate or RegenerateAll does create an Effect
in Command which does replace Destroy if possible
- Trigger Regenerated will be added to the Effect
if something does care about "regenerated that way"
- new Regeneration Api is the internal effect
that does handle the actual regeneration
- ReplaceDestroy has Section to handle if Regeneration is possible
- CardShields are removed with the option in PlayerController
 2018-02-06 12:56:02 +01:00
Hanmac
047ee71259 Card: Planeswalker + Creature get extra damage 
Signed-off-by: Hanmac <hanmac@gmx.de>
 2018-02-02 23:52:11 +01:00
Agetian
32facbbc74 - Indirect aura attachment: check by aura controller if aura activating player check fails, fixes Sovereign of Lost Alara not being able to attach a Cartouche. 2018-01-31 08:00:26 +03:00
Hanmac
68843db5b8 Card: changed how instant and Sorcery show keywords 2018-01-29 22:52:02 +01:00
Hanmac
156cdf812d CardFactoryUtil: use : for Buyback, make some effect Secondary 2018-01-29 22:49:51 +01:00
Hanmac
5a29b05e88 CardFactoryUtil: move Totem Armor to ReplacementAbilities 2018-01-28 14:40:37 +01:00
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