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

45699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
23c00c290e Optimize darkforge theme bg texture for desktop 2020-10-01 00:05:07 +08:00
Anthony Calosa
b00863d827 Fix icons for desktop darkforge theme 2020-09-30 23:44:38 +08:00
Anthony Calosa
5be73af7e9 Fix GenericChoice UI 2020-09-30 21:26:06 +08:00
Anthony Calosa
9d39882728 finalize theme color 2020-09-30 16:40:50 +08:00
Anthony Calosa
6a6b8a3400 remove unnecessary imports 2020-09-30 16:26:43 +08:00
Anthony Calosa
c1ba4344de Add Wild Opponent Quest preference options to mobile 2020-09-30 16:16:47 +08:00
Michael Kamensky
a2c7e83eef Merge branch 'newBranch' into 'master' 
Update darkforge theme

See merge request core-developers/forge!3203
 2020-09-30 05:47:56 +00:00
Michael Kamensky
6b063bda8d Merge branch 'muldrotha' into 'master' 
muldrotha_the_gravetide.txt tweak Affected params

See merge request core-developers/forge!3200
 2020-09-30 05:47:41 +00:00
Michael Kamensky
9b060f1387 Merge branch 'yasharn' into 'master' 
ZNR: Yasharn

See merge request core-developers/forge!3204
 2020-09-30 05:47:08 +00:00
Michael Kamensky
f6c9552c1e Merge branch 'questMode_wildOpponents' into 'master' 
Quest mode wild opponents

See merge request core-developers/forge!3202
 2020-09-30 05:46:47 +00:00
Anthony Calosa
a2d1618973 combat arrow swatches 2020-09-30 13:40:46 +08:00
Anthony Calosa
f6c34834ff update color swatches 2020-09-30 13:27:05 +08:00
Anthony Calosa
a41f6bd36f optimize file size 2020-09-30 11:38:28 +08:00
Anthony Calosa
17de4fea76 update, only need to override the theme colors 2020-09-30 10:29:34 +08:00
Northmoc
0257879b99 yasharn_implacable_earth.txt - keyword support 2020-09-29 18:06:58 -04:00
Northmoc
f325814730 yasharn_implacable_earth.txt and keyword support 2020-09-29 18:05:41 -04:00
Anthony Calosa
625b60d29d Merge remote-tracking branch 'core/master' into newBranch 2020-09-30 03:44:59 +08:00
Anthony Calosa
c576c22a57 update darkforge theme 2020-09-30 03:36:43 +08:00
Michael Kamensky
66b127fb82 Merge branch 'TheList' into 'master' 
Added The List edition file

See merge request core-developers/forge!3201
 2020-09-29 18:42:59 +00:00
Michael Kamensky
5cc6c26430 Merge branch 'newBranch' into 'master' 
[Mobile] Minor Improvement and Fixes

See merge request core-developers/forge!3199
 2020-09-29 18:42:36 +00:00
Alessandro Coli
4345d97faf Merge branch 'master' into questMode_wildOpponents 2020-09-29 19:58:46 +02:00
paul_snoops
a0777a1136 Added The List edition file 2020-09-29 16:16:25 +01:00
Anthony Calosa
302bc0e5eb rename 2020-09-29 22:06:51 +08:00
Anthony Calosa
627c98f1a7 Update 2020-09-29 21:39:18 +08:00
Northmoc
59938f0023 muldrotha_the_gravetide.txt tweak Affected params 2020-09-29 09:19:12 -04:00
Anthony Calosa
3c76fb4971 [Mobile] Minor Improvement and Fixes 
-Add auto game pause when the spectator is viewing zoomed cards (prevents the bug when you're viewing zoomed cards and suddenly the match ends (AI vs AI), you cannot open the zoom overlay until you restart the app again)
-Fix exiled Facedown card should display the hidden image and not the morph image (Gonti, Lord of Luxury, etc)
-Show Winlose Overlay button should only be enabled when match is over otherwise its disabled.
 2020-09-29 18:52:27 +08:00
Michael Kamensky
2ce9f9a5b2 Merge branch 'uroban' into 'master' 
28 Sep Ban

See merge request core-developers/forge!3198
 2020-09-29 05:11:00 +00:00
Michael Kamensky
29981fc89c Merge branch '1580-znr-iridescent-hornbeetle-wants-to-count-counters-added-to-creatures' into 'master' 
Resolve "ZNR: Iridescent Hornbeetle wants to count counters added to CREATURES"

Closes #1580

See merge request core-developers/forge!3196
 2020-09-29 05:10:35 +00:00
Northmoc
04e3527be8 28 Sep Ban 2020-09-28 21:58:08 -04:00
Michael Kamensky
655d4f5c4c Merge branch 'newBranch' into 'master' 
Update added Borderless Card list

See merge request core-developers/forge!3193
 2020-09-28 04:20:48 +00:00
swordshine
0f3b877ec2 Merge branch 'patch-12' into 'master' 
Update Zendikar Rising Commander.txt

See merge request core-developers/forge!3195
 2020-09-28 01:57:38 +00:00
swordshine
6fb1cafaa2 Merge branch 'oracle' into 'master' 
Oracle Changes

See merge request core-developers/forge!3194
 2020-09-28 01:57:15 +00:00
Tim Mocny
bc4966e8c1 Oracle Changes 2020-09-28 01:57:15 +00:00
Alessandro Coli
c0a3d96621 Merge branch 'master' into questMode_wildOpponents 
# Conflicts:
#	forge-gui/res/languages/en-US.properties
 2020-09-27 16:01:56 +02:00
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