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

37784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
schnautzr
84e473c5cb Merge branch 'oracle-updates-nonfunctional' of https://git.cardforge.org/core-developers/forge into oracle-updates-nonfunctional 2018-05-28 09:25:33 -05:00
schnautzr
f91faf28d8 ", puts it onto the battlefield tapped, then shuffles their library" 2018-05-28 09:24:43 -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
Agetian
053726519c - Simple AI logic extension to make the Partner With commanders AI-playable. 2018-05-27 17:29:57 +03:00
Hanmac
e031ac8176 PartnerWith: extended DeckFormat Predicate 2018-05-27 15:52:18 +02:00
Hanmac
ef96037555 Partner with: fixed , to ; replace 2018-05-27 14:56:45 +02:00
Hanmac
3c1edcef4e cards: added Sylvia and Khorvath as Partner 2018-05-27 13:42:48 +02:00
Hanmac
6481842482 Partner with: added Logic into CardRules and added Trigger 2018-05-27 13:42:16 +02:00
swordshine
048737d9dd - Added some cards 2018-05-27 19:25:37 +08:00
Rob Schnautz
6b040f9bb8 Fix Oracle text (script was already changed) 2018-05-27 05:06:01 +00:00
schnautzr
9a57f1aca5 "any target" 2018-05-26 23:50:10 -05:00
schnautzr
3f99525715 "any target" 2018-05-26 23:12:52 -05:00
Michael Kamensky
0b5067b6e8 Merge branch 'cubes' into 'master' 
Added Card Kingdom Starter Cube

See merge request core-developers/forge!593
 2018-05-27 04:08:22 +00:00
schnautzr
124a9cec6c "any target" 2018-05-26 19:54:18 -05:00
schnautzr
2c21bd0ffb "any target" 2018-05-26 19:47:21 -05:00
schnautzr
e8cf3a1828 "any target" 2018-05-26 19:26:57 -05:00
austinio7116
faa322f4a7 Added Card Kingdom Starter Cube 2018-05-26 23:36:54 +01:00
maustin
cb1debc8f4 Merge remote-tracking branch 'Austin/filteredhands' into filteredhands 
# Conflicts:
#	forge-game/src/main/java/forge/game/GameAction.java
 2018-05-26 23:32:35 +01:00
Michael Kamensky
0264571cce Merge branch 'historicformats' into 'master' 
Remove Alpha formats

See merge request core-developers/forge!586
 2018-05-26 17:47:04 +00:00
schnautzr
35569a69b7 Remove Alpha formats 2018-05-26 12:21:31 -05:00
schnautzr
9a9f5ec268 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into historicformats 2018-05-26 12:19:27 -05:00