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
37,079 Commits 32 Branches 187 Tags
2cda73ad77ee07c3115cca08901bbedd169985d1
Commit Graph

2908 Commits

Author SHA1 Message Date
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
Agetian
1efa8d030b - Added PREY counter (e.g. Tetzimoc, Primal Death) 2018-01-09 10:25:45 +03:00
Agetian
c855a107ab - Experimental (needs review): grant SVars to tokens before granting abilities and triggers in order to ensure that the game can see SubAbility SVars (e.g. Rekindling Phoenix). 2018-01-09 10:17:44 +03:00
Michael Kamensky
ee29d4289c Merge branch 'Fix-RepeatEach-Changing-Zones' into 'master' 
RepeatSubAbility host isn't set correctly if source changes zone

See merge request core-developers/forge!61
 2018-01-09 05:18:46 +00:00
Chris H
eeccc8490d RepeatSubAbility host isn't set correctly if source changes zone 2018-01-08 23:44:40 -05:00
swordshine
5eba9bfc14 - Removed debug info 2018-01-09 12:17:05 +08:00
swordshine
7bc14a526d - Added Azor's Gateway 2018-01-09 12:14:19 +08:00
swordshine
92545309e1 - Added Blood Sun 2018-01-08 13:01:16 +08:00
Hanmac
4bbfb1852f CardFactoryUtil: add Ascend Trigger for Permanent and example 2018-01-07 20:46:22 +01:00
Hanmac
c888a09a40 AscendEffect: add Effect to add Blessing to Player 2018-01-07 18:56:52 +01:00
Hanmac
2b3733a752 ExploreEffect: remove unused vars 2018-01-07 18:03:44 +01:00
Hanmac
ae709d210e Keyword: add Ascend to keywords 2018-01-07 18:03:08 +01:00
Hanmac
8f94bceaf2 CardTraitBase: make negative Conditions possible 2018-01-07 18:02:18 +01:00
Agetian
1fed0a1264 - Update ExploreEffect stack description (better implementation). 2018-01-07 08:46:41 +03:00
Agetian
2f8beff993 - Better implementation for ExploreEffect stack description. 2018-01-07 07:41:50 +03:00
Agetian
99728fd237 - Additional tweak for ExploreEffect stack description. 2018-01-06 21:56:37 +03:00
Agetian
b0525bf06b - Additional tweak for ExploreEffect stack description. 2018-01-06 21:52:28 +03:00
Agetian
16e4c11961 - Updated ExploreEffect to make the stack description account for cards that actually target other cards to explore (e.g. Enter the Unknown). 2018-01-06 21:46:12 +03:00
Hanmac
a4f490b607 ExploreEffect: fixed for trigger and game state 2018-01-06 15:01:51 +01:00
Hanmac
e25332ed27 fixed isBlessing in Variables 2018-01-04 07:30:50 +01:00
Hanmac
cc32286389 add Player Blessing 2018-01-04 07:17:31 +01:00
KrazyTheFox
6d5e56f6bf Normalize line endings 2017-12-28 23:40:29 -05:00
Sol
3252489971 Contains keyword should be checking for Contains, not startswith 2017-12-11 04:31:25 +00:00
Hanmac
a2f11fb829 RE: do CARDNAME after text changing effects 2017-12-09 15:47:13 +00:00
Sol
dd04888106 RarityFilter from Luke 2017-12-09 02:38:50 +00:00