external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,121 Commits 32 Branches 187 Tags
5bbd10dfbb3046bdd96f571f98b51e96ea73e96f
Commit Graph

9192 Commits

Author SHA1 Message Date
Meerkov
0b5beddd51 Update chandras_defeat.txt 2018-05-02 03:40:45 +00:00
Michael Kamensky
a6c3a642f8 Merge branch 'patch-3' into 'master' 
Update demigod_of_revenge.txt

See merge request core-developers/forge!514
 2018-05-02 03:34:25 +00:00
Michael Kamensky
5e8d761a41 Merge branch 'patch-2' into 'master' 
Update dark_supplicant.txt

See merge request core-developers/forge!513
 2018-05-02 03:34:11 +00:00
Meerkov
124c1632af Update demigod_of_revenge.txt 2018-05-02 03:20:12 +00:00
Meerkov
3867287c0f Update dark_supplicant.txt 2018-05-02 03:19:03 +00:00
Meerkov
c1c0424af9 Update marsh_flitter.txt 2018-05-02 03:13:43 +00:00
Agetian
13aec8f621 - Fixed Elfhame Druid Oracle text. 2018-05-01 23:25:21 +03:00
Agetian
7b5e7afd6d - Added quest opponent deck Princess Zelda 1. 
- Minor stylistic tweaks to Princess Zelda 2, Starswirl the Bearded 2.
 2018-05-01 22:51:06 +03:00
Agetian
a586be2c41 - Minor style fix. 2018-05-01 22:26:19 +03:00
Agetian
4630623d35 - Added the quest opponent deck Starswirl the Bearded 2. 
- Minor fix in Princess Zelda 2.
 2018-05-01 22:25:25 +03:00
Agetian
71a2e68551 - Dominaria: adding AI deckbuilding and gameplay hints. 2018-05-01 21:10:33 +03:00
Agetian
ef71e037f2 - Added quest opponent deck Princess Zelda 2. 2018-05-01 20:10:47 +03:00
Agetian
e8a84ad571 - Added AI NeedsToPlay hint to Triumph of Gerrard. 2018-05-01 19:10:46 +03:00
Agetian
43dfbed157 - Updating Morkus Rex 2 and 3 quest opponent decks with RIX cards. 2018-05-01 18:30:16 +03:00
Agetian
9ef27b2699 - Added AI NeedsToPlay hint to Song of Freyalise. 2018-05-01 18:21:44 +03:00
Agetian
6a9ba00aca - Added AI logic to Shalai, Voice of Plenty. 2018-05-01 10:32:53 +03:00
Agetian
5329138d0f - Further tweaks to Guybrush Threepwood 2 quest deck. 2018-05-01 08:46:33 +03:00
Agetian
ed0109af94 - Updating Guybrush Threepwood decks with several RIX cards. 2018-05-01 08:27:14 +03:00
Sol
1a3308017a Revert "Merge branch 'temp_dev6' into 'master'" 
This reverts merge request !499
 2018-05-01 01:11:29 +00:00
Sol
64e8dd35c2 Merge branch 'temp_dev6' into 'master' 
Allow for Seeded RNG in simulation games!

See merge request core-developers/forge!499
 2018-05-01 01:01:30 +00:00
Agetian
4f487f3009 Merge branch 'FlickeringWard' of git.cardforge.org:Seravy/forge into seravy-ai-fixes 2018-04-30 08:36:46 +03:00
Sol
1acb0e9e95 Merge branch 'dev-mode' into 'master' 
Dev Mode: added a way to remove counters from permanent.

See merge request core-developers/forge!501
 2018-04-30 00:17:43 +00:00
Michael Kamensky
f72c5aa59c Merge branch 'temp_dev4' into 'master' 
Android updates

See merge request core-developers/forge!491
 2018-04-29 20:16:28 +00:00
