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

37905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Misha Colbourne
a591fefcbc DOM: Added some cards 2018-04-05 16:27:06 +00:00
Misha Colbourne
d4fc353909 DOM: Added some cards 2018-04-05 15:55:24 +00:00
Misha Colbourne
8c81064453 DOM: Added some cards 2018-04-05 15:26:48 +00:00
Misha Colbourne
fd553e9940 Update ghitu_chronicler.txt 2018-04-05 15:24:26 +00:00
Misha Colbourne
872f411250 DOM: Added some cards 2018-04-05 15:15:38 +00:00
Misha Colbourne
0cd4993fb0 DOM: Added some cards 2018-04-05 15:09:47 +00:00
Misha Colbourne
582d4d19e1 DOM: Added some cards 2018-04-05 15:07:54 +00:00
Misha Colbourne
9a159bd672 DOM: Added some cards 2018-04-05 14:59:36 +00:00
Misha Colbourne
29a798e2a9 DOM: Added some cards 2018-04-05 14:38:58 +00:00
Misha Colbourne
ee4e95b7e6 DOM: Added some cards 2018-04-05 14:38:47 +00:00
Misha Colbourne
11a04ffc15 DOM: Added some cards 2018-04-05 14:38:31 +00:00
Misha Colbourne
0391bf1cce DOM: Added some cards 2018-04-05 14:38:22 +00:00
Misha Colbourne
43d53ec2b4 DOM: Added some cards 2018-04-05 14:38:09 +00:00
swordshine
b44bf4bb47 - Fixed Etali, Primal Storm 2018-04-05 22:33:46 +08:00
swordshine
ecac92d9b3 - Skipping your "next" untap step is cumulative. 2018-04-05 22:16:54 +08:00
swordshine
45b6f1a6ef - Fixed "precombat main phase" triggers 2018-04-05 22:07:15 +08:00
swordshine
d61aeb09c0 - Fixed Sage of Ancient Lore 2018-04-05 21:28:15 +08:00
Misha Colbourne
8fa1843d79 DOM: Added some cards 2018-04-05 13:27:14 +00:00
Misha Colbourne
3ee7277409 DOM: Added some cards 2018-04-05 13:17:28 +00:00
swordshine
1139940c24 Merge branch 'master' into 'master' 
- Fixed cost description for Cycling (Street Wraith)

See merge request core-developers/forge!349
 2018-04-05 13:16:20 +00:00
swordshine
571e69bb16 - Fixed Land Tax and similar cards 2018-04-05 21:15:53 +08:00
swordshine
a5ea35e6b7 - Fixed cost description for Cycling (Street Wraith) 2018-04-05 20:18:21 +08:00
swordshine
d4ad66e2a5 Merge branch 'patch' into 'master' 
DOM: Added some cards

See merge request core-developers/forge!348
 2018-04-05 02:32:34 +00:00
Misha Colbourne
886c732626 DOM: Added some cards 2018-04-05 01:06:49 +00:00
Misha Colbourne
c4e0528ce8 DOM: Added some cards 2018-04-05 00:56:15 +00:00
Misha Colbourne
d4f524769f Update cabal_paladin.txt 2018-04-05 00:40:54 +00:00
Rob Schnautz
defdeb1f44 Update Dominaria.txt 2018-04-04 23:55:40 +00:00
Rob Schnautz
3b411c657d Update Dominaria.txt 2018-04-04 23:32:14 +00:00
Misha Colbourne
67037c7837 DOM: Added some new cards 2018-04-04 22:59:42 +00:00
Misha Colbourne
dd93588539 DOM: Added some new cards 2018-04-04 22:07:30 +00:00
Misha Colbourne
d7bc7df3d2 DOM: Added some new cards 2018-04-04 22:07:06 +00:00
maustin
49d0950a74 Merge branch 'master' into historicformats 2018-04-04 23:01:24 +01:00
swordshine
b3aae7824c Merge branch 'sagaCounterFix' into 'master' 
Saga: fix if last ability is countered

See merge request core-developers/forge!347
 2018-04-04 10:59:07 +00:00
Hanmac
e0dc5d4ced Saga: fix if last ability is countered 2018-04-04 07:49:04 +02:00
Sol
f7099b4555 Merge branch 'network-play' into 'master' 
use CardView for selection of exterting attackers

See merge request core-developers/forge!345
 2018-04-04 02:37:47 +00:00
Jamin W. Collins
3f8a3f3342 use CardView for selection of exterting attackers 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-04-03 20:12:15 -06:00
swordshine
2b8afc3972 Merge branch 'patch' into 'master' 
Fixed a crash when Momir Avatar copys an etbcounter card

See merge request core-developers/forge!344
 2018-04-04 01:03:33 +00:00
swordshine
771341f2e9 - Fixed a crash when MMomir Avatar copys an etbcounter card 2018-04-04 09:02:35 +08:00
Michael Kamensky
8c928e2b01 Merge branch 'saga' into 'master' 
Do Saga Abilities

See merge request core-developers/forge!343
 2018-04-03 17:27:54 +00:00
austinio7116
c7139c1da1 Updates to UI to separate out format filters 2018-04-03 17:27:42 +01:00
austinio7116
0338cc4458 Attempt to add other formats to format filter submenu on android 2018-04-03 14:40:29 +01:00
Hanmac
8c601f86f6 Do Saga Abilities 2018-04-03 15:19:54 +02:00
austinio7116
eeae378d69 Just use sanctioned formats where relevant, exclude historic formats where needed - may add these back later via new UI elements 2018-04-03 09:44:58 +01:00
austinio7116
f1fc4013c2 Re-parsed historic formats to ensure AAA, BBB with correct spacing 
Reindexed so order field increments only once between each format
 2018-04-03 06:14:05 +01:00
austinio7116
d8dafbfac3 Added individual formats from parsed historic formats.txt file 2018-04-03 06:07:18 +01:00
Michael Kamensky
4537c364ec Merge branch 'bugfixes2' into 'master' 
Catch UPNP error on android to allow hosting network game

See merge request core-developers/forge!341
 2018-04-03 04:45:12 +00:00
Rob Schnautz
0eb66aebff Update Dominaria.txt 2018-04-03 03:51:30 +00:00
Sol
eb4fc9f7ce Merge branch 'momirvariant' into 'master' 
Added MoJhoSto variant

See merge request core-developers/forge!338
 2018-04-03 01:14:19 +00:00
austinio7116
e6ddc61e86 Catch UPNP error on android to allow hosting network game 2018-04-02 23:31:06 +01:00
Sol
c021fd5eb8 Merge branch 'bugfixes2' into 'master' 
Readded extended format to fix quests

See merge request core-developers/forge!340
 2018-04-02 21:34:59 +00:00