swordshine
|
884d51f339
|
Merge branch 'fractured' into 'master'
Fix fractured identity controller
See merge request core-developers/forge!1541
|
2019-04-17 00:31:36 +00:00 |
|
adampantel
|
c9577ec780
|
Bontu, Ilharg, Saheeli
|
2019-04-16 17:04:19 -04:00 |
|
Adam Pantel
|
d75ce11ae0
|
Fix fractured identity
|
2019-04-16 15:58:19 -04:00 |
|
Adam Pantel
|
4821e50025
|
Allow TriggeredObject in filtering
|
2019-04-16 15:57:52 -04:00 |
|
austinio7116
|
de4e76f741
|
A few simple WAR spoilers
|
2019-04-16 06:54:38 +01:00 |
|
Michael Kamensky
|
22d308812d
|
Merge branch 'tamiyo_discard' into 'master'
Tamiyo: new logic for Discard effects
See merge request core-developers/forge!1540
|
2019-04-16 05:05:13 +00:00 |
|
Hans Mackowiak
|
b6f023c57c
|
- DiscardAi: find the first opponent that can discard to the effect, don't try to cast on players who have Tamiyo, Collector of Tales-like effect.
|
2019-04-16 05:05:13 +00:00 |
|
adampantel
|
72f75eb797
|
Remove extra println
|
2019-04-15 13:39:07 -04:00 |
|
austinio7116
|
5a0b104fb3
|
Fixed duplicate Svar
|
2019-04-15 14:47:06 +01:00 |
|
Sol
|
3a9eaf52c6
|
Merge branch 'wareditionsfile' into 'master'
Partial editions file for WAR
See merge request core-developers/forge!1539
|
2019-04-14 22:50:14 +00:00 |
|
maustin
|
9afb43d25a
|
Merge remote-tracking branch 'Austin/wareditionsfile' into wareditionsfile
# Conflicts:
# forge-gui/res/editions/War of the Spark.txt
|
2019-04-14 22:35:38 +01:00 |
|
austinio7116
|
974ce4c724
|
Partial editions file for WAR
|
2019-04-14 22:34:46 +01:00 |
|
austinio7116
|
5ccbbc559a
|
Renambed the submarine and added a few more spoilers
|
2019-04-14 14:58:04 +01:00 |
|
austinio7116
|
a7d1bd7877
|
A couple of WAR script correcitons
|
2019-04-14 14:48:20 +01:00 |
|
austinio7116
|
bc78cb7e01
|
A couple of WAR script correcitons
|
2019-04-14 14:45:56 +01:00 |
|
austinio7116
|
cbf867106d
|
Partial editions file for WAR
|
2019-04-14 14:16:09 +01:00 |
|
Sol
|
00b5561388
|
Merge branch '943-illegalargumentexception-no-element-named-battlefield-graveyard-in-enum-zone' into 'master'
Resolve "IllegalArgumentException: No element named Battlefield,Graveyard in enum Zone"
Closes #943
See merge request core-developers/forge!1538
|
2019-04-14 12:26:28 +00:00 |
|
Hans Mackowiak
|
01d1eacdce
|
Resolve "IllegalArgumentException: No element named Battlefield,Graveyard in enum Zone"
|
2019-04-14 12:26:28 +00:00 |
|
Sol
|
108a31b692
|
Merge branch '942-nullpointerexception' into 'master'
Resolve "NullPointerException"
Closes #942
See merge request core-developers/forge!1536
|
2019-04-14 12:25:51 +00:00 |
|
Hans Mackowiak
|
b4294d39f5
|
Resolve "NullPointerException"
|
2019-04-14 12:25:51 +00:00 |
|
churrufli
|
b95022740b
|
updating res files
|
2019-04-14 09:51:35 +02:00 |
|
Sol
|
3d2173f441
|
Merge branch 'war-cards' into 'master'
Fix Time Wipe, add Massacre Girl.
See merge request core-developers/forge!1525
|
2019-04-14 01:09:26 +00:00 |
|
Adam Pantel
|
8827e9723c
|
Try to fix Grip of Chaos
|
2019-04-13 17:11:17 -04:00 |
|
Adam Pantel
|
d02ad1a294
|
Time Wipe fix
|
2019-04-13 16:12:16 -04:00 |
|
Adam Pantel
|
7c0b11d479
|
Massacre Girl
|
2019-04-13 16:06:31 -04:00 |
|
Sol
|
bfae7b8951
|
Merge branch 'patch' into 'master'
Fix Ral, Storm Conduit (SpellCopy trigger)
See merge request core-developers/forge!1524
|
2019-04-13 19:56:36 +00:00 |
|
Michael Kamensky
|
3d22299341
|
Merge branch 'fix-audit-tool' into 'master'
Fix audit tool
See merge request core-developers/forge!1534
|
2019-04-13 04:32:31 +00:00 |
|
Sol
|
13583d0aba
|
Fix audit tool
|
2019-04-13 04:32:31 +00:00 |
|
swordshine
|
f2accc9b04
|
Merge branch 'patch-2' into 'master'
Update Ravnica Allegiance.txt tokens
See merge request core-developers/forge!1533
|
2019-04-12 01:24:25 +00:00 |
|
swordshine
|
24c9caf703
|
Merge branch 'war-blockdata' into 'master'
Added basic blockdata for WAR
See merge request core-developers/forge!1532
|
2019-04-12 01:24:06 +00:00 |
|
Sol
|
dfae9158c9
|
Update Ravnica Allegiance.txt tokens
|
2019-04-12 00:54:27 +00:00 |
|
Chris H
|
4d5ffe5230
|
Added basic blockdata for WAR
|
2019-04-11 19:09:51 -04:00 |
|
austinio7116
|
317920406c
|
More spoilers from today added.
|
2019-04-11 17:12:13 +01:00 |
|
Sol
|
c298840489
|
Merge branch 'testcase_fixup' into 'master'
SimulationTestCase: fix Game init with Localizer
See merge request core-developers/forge!1531
|
2019-04-11 11:35:22 +00:00 |
|
Hans Mackowiak
|
4dd411d619
|
SimulationTestCase: fix Game init with Localizer
|
2019-04-11 11:35:22 +00:00 |
|
churrufli
|
e644ab4649
|
Merge remote-tracking branch 'origin/master'
|
2019-04-11 08:30:42 +02:00 |
|
churrufli
|
5dd8619663
|
updating res files
|
2019-04-11 08:29:41 +02:00 |
|
churrufli
|
3c1ccfef82
|
updating res files
|
2019-04-11 08:29:41 +02:00 |
|
churrufli
|
8d94663f4a
|
Update language properties
|
2019-04-11 08:29:41 +02:00 |
|
swordshine
|
08d3015ed5
|
Merge branch 'patch-2' into 'master'
Update transmogrifying_wand.txt
See merge request core-developers/forge!1530
|
2019-04-11 04:07:18 +00:00 |
|
Sol
|
a85017b0b7
|
Update transmogrifying_wand.txt
|
2019-04-11 03:27:35 +00:00 |
|
swordshine
|
97e2d627f3
|
Merge branch 'krenko-tokenscript' into 'master'
Fix tokenscript in new Krenko
See merge request core-developers/forge!1529
|
2019-04-11 00:32:54 +00:00 |
|
adampantel
|
1a5362ab03
|
Krenko tokenscript
|
2019-04-10 13:48:05 -04:00 |
|
austinio7116
|
537fad612f
|
More spoilers from WAR
|
2019-04-10 17:26:47 +01:00 |
|
Michael Kamensky
|
c0b76016f1
|
Merge branch 'master' into 'master'
Added puzzle PS_WAR0 (Possibility Storm - War of the Spark Card Preview Puzzle).
See merge request core-developers/forge!1526
|
2019-04-10 11:02:05 +00:00 |
|
Agetian
|
ff45188dff
|
- Added puzzle PS_WAR0.
|
2019-04-10 14:01:16 +03:00 |
|
swordshine
|
257ba16c5b
|
Merge branch 'war_proliferate' into 'master'
War: Proliferate: rework effect now put each counter type on it
Closes #930
See merge request core-developers/forge!1501
|
2019-04-10 10:23:00 +00:00 |
|
Hans Mackowiak
|
2617795e37
|
War: Proliferate: rework effect now put each counter type on it
|
2019-04-10 10:23:00 +00:00 |
|
swordshine
|
5c95216d9d
|
Merge branch '929-war-amass-keyword-action' into 'master'
Resolve "WAR: Amass Keyword Action"
Closes #929
See merge request core-developers/forge!1495
|
2019-04-10 07:46:28 +00:00 |
|
Hanmac
|
e2c175439f
|
Amass: more cards
|
2019-04-10 08:13:22 +02:00 |
|