external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,815 Commits 31 Branches 187 Tags
2709968e2529b83273f5c3ff0b33636093d0fb65
Commit Graph

45815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
306d427d91 remove unnecessary import 2020-09-27 20:19:42 +08:00
Hans Mackowiak
46e667ba6f Game: store counters put on cards this turn 2020-09-27 14:18:43 +02:00
Alessandro Coli
1382952d76 Introduced 2 quest preferences for the multiplier and the number of wild 
opponents
 2020-09-27 14:14:12 +02:00
Anthony Calosa
2a722797f7 fix PreloadExtendedArt functionality. If you have less RAM, disable this. 2020-09-27 20:13:55 +08:00
Alessandro Coli
72ee7dfeb3 Merge branch 'master' into questMode_wildOpponents 2020-09-27 14:10:49 +02:00
John
f49bca2611 Update Zendikar Rising Commander.txt 2020-09-27 08:34:37 +00:00
Anthony Calosa
f00f05024d Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-09-27 12:24:15 +08:00
Anthony Calosa
8d2e47e993 Update added Borderless Card list 2020-09-27 12:15:35 +08:00
Michael Kamensky
a2dbfcde5f Merge branch 'newBranch' into 'master' 
[Mobile] refactor Borderless Card Art generation.

See merge request core-developers/forge!3192
 2020-09-27 04:10:53 +00:00
Anthony Calosa
f08c11f930 [Mobile] refactor Borderless Card Art generation. 
All borderless card art (currently hardcoded list - initial) will show borderless display. todo: add seperate textfile for custom borderless cards (should have limit since generating many texture would eat performance)
 2020-09-27 09:43:00 +08:00
Michael Kamensky
c8f3f90e8d Merge branch 'newBranch' into 'master' 
[Mobile] Refactor Border Generation

See merge request core-developers/forge!3190
 2020-09-26 16:34:25 +00:00
Michael Kamensky
3745da900a Merge branch 'landPopupPanel' into 'master' 
New options introduced to see the popup only for nonbasic lands.

See merge request core-developers/forge!3191
 2020-09-26 16:31:23 +00:00
Anthony Calosa
f4262b8682 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-09-26 21:15:39 +08:00
Anthony Calosa
db6e23321a refactor Border generation on Mobile. 
The Border images (currently White and Black) will now be based on pixel color from the card texture. It will get the pixel color from card texture pixel xy(1,1) on full images and texture reqion xy on fullborder images. This should fix card sets with mixed white and black bordered cards (example Magazine Insert set (PMEI)).
 2020-09-26 21:14:45 +08:00
Alessandro Coli
36da6b6c7f New options introduced to see the popup only for nonbasic lands. 
Trigger of the popup moved earlier so as the sound will play on its
closure (when the lands enters play) and not on its opening.
 2020-09-26 14:24:55 +02:00
Michael Kamensky
22889ac205 Merge branch 'millstring' into 'master' 
Tidying up Mill a bit

See merge request core-developers/forge!3189
 2020-09-26 04:02:11 +00:00
Northmoc
c8bd950581 Add StackDescription to make up for removing FromBottom from Mill stringbuilder 2020-09-25 22:08:17 -04:00
Northmoc
24069739c4 MillEffect.java more in line with new language 2020-09-25 22:08:16 -04:00
Sol
4e8a28dda5 Merge branch 'migrate' into 'master' 
migrate ZNR + ZNC

See merge request core-developers/forge!3188
 2020-09-26 01:06:59 +00:00
Sol
afe19dd1ae Merge branch 'ukkima' into 'master' 
ukkima_stalking_shadow.txt better X

See merge request core-developers/forge!3186
 2020-09-26 01:05:51 +00:00
Northmoc
92c6440a36 migrate ZNR + ZNC 2020-09-25 15:13:47 -04:00
Sol
3022973544 Merge branch 'moraugfix' into 'master' 
fix moraug_fury_of_akoum.txt so it triggers on your turn only

See merge request core-developers/forge!3185
 2020-09-25 19:05:47 +00:00
Michael Kamensky
e680cb1c54 Merge branch 'master' into 'master' 
ZNR Achievements by Marek14

See merge request core-developers/forge!3187
 2020-09-25 18:43:02 +00:00
