external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,656 Commits 31 Branches 187 Tags
ada8d59b2c137f6f36110f76867c2d5b64cb778a
Commit Graph

40656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
churrufli
ada8d59b2c Update language properties 2019-04-06 22:53:38 +02:00
Michael Kamensky
9feb583413 Merge branch 'sealed-mode-singleton-round-limits' into 'master' 
Build up to 7 extra sealed pools, based on numbers

See merge request core-developers/forge!1509
 2019-04-06 03:37:24 +00:00
Sol
6ee9f14e59 Merge branch 'Nigol-master-patch-52687' into 'master' 
Update forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt

Closes #935

See merge request core-developers/forge!1511
 2019-04-06 02:51:00 +00:00
Marc-André
2cf8ea8ae9 Update forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt 2019-04-06 01:14:17 +00:00
swordshine
687972782a Merge branch 'warcards' into 'master' 
First batch of forgescribed WAR spoilers

See merge request core-developers/forge!1503
 2019-04-05 03:46:18 +00:00
swordshine
c67ea9cb2b Merge branch 'patch-1' into 'master' 
Patch 1

Closes #931

See merge request core-developers/forge!1510
 2019-04-05 03:45:15 +00:00
Sol
1fec85b164 Update Duels of the Planeswalkers.txt 2019-04-05 03:05:33 +00:00
Sol
1bc3f9fc0e Update Ravnica_Allegiance_Guild_Kit.txt 2019-04-05 03:02:37 +00:00
Sol
743711634e Merge branch 'Nigol-master-patch-08546' into 'master' 
Fixed Card not updating in the stack on mouseover when targeting arcs isn't on Mouseover

Closes #932

See merge request core-developers/forge!1508
 2019-04-05 02:59:27 +00:00
Sol
5e28d2c975 Merge branch 'patch-1' into 'master' 
Update Duel Decks Anthology Garruk vs. Liliana.txt

Closes #933

See merge request core-developers/forge!1507
 2019-04-05 02:58:46 +00:00
Marc-André
9c578fb57c Fixed Card not updating in the stack on mouseover when targeting arcs isn't on Mouseover 2019-04-05 02:48:44 +00:00
Chris H
e7fbe25af2 Build up to 7 extra sealed pools, based on numbers 2019-04-04 22:48:13 -04:00
Sol
a52b39f8d3 Update Duel Decks Anthology Garruk vs. Liliana.txt 2019-04-05 00:49:43 +00:00
austinio7116
07093df56d Fixed issues raised in MR discussions 2019-04-04 22:59:46 +01:00
swordshine
49931297ac Merge branch 'finalrnadeckgen' into 'master' 
Final RNA deckgen data

See merge request core-developers/forge!1502
 2019-04-04 07:45:42 +00:00
austinio7116
15f3034ac0 First batch of forgescribed WAR spoilers 2019-04-04 08:03:40 +01:00
austinio7116
d36651a779 Final RNA deckgen data 
(cherry picked from commit f526f96)
 2019-04-04 07:21:18 +01:00
Michael Kamensky
245a95b336 Merge branch 'master' into 'master' 
PS_RNAR: Added some cards to the human library.

See merge request core-developers/forge!1500
 2019-04-04 05:01:51 +00:00
Agetian
22e2a42807 - PS_RNAR: Added some cards to the human library. 2019-04-04 08:01:13 +03:00
Michael Kamensky
1c1d91c149 Merge branch 'master' into 'master' 
Added puzzle PS_RNAR (Possibility Storm - Ravnica Allegiance Preview Card Puzzle Revisited)

See merge request core-developers/forge!1499
 2019-04-04 04:52:31 +00:00
Agetian
a8a2d7bbeb - Added puzzle PS_RNAR (Possibility Storm - Ravnica Allegiance Preview Card Puzzle Revisited) 2019-04-04 07:51:57 +03:00
Michael Kamensky
02064e05df Merge branch 'patch' into 'master' 
Fixed All Hallow's Eve

See merge request core-developers/forge!1497
 2019-04-04 03:57:49 +00:00
Michael Kamensky
c00add6050 Merge branch 'clear-image-cache' into 'master' 
Token Viewer 1.0 + Clear Image Cache button

