Commit Graph

35586 Commits

Author SHA1 Message Date
swordshine
7ba64ce136 - Added Peack Talks 2018-01-10 22:06:57 +08:00
swordshine
d80d2c5cda - Fixed Touch of Vitae 2018-01-10 20:12:17 +08:00
Marek Čtrnáct
2419b93682 Update expel_from_orazca.txt 2018-01-10 11:48:03 +00:00
Marek Čtrnáct
740b3f0c49 Update expel_from_orazca.txt 2018-01-10 11:47:35 +00:00
Marek Čtrnáct
0925379a6d Add new file 2018-01-10 11:45:54 +00:00
Marek Čtrnáct
0c89087579 Add new file 2018-01-10 11:40:39 +00:00
Marek Čtrnáct
0565082309 Add new file 2018-01-10 11:37:11 +00:00
Marek Čtrnáct
cf7fcb07a1 Update kumenas_awakening.txt 2018-01-10 11:32:18 +00:00
Marek Čtrnáct
ad99d21cdf Add new file 2018-01-10 11:31:33 +00:00
Marek Čtrnáct
3ad4da4f49 Add new file 2018-01-10 11:27:47 +00:00
Marek Čtrnáct
62238e0f81 Update deadeye_brawler.txt 2018-01-10 11:21:09 +00:00
Marek Čtrnáct
2928f157fa Update mausoleum_harpy.txt 2018-01-10 11:21:03 +00:00
Marek Čtrnáct
cacb64b2ca Update twilight_prophet.txt 2018-01-10 11:20:55 +00:00
Marek Čtrnáct
1f65c4723d Update resplendent_griffin.txt 2018-01-10 11:20:42 +00:00
Marek Čtrnáct
c2d4923706 Add new file 2018-01-10 10:20:51 +00:00
Marek Čtrnáct
5ea07389b4 Add new file 2018-01-10 10:16:01 +00:00
Marek Čtrnáct
8c56bb51ed Update slippery_scoundrel.txt 2018-01-10 10:15:11 +00:00
Marek Čtrnáct
7c8057dbc6 Add new file 2018-01-10 10:14:42 +00:00
Marek Čtrnáct
841b9ae668 Add new file 2018-01-10 10:13:13 +00:00
Marek Čtrnáct
f847a39eaa Add new file 2018-01-10 10:11:59 +00:00
Marek Čtrnáct
f2eafb99d4 Update dusk_charger.txt 2018-01-10 10:10:03 +00:00
Marek Čtrnáct
847becccfe Add new file 2018-01-10 10:09:54 +00:00
Marek Čtrnáct
536c2483b0 Add new file 2018-01-10 10:08:02 +00:00
Marek Čtrnáct
af80228bcd Add new file 2018-01-10 10:05:21 +00:00
Marek Čtrnáct
334b086efb Add new file 2018-01-10 09:49:22 +00:00
Marek Čtrnáct
bddce9872f Add new file 2018-01-10 09:41:15 +00:00
Marek Čtrnáct
3d4e544573 Add new file 2018-01-10 09:37:53 +00:00
Marek Čtrnáct
7fe68a1c4a Add new file 2018-01-10 09:34:28 +00:00
Marek Čtrnáct
8693b6ce81 Add new file 2018-01-10 09:25:18 +00:00
Marek Čtrnáct
200b3f7092 Add new file 2018-01-10 09:20:42 +00:00
Marek Čtrnáct
69afbde352 Add new file 2018-01-10 09:09:03 +00:00
Hanmac
052fb65518 CardFactoryUtil: add Ascend for non-permanent Spell 2018-01-10 07:30:03 +01:00
swordshine
c2ec6978c4 - Added a planeswalker subtype: Angrath 2018-01-10 14:21:41 +08: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
Michael Kamensky
869697352d Merge branch 'master' into 'master'
Master

See merge request core-developers/forge!59
2018-01-09 13:58:43 +00: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
4d718177b6 - Update and fix more cards (according to Swordshine's recommendations). 2018-01-09 16:50:55 +03:00
Marek Čtrnáct
2dff30f2cd Merge branch 'Marek14/forge-master' into 'master'
Updating and fixing some cards.

See merge request Marek14/forge!1
2018-01-09 08:00:30 +00:00
Agetian
8b5128510b - Update and fix more cards. 2018-01-09 10:29:26 +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
Agetian
a379279956 - Update and fix some cards. 2018-01-09 09:24:49 +03:00
Agetian
3fb38ae682 Merge branch 'master' of git.cardforge.org:Marek14/forge into Marek14/forge-master 2018-01-09 08:35:56 +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
Sol
2ae735db74 Merge branch 'PossibilityStormPuzzles' into 'master'
- Added Possibility Storm puzzles for Ixalan and Iconic Masters (by Xitax).

See merge request core-developers/forge!58
2018-01-09 04:38:26 +00:00
Sol
248d6c57c9 Merge branch 'RIX' into 'master'
Rix

See merge request core-developers/forge!60
2018-01-09 04:37:46 +00: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