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
37,013 Commits 33 Branches 187 Tags
e60d5173f4335afb7d0809b9aa79d63c9fbd9a4d
Commit Graph

37013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Hanmac
8c601f86f6 Do Saga Abilities 2018-04-03 15:19:54 +02: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
austinio7116
9b89e79f44 Readded extended format 2018-04-02 22:23:16 +01:00
austinio7116
79ed54097a Readded extended format to fix quests 2018-04-02 22:19:46 +01:00
austinio7116
8647409f9d Readded extended format 2018-04-02 22:03:57 +01:00
Michael Kamensky
03d9983924 Merge branch 'cardedition-npe' into 'master' 
Add null check on CardEdition

See merge request core-developers/forge!339
 2018-04-02 20:21:05 +00:00
Michael Kamensky
dbd65941dc Merge branch 'patch' into 'master' 
- Fixed a bug (Yisan, the Wanderer Bard's + Rings of Brighthearth)

See merge request core-developers/forge!337
 2018-04-02 20:21:00 +00:00
Michael Kamensky
b481b629b5 Update CardEdition.java 2018-04-02 20:20:41 +00:00
Luke Way
0b5a92ebc9 Fixed whitespace 2018-04-02 09:36:58 -04:00
Luke Way
942f5dcfbd Added null check on CardEdition. Encountered NPE when adding basic lands in deck builder with cards from new set. 2018-04-02 09:32:38 -04:00
austinio7116
a73667610b Added MoJhoSto variant 2018-04-02 07:19:09 +01:00
swordshine
0e98da8bca - Yisan, the Wanderer Bard's + Rings of Brighthearth now works 2018-04-02 13:54:09 +08:00
Michael Kamensky
4dcd80e2ef Merge branch 'patch' into 'master' 
- Fixed a crash (varolz, the scar-striped + dryad arbor)

See merge request core-developers/forge!336
 2018-04-02 05:50:55 +00:00
swordshine
eeec3feb1f - Fixed a crash (varolz, the scar-striped + dryad arbor) 2018-04-02 11:55:44 +08:00
Sol
af70a1f58b Merge branch 'BrawlFormat' into 'master' 
Moved formats into separate folder so that custom formats can be added

See merge request core-developers/forge!331
 2018-04-01 02:53:55 +00:00
Sol
8ebd6e082e Merge branch 'user-reported-bugs' into 'master' 
Crackling Doom - call logic for creature sacrifice

Closes #401

See merge request core-developers/forge!335
 2018-04-01 02:27:34 +00:00
austinio7116
ff1e6b835c Fixed label of rhonas's last stand effect 2018-03-31 22:02:37 +01:00
austinio7116
f76992d9de Updated gameformats with new enum type to separate sanctioned, casual, historic and custom. 2018-03-31 21:41:37 +01:00
austinio7116
d11013c689 Updated gameformats with new enum type to separate sanctioned, casual, historic and custom. 2018-03-31 21:23:22 +01:00
Jamin W. Collins
4b7a020f8e Crackling Doom - call logic for creature sacrifice 
Fixes: core-developers/forge#401

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-31 10:46:32 -06:00
swordshine
a7740757a9 Merge branch 'patch' into 'master' 
- Fixed Evra, Halcyon Witness

See merge request core-developers/forge!334
 2018-03-31 14:40:56 +00:00
swordshine
e59477801e - Fixed Evra, Halcyon Witness 2018-03-31 22:40:29 +08:00
austinio7116
81326c996d Updated CHANGES.txt 2018-03-31 07:09:56 +01:00
austinio7116
9fbac2aeaa Updated CHANGES.txt 2018-03-31 07:08:46 +01:00
austinio7116
6248cf31c3 Code and properties cleanup 2018-03-31 06:55:01 +01:00
maustin
f3d11dbe5b Merge branch 'master' into BrawlFormat 2018-03-30 22:07:13 +01:00
austinio7116
a8c5d7bf2a Merge branch 'network-play' into 'master' 
Network play fixes

Closes #396

See merge request core-developers/forge!333
 2018-03-30 21:06:05 +00:00
austinio7116
c78d235b07 Moved formats into single files with new "Order", "Core" and "Name" properties. 2018-03-30 21:57:13 +01:00
Jamin W. Collins
2f5a83e171 Show external IP when hosting, if possible 
Fixes: core-developers/forge#396

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-30 08:37:17 -06:00
Jamin W. Collins
35d0e73901 handle null response from getPhase() 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-30 08:20:34 -06:00