Closes #876

See merge request core-developers/forge!1496
 2019-04-04 03:57:39 +00:00
Sol
04dfdac71c Merge branch 'patch-1' into 'master' 
Update infernal_reckoning.txt

See merge request core-developers/forge!1498
 2019-04-04 02:35:01 +00:00
Sol
8d4566af3e Update infernal_reckoning.txt 2019-04-04 01:56:37 +00:00
swordshine
3cc3ef0b13 Fixed All Hallow's Eve 2019-04-02 16:03:59 +08:00
Chris H
f5a4360339 TokenViewer doesn't crash now.. Just need it to display 2019-03-31 22:48:57 -04:00
Michael Kamensky
cb8ad8221e Merge branch 'master' into 'master' 
Support for three color lands' sounds

See merge request core-developers/forge!1494
 2019-03-31 05:25:19 +00:00
Chris H
a050f7c26c TokenViewer Deck "editor" 2019-03-30 22:09:16 -04:00
Alessandro Coli
0a709a6cf4 Support for three color lands 2019-03-30 15:59:44 +01:00
Alessandro Coli
a9124743ef Support for three color lands 2019-03-30 15:58:49 +01:00
Sol
42f6cdbb46 Merge branch 'patch-1' into 'master' 
Fix elf knight token name

See merge request core-developers/forge!1493
 2019-03-30 01:14:35 +00:00
Sol
17e7883996 Fix elf knight token name 2019-03-30 01:13:14 +00:00
Michael Kamensky
91a8d1761a Merge branch 'fix-spellskite' into 'master' 
Spellskite should grab its magnet target from DefinedMagnet (fixes Spellskite not working)

Closes #925

See merge request core-developers/forge!1492
 2019-03-28 16:41:32 +00:00
Agetian
9c39d159e9 - Spellskite should grab its magnet target from DefinedMagnet. 2019-03-28 17:34:53 +03:00
Michael Kamensky
59abbfd51f Merge branch 'patch-1' into 'master' 
Update assemble_the_rank_and_vile.txt

Closes #917

See merge request core-developers/forge!1491
 2019-03-28 11:28:33 +00:00
Hans Mackowiak
953de7d6f1 Update assemble_the_rank_and_vile.txt 2019-03-28 11:28:33 +00:00
Rob Schnautz
51e9e2b692 Merge branch 'patch-1' into 'master' 
Update token-images.txt

See merge request core-developers/forge!1490
 2019-03-27 13:24:54 +00:00
Hans Mackowiak
9447561d53 Update token-images.txt 2019-03-27 13:24:54 +00:00
Michael Kamensky
928f903028 Merge branch 'master' into 'master' 
Added puzzle PS_RNA9 (Possibility Storm - Ravnica Allegiance 09).

See merge request core-developers/forge!1489
 2019-03-27 06:12:42 +00:00
Agetian
bc4826ed77 - Added puzzle PS_RNA9. 2019-03-27 09:11:49 +03:00
Michael Kamensky
88a674240d Merge branch 'tokenscripts' into 'master' 
resolve #926

Closes #926

See merge request core-developers/forge!1488
 2019-03-27 04:02:20 +00:00
Michael Kamensky
1d4b9d68ed Merge branch 'deck-descriptions' into 'master' 
Deck descriptions

See merge request core-developers/forge!1487
 2019-03-27 04:02:08 +00:00
Adam Pantel
c1dfbc04e4 Fix missing type in tokenscripts 2019-03-26 19:22:27 -04:00
Rob Schnautz
fa80df585f Merge branch 'master' into 'deck-descriptions' 2019-03-26 15:33:03 +00:00
Rob Schnautz
2cfbf8df30 back matter 2019-03-26 15:25:45 +00:00
Rob Schnautz
ad6e9acbe1 back matter 2019-03-25 21:44:42 +00:00
Rob Schnautz
3f450e813d back matter 2019-03-25 19:51:29 +00:00
Rob Schnautz
9c62a0e2ab back matter 2019-03-25 19:37:08 +00:00
Rob Schnautz
5dc883e932 back matter 2019-03-25 18:52:34 +00:00