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,146 Commits 31 Branches 187 Tags
7b6a3b70e9119f0612ef2d4bf516e2d03e148bcc
Commit Graph

45146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
f5a89afa93 Merge branch 'newBranch' into 'master' 
remade border to have thin line edges

See merge request core-developers/forge!2603
 2020-03-12 05:38:32 +00:00
Anthony Calosa
7a49dd28e1 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-12 12:16:20 +08:00
Sol
d14f20bc43 Merge branch 'collector_number' into 'master' 
handle more complex imageKey parsing

See merge request core-developers/forge!2602
 2020-03-12 02:56:33 +00:00
Anthony Calosa
14a40e493f Try first variant art for .fullborder images 
(ie WAR variant has alternate art)
 2020-03-12 08:54:08 +08:00
Anthony Calosa
9b8e63501a Reduce whiteborder sides 2020-03-11 22:21:48 +08:00
Anthony Calosa
61097e9f80 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-11 22:13:42 +08:00
Sol
404ce34076 Merge branch 'mar9banres' into 'master' 
Brawl, Legacy, Modern bans

See merge request core-developers/forge!2605
 2020-03-11 13:08:44 +00:00
Northmoc
e546b6a689 Brawl, Legacy, Modern bans 2020-03-11 09:01:11 -04:00
Anthony Calosa
7e31e15ead Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-11 16:52:34 +08:00
Anthony Calosa
62d7824155 remade border to have thin line edges 
(simulate card edges)
 2020-03-11 14:52:21 +08:00
Jamin W. Collins
8c5a90d6e9 handle more complex imageKey parsing 
Should now be able to handle:
c:Town Gossipmonger|SOI|1$alt

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-10 21:23:29 -06:00
Sol
9345ff6725 Merge branch 'cardfixes' into 'master' 
Card Fixes: Settle the Wreckage, Cavalier of Dawn

See merge request core-developers/forge!2601
 2020-03-11 01:25:13 +00:00
Michael Kamensky
c45573ff2e Merge branch 'newBranch' into 'master' 
Minor Visual Improvement & Update Android target SDK

See merge request core-developers/forge!2600
 2020-03-10 18:10:14 +00:00
Adam Pantel
55300347ce Fix Settle the Wreckage, Cavalier of Dawn 2020-03-10 12:46:51 -04:00
Anthony Calosa
c85584445e update project.properties 2020-03-10 17:16:08 +08:00
Anthony Calosa
ceeb5d623f Increase Android target SDK so it will work with Android 10. 
Need to download SDK 26 to compile.