Michael Kamensky
530ade0c72 - ZNR achievements. 2020-09-25 21:41:25 +03:00
Michael Kamensky
e832466ec2 Merge branch 'upgrade_imagefetcher' into 'master' 
support download UI language card image

See merge request core-developers/forge!3176
 2020-09-25 17:39:38 +00:00
Michael Kamensky
dc89425dad Merge branch 'achievements' into 'master' 
Add some dracontes Trophy Case images!!

See merge request core-developers/forge!3181
 2020-09-25 17:39:18 +00:00
Northmoc
74b8efb828 ukkima_stalking_shadow.txt better X 2020-09-25 12:37:54 -04:00
Northmoc
5e05b63feb fix moraug_fury_of_akoum.txt so it triggers on your turn only 2020-09-25 11:09:36 -04:00
Sol
c745ab3c92 Merge branch 'typo' into 'master' 
punctuation in ChangeZone string builder

See merge request core-developers/forge!3183
 2020-09-25 14:04:27 +00:00
Sol
2971e6bbd9 Merge branch 'grenzo' into 'master' 
grenzo_havoc_raiser.txt fix Goad mode

See merge request core-developers/forge!3184
 2020-09-25 14:04:05 +00:00
Northmoc
b62b870a09 punctuation 2020-09-25 09:59:14 -04:00
Northmoc
625bbb37db grenzo_havoc_raiser.txt fix Goad mode 2020-09-25 09:57:46 -04:00
Northmoc
e9522e4f4f Update Trophy Case images (dracontes!!) 2020-09-24 15:05:15 -04:00
Michael Kamensky
a6ce237a2b Merge branch '1583-triggers-that-target-allow-cancel-with-valid-targets' into 'master' 
Resolve "Triggers that target allow "Cancel" with valid targets"

Closes #1583

See merge request core-developers/forge!3179
 2020-09-24 03:47:53 +00:00
CCTV-1
8e7e2933fe remove unnecessary line wrap 2020-09-23 18:15:58 +08:00
Hans Mackowiak
324ac00ae4 TargetSelection: fix trigger need to be Mandatory 2020-09-23 07:24:12 +02:00
Michael Kamensky
b25d1d33bb Merge branch 'merfolk_windrobber_fix' into 'master' 
Merfolk Windrobber fix

See merge request core-developers/forge!3175
 2020-09-23 04:11:08 +00:00
Michael Kamensky
37c6206997 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3177
 2020-09-23 04:10:12 +00:00
Sol
3b16aed31d Merge branch 'vine_gecko' into 'master' 
ZNR: add vine_gecko with OnlyFirstSpell

See merge request core-developers/forge!3165
 2020-09-22 18:25:46 +00:00
Sol
a8dcff1600 Merge branch 'ZNC21' into 'master' 
ZNC 21 Sep

See merge request core-developers/forge!3171
 2020-09-22 18:24:33 +00:00
Tim Mocny
521bb8212e ZNC 21 Sep 2020-09-22 18:24:33 +00:00
Sol
09a61eac12 Merge branch 'CMR_ed' into 'master' 
Commander Legends editions file

See merge request core-developers/forge!3178
 2020-09-22 18:23:38 +00:00
Sol
fe9a0bcace Merge branch 'ZNR18' into 'master' 
ZNR 18 Sep

See merge request core-developers/forge!3151
 2020-09-22 18:23:23 +00:00
Tim Mocny
3451407468 ZNR 18 Sep 2020-09-22 18:23:23 +00:00
Northmoc
7e398fb9f6 Commander Legends.txt ed file 2020-09-22 14:17:21 -04:00
Andreas Bendel
b3aed3a919 Update de-DE.properties 2020-09-22 18:06:57 +00:00
CCTV-1
43c425d8bd try get UI language image from scryfall 2020-09-22 21:24:58 +08:00
paul_snoops
612858a7e4 Merfolk Windrobber would draw instead of mill when dealing combat damage 2020-09-22 13:11:20 +01:00
Hans Mackowiak
07fe0d1501 ZNR: add vine_gecko with OnlyFirstSpell 2020-09-22 07:21:12 +02:00
Michael Kamensky
6e33e2695b Merge branch 'formats' into 'master' 
Rotation format update

See merge request core-developers/forge!3173
 2020-09-22 04:36:17 +00:00