Agetian
4bf54c721d - Comment fix. 2018-04-29 20:55:00 +03:00
Agetian
b482964373 - Sub counter: only list counters that are present on the card. 2018-04-29 20:19:11 +03:00
Agetian
01017efab6 - Dev Mode: added a way to remove counters from permanent. 2018-04-29 18:51:46 +03:00
Meerkov
792fdad4be Tiny Update: Removes dead code. 
Just removes some code that does nothing.


(cherry picked from commit b462c41dff99f0173b7e228f826ca0bf0d8103cb)
 2018-04-28 17:01:42 +00:00
Agetian
445625ba1e - Removing references to mana pool in other parts of the code. 2018-04-28 13:34:16 +03:00
Hans Mackowiak
d11c608bd0 Merge branch 'dom-oracle-mana-pool' into 'master' 
Oracle non-functional update: removing "mana pool" from card texts.

See merge request core-developers/forge!487
 2018-04-28 09:08:31 +00:00
Meerkov
8f68266585 Update Guava to 24.1 
This updates Guava 16 to 24.1. Currently 16 is a 4 year old version, so there are a lot of bug fixes. The Android .pom has 24.1-android instead of 24.1-jre, for compatability reasons.

I did not test the android build, however the desktop build works.

Also resovles two warnings and drops a "TODO" on a comment that was highlighting a possible bug but wasn't easily marked to discover later.


(cherry picked from commit be578af80467c1850d9dcec0af6fe18840fff7e9)
 2018-04-28 08:42:22 +00:00
Agetian
7d5b0be5ca - Removed an unused variable. 2018-04-27 13:48:00 +03:00
Agetian
98bc1fb01a - Somewhat better implementation for getArt in ConquestRegion. 2018-04-27 10:53:06 +03:00
Agetian
aa11704caa - Correction for Ixalan plane definition. 2018-04-27 10:52:03 +03:00
Agetian
bc701fecb3 - Making transform cards work as plane/region art in Planar Conquest (mobile Forge). 
- Currently will show the cards untransformed on the plane selection screen and transformed on the multiverse/region screen.
 2018-04-27 10:46:48 +03:00
Agetian
e8462e8291 - Oracle non-functional update: removing "mana pool" from card texts. Pass one. 2018-04-27 08:42:30 +03:00
swordshine
d74c6a2e21 Merge branch 'dom-pw-decks' into 'master' 
Deck descriptions

See merge request core-developers/forge!486
 2018-04-27 02:39:44 +00:00
Rob Schnautz
bddd94aec0 back matter, premium Sunblast Angel 2018-04-26 21:49:25 +00:00
Rob Schnautz
665d07cd56 back matter, premium Goliath Sphinx 2018-04-26 21:44:41 +00:00
Rob Schnautz
7375ad8a5d premium sphinx of uthuun 2018-04-26 21:41:41 +00:00
Rob Schnautz
581461f0e3 back matter 2018-04-26 21:39:11 +00:00
Rob Schnautz
3dc3da5932 back matter 2018-04-26 21:21:56 +00:00
Sol
0464601dc5 Merge branch 'dom-fixes' into 'master' 
DOM fixes

See merge request core-developers/forge!485
 2018-04-26 21:10:52 +00:00
Rob Schnautz
3f31bf85fb back matter 2018-04-26 21:10:31 +00:00
Chris H
7c4429da46 DOM fixes 2018-04-26 17:07:40 -04:00
Rob Schnautz
b73efba916 back matter 2018-04-26 21:06:53 +00:00
Rob Schnautz
58cbcee5ba back matter 2018-04-26 21:01:50 +00:00
Rob Schnautz
ab8b71b152 back matter 2018-04-26 20:56:34 +00:00
Rob Schnautz
ca71a997dd back matter 2018-04-26 20:55:30 +00:00
Chris H
c938f8e731 Fix Shivan FIre 2018-04-26 16:40:03 -04:00
Rob Schnautz
263b906aec D'Avenant before Danitha 2018-04-26 02:44:39 +00:00