external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,129 Commits 31 Branches 187 Tags
c1c0424af9ab1e6beee10c9b3a0e68db2c723818
Commit Graph

8471 Commits

Author SHA1 Message Date
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
e8a84ad571 - Added AI NeedsToPlay hint to Triumph of Gerrard. 2018-05-01 19:10:46 +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
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
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
austinio7116
acef14aadc Merge branch 'fix_outcome_memory_leak' into 'master' 
Memory leak within a match

See merge request core-developers/forge!458
 2018-04-25 22:35:02 +00:00
Agetian
4feefd404b - Tweaked the updated Drudge Sentinel. 2018-04-24 21:04:23 +03:00
Chris H
ea3e91483a Flip Drudge Sentinel script to improve the AI handling 2018-04-24 10:27:34 -04:00
Chris H
a54a9beb87 Fix Quest WinLose checking wrong Player type against each other 2018-04-23 20:30:09 -04:00
Hans Mackowiak
922c7e148c Merge branch 'prevent-repleffect-fix' into 'master' 
Fixing cards with a damage prevention replacement effect which did not have ActiveZones set.

See merge request core-developers/forge!471
 2018-04-23 06:55:01 +00:00
Agetian
6f421e688a - Fixing cards with a damage prevention replacement effect which did not have ActiveZones set. 2018-04-23 09:38:51 +03:00
austinio7116
e5db8ff8b3 Merge branch 'assorted-fixes' into 'master' 
Adding Rat Colony to card limit exceptions, fixing Goblin Chainwhirler.

Closes #527

See merge request core-developers/forge!470
 2018-04-23 06:36:40 +00:00
Agetian
75d6ea6537 - Unifying the list for card exceptions in DeckFormat, as suggested and coded by Austinio. 2018-04-23 09:21:55 +03:00
Agetian
4a8d4346be - Fixed Goblin Chainwhirler not having First Strike. 2018-04-23 07:36:19 +03:00
Agetian
1522baa97d - Adding Rat Colony to card limit exceptions in several places. 2018-04-23 07:31:39 +03:00
Sol
8c64bd64cf Merge branch 'puzzle-fixes' into 'master' 
PS_RIX3: remove summoning sickness from thopter tokens

Closes #528

See merge request core-developers/forge!468
 2018-04-23 01:07:09 +00:00
Jamin W. Collins
4dadeaa083 PS_RIX3: remove summoning sickness from thopter tokens 
Fixes: core-developers/forge#528

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-04-22 18:28:45 -06:00
Chris H
ade17c5eaf Fix Memory leak within a match 2018-04-22 15:18:22 -04:00
Rob Schnautz
55d97404f2 Revert "Delete Promo set for Gatherer.txt" 
This reverts commit 75d3972196
 2018-04-22 18:22:36 +00:00
Michael Kamensky
e60d5173f4 Merge branch 'assorted-fixes' into 'master' 
Fixed references to the no longer existing set MBP.

Closes #525

See merge request core-developers/forge!466
 2018-04-22 17:47:47 +00:00
Agetian
30d4bb923b - Fixed references to the no longer existing set MBP. 2018-04-22 20:46:16 +03:00
Michael Kamensky
a4c1fea08b Merge branch 'domimages' into 'master' 
Added challenger deck precons and fixed/sorted DOM token image paths

See merge request core-developers/forge!463
 2018-04-22 14:34:28 +00:00