external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,612 Commits 33 Branches 187 Tags
e3258b5890f40fe573603c8d407d703b51b85678
Commit Graph

59612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
a94cde2da9 Merge branch 'master' into newmaster 2022-08-03 08:19:52 +08:00
tool4ever
688dd57e33 Fix noncreature permanents having P/T (#1259) 
Co-authored-by: TRT <>
 2022-08-02 19:40:41 +03:00
Grimm
95fba3d0cb WaveFunctionCollapse editor 2022-08-02 17:59:30 +02:00
Anthony Calosa
ca02fb50df Merge branch 'master' into newmaster 2022-08-02 13:54:58 +08:00
tool4ever
78b6062a15 Merge pull request #1258 from tool4ever/minFix 
Minor fixes
 2022-08-01 21:20:16 +02:00
tool4EvEr
5b47d7e20d Fix Haldan + Adventures from creatures 2022-08-01 21:16:58 +02:00
tool4EvEr
94d3c70d44 AI fix 2022-08-01 21:15:45 +02:00
tool4EvEr
e1d443b84f Fix counting 2022-08-01 21:15:18 +02:00
Anthony Calosa
558086ce03 Merge branch 'master' into newmaster 2022-08-01 16:43:51 +08:00
Anthony Calosa
12cde6fd4b Merge pull request #1255 from kevlahnota/master 
get screensize for Android
 2022-08-01 16:39:35 +08:00
Anthony Calosa
adb0540e92 Merge pull request #1256 from t-w-o-s-a-t/master 
Update de-DE.properties
 2022-08-01 16:39:19 +08:00
t-w-o-s-a-t
43d08c76b1 Update de-DE.properties 
translated lblChangeCombatantOption
 2022-08-01 10:23:36 +02:00
Anthony Calosa
f5bfdf3fda Update RewardScene.java 
minor adjustment
 2022-08-01 16:14:34 +08:00
Anthony Calosa
27877ab102 Update Main.java 2022-08-01 16:09:49 +08:00
Anthony Calosa
9505657e30 add alternate method 2022-08-01 15:57:15 +08:00
Anthony Calosa
e739198e98 Merge remote-tracking branch 'core/master' into newmaster 2022-08-01 15:39:53 +08:00
Anthony Calosa
f840bd118f Update RewardScene.java 2022-08-01 09:49:20 +08:00
Anthony Calosa
b3e4e4013f update check 2022-08-01 09:47:42 +08:00
Anthony Calosa
2a0f25a5f7 Update Main.java 2022-08-01 09:31:12 +08:00
Anthony Calosa
a72164d5f4 Update Main.java 2022-08-01 09:02:56 +08:00
Anthony Calosa
2c0075fae3 Update Main.java 2022-08-01 08:53:10 +08:00
Anthony Calosa
9266183cd9 Merge branch 'master' into newmaster 2022-08-01 08:48:25 +08:00
Anthony Calosa
6b1c8d30f4 get realScreen size for android 
- to check if the app renders different resolution and update the tooltips size
 2022-08-01 08:46:47 +08:00
Anthony Calosa
7ee6704d27 Merge pull request #1254 from kevlahnota/master 
revert inputconfirm for desktop version
 2022-08-01 08:45:09 +08:00
Anthony Calosa
c0514f8ab1 Update HumanCostDecision.java 2022-08-01 08:17:39 +08:00
Anthony Calosa
002591fa48 revert inputconfirm for desktop version 2022-08-01 05:58:10 +08:00
Anthony Calosa
680451065b Merge pull request #1253 from kevlahnota/master 
update RewardScene & RewardActor for various screen display
 2022-08-01 05:55:20 +08:00
Anthony Calosa
6b04ab36a1 update alignment 2022-08-01 05:38:47 +08:00
Anthony Calosa
67a599a892 update dimension 2022-08-01 05:04:09 +08:00
Anthony Calosa
7306b2e371 unused import 2022-08-01 04:27:53 +08:00
Anthony Calosa
7d8534204d update RewardScene & RewardActor for various screen display 
- support for tall phones, ultra wide and unfolded screen (11.2:9)
- tested with simulated display aspect ratio of (4:3, 5:4, 16:9, 16:10, 18:9, 19:9, 21:9)
 2022-08-01 03:40:24 +08:00
Anthony Calosa
e7a5f7ad32 Merge pull request #1252 from kevlahnota/master 
update remaining confirm action for human decision
 2022-07-31 20:40:07 +08:00
Anthony Calosa
ddbe8e7899 Update PlayerControllerHuman.java 2022-07-31 19:17:32 +08:00
Anthony Calosa
b82b79ca7c Update HumanCostDecision.java 2022-07-31 19:16:54 +08:00
Anthony Calosa
44997b55cd update remaining confirm action for human decision 
- to show relevant card and fix message title (removing "\n").
 2022-07-31 19:02:34 +08:00
Anthony Calosa
37354d3aa7 Merge pull request #1250 from tool4ever/cleanstuff2 
Cleanup & fix few more
 2022-07-31 12:08:55 +08:00
Anthony Calosa
8961e77cbc Merge pull request #1251 from kevlahnota/master 
fix LibGDXImageFetcher not deleting .tmp files
 2022-07-31 12:08:33 +08:00
Anthony Calosa
194d5b00dc fix LibGDXImageFetcher not deleting .tmp files 
- removed unnecessary keys for 2nd variants displaying first art.
  should fix displaying duplicated art when using image fetcher
 2022-07-31 12:04:57 +08:00
tool4EvEr
4e1ff60db5 Cleanup & fix few more 2022-07-30 23:35:16 +02:00
Agetian
8807a0a056 - Added puzzles PS_SNC3 - PS_SNC5. (#1248) 2022-07-30 14:03:27 +03:00
tool4ever
569e948068 Fix Second Guess (#1246) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2022-07-30 14:01:46 +03:00
Anthony Calosa
63914dbe35 Merge pull request #1244 from kevlahnota/master 
support setlookup on ImageFetcher
 2022-07-30 18:24:54 +08:00
Anthony Calosa
a60c39cfc1 update setlookup for scryfall.. 2022-07-30 18:21:45 +08:00
Paul Hammerton
4af5e6eb61 Merge pull request #1245 from paulsnoops/sld_update 
SLD edition update
 2022-07-30 10:21:44 +01:00
paulsnoops
3edc12b623 SLD edition update 2022-07-30 10:17:37 +01:00
Anthony Calosa
61fa890e7e support setlookup on ImageFetcher 
- currently looks the files in the FTP for cards
- closes #1223
 2022-07-30 17:13:15 +08:00
Anthony Calosa
b32e7ab137 Merge pull request #1243 from kevlahnota/master 
support lookup file for rewardActor
 2022-07-30 13:04:22 +08:00
Anthony Calosa
d369b45e60 support lookup card 2022-07-30 12:58:54 +08:00
Anthony Calosa
9e602202a8 update counter 2022-07-30 12:08:57 +08:00
Anthony Calosa
3195df6ad3 Merge pull request #1241 from tool4ever/cleanstuff 
Card cleanup and small fixes
 2022-07-30 11:28:16 +08:00