external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,728 Commits 32 Branches 187 Tags
32facbbc74f90a2741fae50bb1c682aff21cc63c
Commit Graph

35728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
16f2b16d22 Merge branch 'patch-3' into 'master' 
DDT - Add periods in "vs."

See merge request core-developers/forge!122
 2018-01-19 04:39:24 +00:00
Michael Kamensky
3efde7a2e3 Merge branch 'patch-2' into 'master' 
Token image updates for cards beginning with A

See merge request core-developers/forge!113
 2018-01-19 04:33:42 +00:00
Sol
032bcec313 Merge branch 'upcoming_rix2' into 'master' 
Fixed TriggerZones for Storm the Vault plus corrected description on trigger

See merge request core-developers/forge!121
 2018-01-19 03:05:59 +00:00
Rob Schnautz
a5d5ed8524 Add periods in "vs." 2018-01-18 23:53:24 +00:00
Rob Schnautz
c1e5d346c8 fix syntax 2018-01-18 22:03:04 +00:00
austinio7116
0a004b8f7e Fixed TriggerZones for Storm the Vault plus corrected description on trigger 2018-01-18 20:51:55 +00:00
Agetian
ffcd5b2f2c - Fixed Angrath, the Flame-Chained. 2018-01-18 18:57:51 +03:00
Sol
11ed680b5a Merge branch 'assorted-fixes' into 'master' 
- Fixed some RIX cards, some long PTK quest deck file names, and updated CHANGES.txt.

See merge request core-developers/forge!111
 2018-01-18 13:37:41 +00:00
Agetian
3abc22a855 - Attempted to fix Angrath, the Flame-Chained [-3] ability. 2018-01-18 11:38:48 +03:00
Agetian
ef9d6203c0 - Updating CHANGES.txt to reflect recent changes. 2018-01-18 09:15:19 +03:00
Agetian
016df27726 Merge remote-tracking branch 'origin/assorted-fixes' into assorted-fixes 2018-01-18 09:10:19 +03:00
Agetian
246ce114e2 - Rename some long deck file names in PTK quest to satisfy tar requirements for packaging. 2018-01-18 09:09:44 +03:00
Michael Kamensky
f3767417b0 Merge branch 'patch-3' into 'master' 
Anthologies

See merge request core-developers/forge!114
 2018-01-18 05:13:52 +00:00
Michael Kamensky
67fb62ec52 Merge branch 'patch-4' into 'master' 
Battle Royale

See merge request core-developers/forge!115
 2018-01-18 05:13:43 +00:00
Michael Kamensky
27f2dcc8d5 Merge branch 'patch-5' into 'master' 
Beatdown

See merge request core-developers/forge!116
 2018-01-18 05:13:26 +00:00
Michael Kamensky
9f37393a69 Merge branch 'patch-6' into 'master' 
Deckmasters: Garfield vs. Finkel

See merge request core-developers/forge!117
 2018-01-18 05:13:05 +00:00
Michael Kamensky
a7af6ecfc0 Merge branch 'patch-7' into 'master' 
Duels of the Planeswalkers

See merge request core-developers/forge!118
 2018-01-18 05:12:54 +00:00
Michael Kamensky
f772ab5fcc Merge branch 'newcard' into 'master' 
- Fixed Palace Jailer

See merge request core-developers/forge!119
 2018-01-18 05:12:26 +00:00
swordshine
6076954881 - Fixed Palace Jailer 2018-01-18 09:21:53 +08:00
Rob Schnautz
581bb74b9c revert 2018-01-17 21:17:06 +00:00
Rob Schnautz
81a8c93db4 revert 2018-01-17 21:16:45 +00:00
Rob Schnautz
6d8e162df3 revert 2018-01-17 21:16:36 +00:00
Rob Schnautz
9f44b46186 revert 2018-01-17 21:16:32 +00:00
Hanmac
e15f826190 Blessing: need to do blessing before condition 2018-01-17 21:04:44 +01:00
Rob Schnautz
f5ea2c0345 revert 2018-01-17 20:03:17 +00:00
Rob Schnautz
fff0051540 revert 2018-01-17 19:59:02 +00:00
Rob Schnautz
0fd3df021a revert 2018-01-17 19:58:09 +00:00
Rob Schnautz
44bbcfeebb revert 2018-01-17 19:57:08 +00:00
Rob Schnautz
5ae8e4c391 revert 2018-01-17 19:56:48 +00:00
Rob Schnautz
1e039cefcb revert 2018-01-17 19:52:31 +00:00
Rob Schnautz
eeafd84625 revert 2018-01-17 19:51:06 +00:00
Rob Schnautz
6955ad861c revert 2018-01-17 19:46:25 +00:00
Rob Schnautz
9fff6d70fe revert 2018-01-17 19:41:51 +00:00
Rob Schnautz
742e718c43 revert 2018-01-17 19:39:50 +00:00
Hanmac
d3020d591c StaticAbilityContinuous: use preList to check defined list other than zones 2018-01-17 20:34:24 +01:00
Rob Schnautz
ab44402886 revert 2018-01-17 19:31:15 +00:00
Hanmac
13cf87fa7a Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-01-17 20:28:53 +01:00
Rob Schnautz
c9a2ccb9f9 revert to INV 2018-01-17 19:13:37 +00:00
Rob Schnautz
3f78a5d595 missing pipe 2018-01-17 19:01:41 +00:00
Rob Schnautz
cdfdcba477 Duels of the Planeswalkers 2018-01-17 18:04:21 +00:00
Rob Schnautz
1dbbfb5112 Deckmasters: Garfield vs. Finkel 2018-01-17 17:42:47 +00:00
Rob Schnautz
d528d3854b Beatdown 2018-01-17 17:39:35 +00:00
Rob Schnautz
f6b5467663 add missing .txt extension 2018-01-17 17:37:02 +00:00
Rob Schnautz
77e22b355b add missing .txt extension 2018-01-17 17:36:22 +00:00
Rob Schnautz
74b2b1d4cf Battle Royale 2018-01-17 17:18:27 +00:00
Rob Schnautz
9736d6c3e4 Change Reprint to Other since it's a box set 2018-01-17 17:14:48 +00:00
Rob Schnautz
4c8f1be770 Anthologies 2018-01-17 17:06:12 +00:00
Agetian
3f88293d8e Merge branch 'master' of git.cardforge.org:core-developers/forge into assorted-fixes 2018-01-17 18:26:27 +03:00
Michael Kamensky
40828d8f57 Merge branch 'newcard' into 'master' 
- Added three cards

See merge request core-developers/forge!112
 2018-01-17 15:21:46 +00:00
swordshine
c97d67e4fc - Added Imprison 2018-01-17 18:55:15 +08:00