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
35,257 Commits 33 Branches 187 Tags
bee34c064b470a7df703087c8b6ac80f457c64ab
Commit Graph

35257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
bee34c064b - Removed a param in the previous commit 2018-01-10 22:09:26 +08:00
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
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
Marek Čtrnáct
769521c978 Update arguels_blood_fast_temple_of_aclazotz.txt 2018-01-08 17:31:45 +00:00
Marek Čtrnáct
bc71ef6a18 Add new file 2018-01-08 17:31:34 +00:00
Marek Čtrnáct
422ab9b835 Delete Bombard 2018-01-08 17:24:31 +00:00
Marek Čtrnáct
410f9b1acf Update dire_fleet_hoarder.txt 2018-01-08 17:14:07 +00:00
Marek Čtrnáct
f6b3cb4b53 Add new file 2018-01-08 17:09:18 +00:00
Marek Čtrnáct
6a72aab106 Add new file 2018-01-08 16:29:05 +00:00
Marek Čtrnáct
f3695e18ac Add new file 2018-01-08 16:19:36 +00:00
Marek Čtrnáct
f64846c690 Add new file 2018-01-08 15:17:14 +00:00
Marek Čtrnáct
79bb27d2a7 Add new file 2018-01-08 14:01:52 +00:00
Agetian
f0dba0ca0e - Added Possibility Storm puzzles for Ixalan and Iconic Masters (by Xitax). 2018-01-08 16:09:10 +03:00
Marek Čtrnáct
b70627bd3f Update dire_fleet_hoarder.txt 2018-01-08 13:08:31 +00:00
Marek Čtrnáct
91b894958c Add new file 2018-01-08 12:37:47 +00:00
Marek Čtrnáct
ef10e83f1c Add new file 2018-01-08 11:37:02 +00:00
Marek Čtrnáct
e958cb665e Add new file 2018-01-08 10:56:09 +00:00
Marek Čtrnáct
8413ec92d5 Add new file 2018-01-08 10:50:45 +00:00
Marek Čtrnáct
92d77b610d Update tezzerets_betrayal.txt 2018-01-08 10:10:18 +00:00
Marek Čtrnáct
42f445b1d2 Update arguels_blood_fast_temple_of_aclazotz.txt 2018-01-08 08:42:06 +00:00
Marek Čtrnáct
ca886f4c0c Add new file 2018-01-08 08:21:46 +00:00
Marek Čtrnáct
531ac8fc50 Add new file 2018-01-08 08:05:19 +00:00
Marek Čtrnáct
628c8f5ff1 Update arguels_blood_fast_temple_of_aclazotz.txt 2018-01-08 07:57:08 +00:00
Agetian
b63037caf3 Merge branch 'swordshine/forge-master' 2018-01-08 10:48:21 +03:00
Marek Čtrnáct
19127cb09d Add new file 2018-01-08 07:46:28 +00:00
Marek Čtrnáct
004e0a4265 Add new file 2018-01-08 07:45:52 +00:00
Marek Čtrnáct
9bbc23d550 Update safe_haven.txt 2018-01-08 07:33:49 +00:00
Marek Čtrnáct
77cea9f74e Add new file 2018-01-08 07:29:34 +00:00
Marek Čtrnáct
0bc57c145a Update military_intelligence.txt 2018-01-08 07:28:42 +00:00
swordshine
92545309e1 - Added Blood Sun 2018-01-08 13:01:16 +08:00
Sol
bdc2fe8e69 Merge branch 'master' into 'master' 
- fixed a few cards

See merge request core-developers/forge!56
 2018-01-08 04:22:33 +00:00
swordshine
1d3c5c85ec - fixed a few cards 2018-01-08 11:53:44 +08:00