external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,439 Commits 31 Branches 187 Tags
688f8599be7d1d5886d854052a8add82173f320c
Commit Graph

40439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
688f8599be - Added puzzle PS_RNA7. 2019-03-12 09:09:48 +03:00
Agetian
c161cdcf51 - Fix the name of MPS_RNA edition. 2019-03-12 09:00:01 +03:00
Michael Kamensky
2937041c63 Merge branch 'card-and-image-audit-menu' into 'master' 
Card and image audit menu

See merge request core-developers/forge!1451
 2019-03-12 05:51:21 +00:00
Tim Scott
eafa4418d6 Reduce the size of the font for the audit report. 
Change up the scroll window to allow for horizontal movement.

Add code/code2 info for easier reference.
 2019-03-10 15:39:10 -05:00
Michael Kamensky
2ff19e05a1 Merge branch 'master' into 'master' 
Forge for Android v1.6.22.001

See merge request core-developers/forge!1455
 2019-03-10 15:31:57 +00:00
Agetian
e23acfb5de - Preparing Forge for Android publish 1.6.22.001 [incremental]. 2019-03-10 18:29:36 +03:00
Agetian
255c30ce9c Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-03-10 17:54:00 +03:00
Blacksmith
49ba10d97b Clear out release files in preparation for next release 2019-03-10 14:02:21 +00:00
Blacksmith
c3346c737e [maven-release-plugin] prepare for next development iteration 2019-03-10 13:57:44 +00:00
Blacksmith
db3c4d2d2f [maven-release-plugin] prepare release forge-1.6.22 forge-1.6.22 2019-03-10 13:57:39 +00:00
Blacksmith
c0c38dbef9 Update README.txt for release 2019-03-10 13:55:41 +00:00
Sol
5fb20c7eb9 Merge branch 'patch-3' into 'master' 
Patch 3

See merge request core-developers/forge!1454
 2019-03-10 13:54:14 +00:00
Sol
1791d96a78 Merge branch 'patch-2' into 'master' 
Update dovin_architect_of_law.txt

See merge request core-developers/forge!1453
 2019-03-10 13:54:01 +00:00
Tim Scott
89df7694d9 Correct copy to clipboard action. 2019-03-10 08:51:51 -05:00
Sol
c2690a80e2 Update ANNOUNCEMENTS.txt 2019-03-10 13:51:43 +00:00
Sol
b50779177e Update CHANGES.txt 2019-03-10 13:49:00 +00:00
Sol
b5fb772893 Update dovin_architect_of_law.txt 2019-03-10 13:35:05 +00:00
Michael Kamensky
341d882a93 Merge branch 'patch-1' into 'master' 
Update domri_city_smasher.txt

See merge request core-developers/forge!1452
 2019-03-10 08:36:40 +00:00
Sol
1ea8519be8 Update domri_city_smasher.txt 2019-03-10 04:06:42 +00:00
Tim Scott
02abe851c0 Organize images not found and cards not implemented into two separate lists for easier reference. 
Add label to dialog after audit operation for easier reference.
 2019-03-09 12:41:17 -06:00
Agetian
c73ed59a52 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-03-09 17:36:32 +03:00
Michael Kamensky
10b68ae716 Merge branch '897-mayplay-allows-facedown-land-even-it-shoudn-t' into 'master' 
Resolve "MayPlay allows Facedown Land even it shoudn't"

Closes #897

See merge request core-developers/forge!1450
 2019-03-09 14:36:01 +00:00
Agetian
e99a507744 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-03-09 16:50:21 +03:00
Hanmac
393207c9d8 Card: fixed LandAbility + FaceDown + MayPlay 2019-03-09 13:59:21 +01:00
Michael Kamensky
c0103815be Merge branch 'clash-log-post-action' into 'master' 
Log after clashing so players know what happened to top of library

See merge request core-developers/forge!1449
 2019-03-09 03:53:17 +00:00
tehdiplomat
f7d40687b6 Log after clashing so players know what happened to top of library 2019-03-08 10:11:15 -05:00
Michael Kamensky
a24a844078 Merge branch 'master' into 'master' 
Fix the AI not considering Adapt P/T bonus correctly on attack

