external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,648 Commits 33 Branches 187 Tags
f4443ea97baf855e85bd41d5d42c31eb2568baef
Commit Graph

37648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Schnautz
f4443ea97b Upload New File 2018-05-31 17:53:12 +00:00
Rob Schnautz
a83e193133 Replace with images that help with visual identification 2018-05-31 17:52:26 +00:00
Hans Mackowiak
8dbbfd5c07 Merge branch 'no_card.jpg' into 'master' 
Update to M15 style

See merge request core-developers/forge!609
 2018-05-31 05:45:25 +00:00
Rob Schnautz
02ae4d8460 Update to M15 style 2018-05-31 05:22:22 +00:00
Hans Mackowiak
35fc6ee211 Merge branch 'fixtests' into 'master' 
Fixed broken tests due to oracle changes

See merge request core-developers/forge!608
 2018-05-30 07:54:24 +00:00
austinio7116
e61c2f1554 Fixed broken tests due to oracle changes 2018-05-30 08:44:01 +01:00
swordshine
9b08ace35c Merge branch 'updateddeckgendata' into 'master' 
Pre pro tour deckgeneration update

See merge request core-developers/forge!605
 2018-05-30 01:11:20 +00:00
swordshine
39d1a7b3da Merge branch 'oracle-updates-functional' into 'master' 
Oracle updates functional

See merge request core-developers/forge!604
 2018-05-30 01:10:48 +00:00
swordshine
f0216cb3da Merge branch 'patch-1' into 'master' 
Update forerunner_of_the_heralds.txt

See merge request core-developers/forge!606
 2018-05-30 01:08:50 +00:00
Rob Schnautz
03a45a1185 Update forerunner_of_the_heralds.txt 2018-05-30 00:14:38 +00:00
austinio7116
f580d49a56 Pre pro tour deckgeneration update 2018-05-29 23:48:59 +01:00
schnautzr
284829fc65 prevent damage to "any target" 2018-05-29 17:24:06 -05:00
schnautzr
29e5316439 "ValidTgts\$ Player" 2018-05-29 15:55:44 -05:00
schnautzr
eedd169f15 "ValidTgts\$ Player" 2018-05-29 15:52:14 -05:00
schnautzr
d0227a7f99 "ValidTgts\$ Player" 2018-05-29 15:45:37 -05:00
schnautzr
8f6ba8553a "any target" 2018-05-29 15:27:09 -05:00
Rob Schnautz
0c9d134429 Merge branch 'oracle-c' into 'oracle-updates-functional' 
Oracle c

See merge request core-developers/forge!603
 2018-05-29 19:29:41 +00:00
schnautzr
e1aa757a3d "any target" 2018-05-29 14:29:11 -05:00
Hanmac
69d3db30cd Cards: Oracle update C 2018-05-29 21:23:59 +02:00
schnautzr
3906cf9cc0 Merge branch 'oracle-updates-functional' of https://git.cardforge.org/core-developers/forge into oracle-updates-functional 2018-05-29 14:13:26 -05:00
schnautzr
779680195d "any target" 2018-05-29 14:12:59 -05:00
Rob Schnautz
25d4e0e524 Merge branch 'oracle-b' into 'oracle-updates-functional' 
Oracle b

See merge request core-developers/forge!602
 2018-05-29 19:12:22 +00:00
Hanmac
06b7f2d677 Cards: Oracle update B 2018-05-29 21:08:05 +02:00
schnautzr
fdf58e82a3 "any target" 2018-05-29 13:55:36 -05:00
schnautzr
025b6db6ef Merge branch 'oracle-updates-functional' of https://git.cardforge.org/core-developers/forge into oracle-updates-functional 2018-05-29 13:48:08 -05:00
schnautzr
c5a62a46a8 "any target" 2018-05-29 13:47:35 -05:00
Rob Schnautz
f99bc762a9 Merge branch 'oracle-a' into 'oracle-updates-functional' 
Oracle a

See merge request core-developers/forge!601
 2018-05-29 18:46:06 +00:00
Hanmac
2b0fdec1d0 cards: Oracle-A 2018-05-29 20:43:04 +02:00
schnautzr
cfaf795bff Merge branch 'master' of https://git.cardforge.org/core-developers/forge into oracle-updates-functional 2018-05-29 13:08:57 -05:00
schnautzr
247ed0e597 "any target" 2018-05-29 13:07:19 -05:00
schnautzr
4a0f58862f "any target" 2018-05-29 13:00:26 -05:00
schnautzr
fe8ab69652 "any target" 2018-05-29 12:12:52 -05:00
schnautzr
82e4dd2cfd "any target" 2018-05-29 11:49:51 -05:00
schnautzr
08c6c7f725 "any target" 2018-05-29 11:39:36 -05:00
Michael Kamensky
9388a7c825 Merge branch 'oracle-updates-functional' into 'master' 
"any target"

See merge request core-developers/forge!599
 2018-05-29 03:40:25 +00:00
schnautzr
55c9783414 "any target" 2018-05-28 21:39:35 -05:00
Michael Kamensky
7cebee11a5 Merge branch 'oracle-updates-functional' into 'master' 
Oracle updates functional

See merge request core-developers/forge!598
 2018-05-28 20:07:30 +00:00
Michael Kamensky
f927cb41e0 Merge branch 'master' into 'master' 
BBD: Added some cards

See merge request core-developers/forge!597
 2018-05-28 20:04:16 +00:00
schnautzr
f53c7f5f78 "any target" 2018-05-28 10:50:25 -05:00
swordshine
8f3aec9ec1 - Added some cards 2018-05-28 23:02:18 +08:00
swordshine
1b7bdd2e57 - Added Demon/Angel Partners 2018-05-28 22:40:34 +08:00
schnautzr
4e04d7e28f "any target" 2018-05-28 09:34:35 -05:00
schnautzr
99de0acc8f Merge branch 'oracle-updates-functional' of https://git.cardforge.org/core-developers/forge into oracle-updates-functional 2018-05-28 09:27:18 -05:00
schnautzr
0bba96c1b7 "any target" 2018-05-28 09:26:53 -05:00
swordshine
52d3318a9c - Updated some scripts for multiplayer 2018-05-28 21:35:19 +08:00
swordshine
cec608b8d0 - Added Will Kenrith 2018-05-28 21:33:45 +08:00
Michael Kamensky
1c559ff538 Merge branch 'partnerWith' into 'master' 
Partner with

See merge request core-developers/forge!596
 2018-05-27 14:54:26 +00:00
Michael Kamensky
23b067ee95 Merge branch 'oracle-updates-functional' into 'master' 
Oracle updates functional

See merge request core-developers/forge!594
 2018-05-27 14:54:17 +00:00
Michael Kamensky
009af245dc Update scourge_of_valkas.txt 2018-05-27 14:43:57 +00:00
Michael Kamensky
02f7ff8979 Merge branch 'master' into 'master' 
BBD: Added some cards

See merge request core-developers/forge!595
 2018-05-27 14:41:28 +00:00