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
36,899 Commits 33 Branches 187 Tags
0aea9ce1535abb2e402a8c992094c18de7af9f3c
Commit Graph

36899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
9e2447f601 - Updating CHANGES.txt. 2018-04-10 22:06:20 +03:00
Agetian
3b8059281b Merge remote-tracking branch 'origin/rix-possibilitystorm' into rix-possibilitystorm 2018-04-10 21:53:29 +03:00
Agetian
4103a007db - Added PS_RIX2 puzzle. 2018-04-10 21:45:30 +03:00
Michael Kamensky
5e548465dc Merge branch 'patch' into 'master' 
DOM: Added some cards

See merge request core-developers/forge!375
 2018-04-10 18:18:53 +00:00
Agetian
52cbacd306 - Added PS_RIX1 puzzle. 
- Fixed Puzzle Mode init for setting the player's hand size which sometimes failed to work.
 2018-04-10 20:54:44 +03:00
Michael Kamensky
666459c011 Merge branch 'patch-1else' into 'master' 
Fix CopyPermanentEffect

See merge request core-developers/forge!376
 2018-04-10 17:50:18 +00:00
Hans Mackowiak
f6dc955d4b Update CopyPermanentEffect 2018-04-10 17:48:30 +00:00
Misha Colbourne
a71f4dc0b2 Update orcish_vandal.txt 2018-04-10 16:32:13 +00:00
Misha Colbourne
939b25efd8 DOM: Added some cards 2018-04-10 16:22:50 +00:00
Misha Colbourne
729f35b6c1 DOM: Added some cards 2018-04-10 16:20:32 +00:00
Misha Colbourne
97995f9b8c DOM: Added some cards 2018-04-10 16:16:07 +00:00
Misha Colbourne
2997deac66 DOM: Added some cards 2018-04-10 16:13:29 +00:00
Misha Colbourne
a77e12b078 DOM: Added some cards 2018-04-10 16:06:23 +00:00
austinio7116
421b70b4f6 Merge branch 'dom-card-fixes' into 'master' 
DOM Card Fixes

See merge request core-developers/forge!374
 2018-04-10 13:31:19 +00:00
swordshine
1911d6915c Merge branch 'patch' into 'master' 
DOM: Added some cards

See merge request core-developers/forge!373
 2018-04-10 13:10:45 +00:00
Luke Way
6e0ba80d12 Tokens created with Karn's third ability only buff themselves 2018-04-10 09:05:54 -04:00
Luke Way
48fdac42f4 Tempest Djinn has Flying 2018-04-10 09:04:54 -04:00
Luke Way
cb5dca5c69 Zahid is Legendary 2018-04-10 09:04:16 -04:00
Misha Colbourne
36c699970b DOM: Added some cards 2018-04-10 12:23:52 +00:00
Misha Colbourne
7ebb70247c DOM: Added some cards 2018-04-10 12:21:38 +00:00
Misha Colbourne
4a65c70668 DOM: Added some cards 2018-04-10 12:20:04 +00:00
Michael Kamensky
b7a0500f25 Merge branch 'cleanup-multiplayer-android' into 'master' 
Cleanup multiplayer Android code, fix player heights in two player mode in Landscape orientation

See merge request core-developers/forge!371
 2018-04-10 08:58:33 +00:00
Agetian
809b047523 - Added PS_RIX1 puzzle. 
- Fixed Puzzle Mode init for setting the player's hand size which sometimes failed to work.
 2018-04-10 11:56:07 +03:00
Agetian
afe040d0b6 - Minor cleanup. 2018-04-10 10:58:51 +03:00
Agetian
9a43c1b3ae - Ensure that players have equal player panel heights in a two-player game in Landscape mode 2018-04-10 10:56:33 +03:00
Agetian
7e58e204ed - Code style cleanup/unification in multiplayer Forge for Android. 2018-04-10 10:49:24 +03:00
Hanmac
b5be110f0c Replacement Effect instead of StaticDamage 2018-04-10 07:15:41 +02:00
Hanmac
81ea744e38 fixed Druid's Deliverance 2018-04-10 07:15:26 +02:00
Michael Kamensky
f014285143 Merge branch 'patch' into 'master' 
DOM: Added some cards

See merge request core-developers/forge!370
 2018-04-09 17:31:00 +00:00
Misha Colbourne
2f194a99d3 DOM: Added some cards 2018-04-09 16:00:31 +00:00
Michael Kamensky
63094bee7a Merge branch 'cube-update' into 'master' 
- Update some ported draft cubes and add a new cube (Legacy 2018).

See merge request core-developers/forge!369
 2018-04-09 09:00:15 +00:00
Agetian
7d2965ee34 - Update some ported draft cubes and add the February 2018 legacy cube. 2018-04-09 11:59:02 +03:00
Michael Kamensky
aabfb0ab1c Merge branch 'deckgenimprovements' into 'master' 
Updated card deck generation files, plus fixed bug with recent generation code change

See merge request core-developers/forge!368
 2018-04-09 08:43:09 +00:00
austinio7116
bd321edd20 Updated card deck generation files, plus fixed bug with recent generation code change 2018-04-09 09:31:58 +01:00
Michael Kamensky
334be5afc7 Merge branch 'CopyPermPopulate' into 'master' 
CopyPerm: rewoke and update with Populate

See merge request core-developers/forge!367
 2018-04-09 08:28:56 +00:00
Hanmac
0bc12e744e CopyPerm: rewoke and update with Populate 2018-04-09 07:50:44 +02:00
austinio7116
15772e20ac Merge branch 'vital-promo-sets' into 'master' 
Vital promo sets

See merge request core-developers/forge!366
 2018-04-09 05:24:26 +00:00
Rob Schnautz
75d3972196 Delete Promo set for Gatherer.txt 2018-04-08 20:47:06 +00:00
Rob Schnautz
e89d6f7de3 Update DragonCon 1994.txt 2018-04-08 20:36:56 +00:00
Rob Schnautz
1a5f79732a Add new file 2018-04-08 20:35:52 +00:00
Rob Schnautz
1e2077cf91 Add new file 2018-04-08 20:32:29 +00:00
Rob Schnautz
6dbdfe2fb4 Add new file 2018-04-08 20:31:55 +00:00
Rob Schnautz
e7702f97b0 Add new file 2018-04-08 20:31:15 +00:00
Rob Schnautz
e1c47289c9 Add new file 2018-04-08 20:30:30 +00:00
Michael Kamensky
2efa5f6f14 Merge branch 'assorted-fixes' into 'master' 
- Added a missing reference to Chandra, Fire of Kaladesh.

See merge request core-developers/forge!365
 2018-04-08 20:06:11 +00:00
Michael Kamensky
bb1ab54d13 Merge branch 'patch' into 'master' 
DOM: Added some cards

See merge request core-developers/forge!364
 2018-04-08 20:06:09 +00:00
Agetian
f49bd65526 - Added a missing reference to Chandra, Fire of Kaladesh. 2018-04-08 23:04:58 +03:00
Misha Colbourne
8bae5dd93b DOM: Added some cards 2018-04-08 18:03:34 +00:00
Michael Kamensky
37e4d49d3d Merge branch 'BrawlFormat' into 'master' 
Fix to ensure randomly added cards in deck generation for commander/brawl are…

See merge request core-developers/forge!363
 2018-04-08 06:40:15 +00:00
austinio7116
e0b7061ac3 Fix to ensure randomly added cards in deck generation for commander/brawl are not illegal repeat copies of the commander 2018-04-08 06:10:37 +01:00