Closes #892

See merge request core-developers/forge!1448
 2019-03-08 09:52:13 +00:00
Michael Kamensky
a820ba35f7 Fix the AI not considering Adapt P/T bonus correctly on attack 2019-03-08 09:52:13 +00:00
Agetian
e4bd18e25c - Additional fix for the other stat. 2019-03-08 12:50:15 +03:00
Agetian
efd9b6a0fc - Fix a bug with the AI not considering Adapt correctly during attack. 2019-03-08 12:49:06 +03:00
Sol
baa4f8cd74 Merge branch '894-dies-leaves-triggers-don-t-work-on-copied-permanents' into 'master' 
Resolve "Dies/Leaves triggers don't work on copied permanents"

Closes #894

See merge request core-developers/forge!1447
 2019-03-08 02:32:58 +00:00
Hanmac
9067d676eb GameAction: register from LKI to fix leave the battlefield 2019-03-07 20:34:32 +01:00
Michael Kamensky
4b6cf610a7 Merge branch 'master' into 'master' 
Added puzzle PS_RNA6 (Possibility Storm - Ravnica Allegiance 06)

See merge request core-developers/forge!1446
 2019-03-06 17:58:41 +00:00
Agetian
12ee419158 - Fix PS_RNA6. 2019-03-06 20:57:52 +03:00
Michael Kamensky
53075e5099 Merge branch 'master' into 'master' 
Sound support for multicolor lands

See merge request core-developers/forge!1445
 2019-03-06 17:56:56 +00:00
Agetian
33ee5a0a17 - Added puzzle PS_RNA6. 2019-03-06 20:54:06 +03:00
Alessandro Coli
c4d859cb03 Sound support for multicolor lands 2019-03-05 19:17:48 +01:00
Michael Kamensky
0cbd22ae69 Merge branch 'estrid-fix' into 'master' 
Fix Estrid, the Masked -1 ability

See merge request core-developers/forge!1443
 2019-03-05 11:56:51 +00:00
Michael Kamensky
05ecffcbd1 Merge branch 'master' into 'master' 
Forge for Android 1.6.21.003

See merge request core-developers/forge!1444
 2019-03-05 06:13:19 +00:00
Agetian
3f15be2732 - Fix inverse logic in TokenEffect (fixes e.g. Estrid, the Masked -1 ability) 2019-03-05 09:10:48 +03:00
Agetian
cc13020b4b - Preparing Forge for Android publish 1.6.21.003 [hotfix]. 2019-03-05 08:35:36 +03:00
Agetian
1a27142f1f Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-03-05 08:02:13 +03:00
Sol
89348173a5 Merge branch 'revert-fc987a81' into 'master' 
Revert "Merge branch 'fix-bad-art-deck-art-corruption' into 'master'"

See merge request core-developers/forge!1442
 2019-03-04 15:58:17 +00:00
Sol
8a9c27f9ae Revert "Merge branch 'fix-bad-art-deck-art-corruption' into 'master'" 
This reverts merge request !1440
 2019-03-04 15:58:06 +00:00
Agetian
7da2316c0a - Preparing Forge for Android publish 1.6.21.002 [incremental]. 2019-03-04 16:34:33 +03:00
Michael Kamensky
6807257630 Merge branch 'custom-pool-options' into 'master' 
Swanky new Choose Sets Dialog randomizer

See merge request core-developers/forge!1431
 2019-03-04 13:13:50 +00:00
Michael Kamensky
223136dd6f Merge branch 'android-max-size-image-cache' into 'master' 
Android max size image cache

See merge request core-developers/forge!1432
 2019-03-04 13:13:35 +00:00
Sol
0b997a2937 Android max size image cache 2019-03-04 13:13:35 +00:00
Michael Kamensky
66debd6806 Merge branch 'master' into 'master' 
Added puzzle PS_RNA5 (Possibility Storm - Ravnica Allegiance 05)

See merge request core-developers/forge!1441
 2019-03-04 13:13:10 +00:00
Agetian
063ebf2f70 - Added puzzle PS_RNA5. 2019-03-04 15:04:21 +03:00