(Just tested this on Android 6 and Android 9, it works, but need to test the change for Android 5 and Android 10, for Android 10, It needs to turn the storage permission settings manually since the project don't have running permission setup currently)
 2020-03-10 16:53:59 +08:00
Anthony Calosa
1f4eff8b1c Adjust CroppedArea for Non Modern Card Frames 
(fullborder images)
 2020-03-10 16:45:08 +08:00
Anthony Calosa
41af869d3c Update Font 2020-03-10 16:35:39 +08:00
Michael Kamensky
2747d93e4c Merge branch 'fixXonCancel' into 'master' 
GameAction: refactor setting CastSA

Closes #1320

See merge request core-developers/forge!2585
 2020-03-10 06:35:34 +00:00
Hans Mackowiak
5c9251e295 SpellAbility: adding an Announce needs to be to originalMapParams too 2020-03-10 07:13:04 +01:00
Hans Mackowiak
fa67ee73a5 Card: cleanup multikicker values 2020-03-10 07:13:04 +01:00
Hans Mackowiak
e1659a4539 Combat: use lkiCase only if blocker itself is an lki 2020-03-10 07:13:04 +01:00
Hans Mackowiak
d5b578b306 Card: move reseting xmana paid to clearTemporaryVars 2020-03-10 07:13:04 +01:00
Hans Mackowiak
32b56018a6 GameAction: refactor setting CastSA 2020-03-10 07:13:04 +01:00
Peter
aa12085345 Add new translation strings about the new Auto Updater 2020-03-09 19:54:11 +01:00
Michael Kamensky
3dd20d9d0b Merge branch 'master' into 'master' 
Fix AddsCounters

Closes #1264

See merge request core-developers/forge!2597
 2020-03-09 18:27:54 +00:00
Agetian
8b922fc8f2 - Fix AddsCounters 2020-03-09 21:13:29 +03:00
CCTV-1
a527211bcf translate AutoUpdater 2020-03-09 20:15:36 +08:00
CCTV-1
c769a8adcf Merge remote-tracking branch 'upstream/master' 2020-03-09 19:21:43 +08:00
Agetian
c88a419e03 - Use ExecuteScript in PS_THB7 for a simpler implementation. 2020-03-09 12:32:06 +03:00
Michael Kamensky
b9618509be Merge branch 'desktop-autoupdate' into 'master' 
check for updates button

See merge request core-developers/forge!2537
 2020-03-09 03:59:40 +00:00
Sol
1076b1e29f Merge branch 'edition-fixes' into 'master' 
improve handling of foil-only Kaya for CN2

See merge request core-developers/forge!2584
 2020-03-09 01:10:26 +00:00
Jamin W. Collins
4717955afb improve handling of foil-only Kaya for CN2 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-08 09:43:58 -06:00
Michael Kamensky
af771d0c2c Merge branch 'master' into 'master' 
Added puzzles PS_THB6 and PS_THB7 - Possibility Storm - Theros Beyond Death 06 and 07

See merge request core-developers/forge!2595
 2020-03-08 12:12:36 +00:00
Michael Kamensky
8fea6b4cc0 Merge branch 'newBranch' into 'master' 
Add Cancel Button for Puzzle Screen

See merge request core-developers/forge!2596
 2020-03-08 12:12:30 +00:00
Anthony Calosa
9249029dc1 Add Cancel Button for Puzzle Screen 
(If you decide not to solve puzzle or accidentally hit start on Puzzle Menu)
 2020-03-08 18:37:36 +08:00
Agetian
e5d40554e1 - Error prevention on ID-based precast 2020-03-08 13:16:10 +03:00
Agetian
8b8e39ff41 - Added puzzles PS_THB6 and PS_THB7. 
- Added a way to precast a spell from a specific host by ID.
 2020-03-08 13:12:28 +03:00
Michael Kamensky
40591b04d2 Merge branch 'newBranch' into 'master' 
Update Menu & App Icons

See merge request core-developers/forge!2591
 2020-03-08 09:10:44 +00:00
Michael Kamensky
1c1e2416e4 Merge branch 'patch-4' into 'master' 
Replace bg_match.jpg in Darkred skin

See merge request core-developers/forge!2593
 2020-03-08 09:10:06 +00:00
CCTV-1
684e9327cd update forge-android support simplified chinese characters. 2020-03-08 16:22:20 +08:00
CCTV-1
5906891fec update translation 2020-03-08 16:18:02 +08:00
CCTV-1
e0c9d5e6e0 Merge remote-tracking branch 'upstream/master' 2020-03-08 16:11:00 +08:00
Anthony Calosa
bdf9d3f88e Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-08 12:34:47 +08:00
Sol
960760a564 Merge branch 'mb1fix' into 'master' 
MB1 pool corrections

See merge request core-developers/forge!2590
 2020-03-08 02:13:25 +00:00
Tim Mocny
f488cb1d0b MB1 pool corrections 2020-03-08 02:13:25 +00:00
Sol
c4e2004af3 Merge branch 'fixes' into 'master' 
simplify regex usage to group numbers, support Android 6

See merge request core-developers/forge!2592
 2020-03-08 02:11:07 +00:00
friarsol
dcb151f561 Get the Updater liike 90% of the way there. 2020-03-07 20:37:07 -05:00
Churrufli
4550ee26e3 Replace bg_match.jpg, previous one is a png renamed, I noticed may cause bugs in some Android versions 2020-03-07 18:15:23 +00:00
Jamin W. Collins
ecdea545fc simplify regex usage to group numbers, support Android 6 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-07 09:01:57 -07:00