external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,457 Commits 31 Branches 187 Tags
ffa7e3912151df72a7035d06af943b51e37121f4
Commit Graph

49457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sol
7cdf36df87 Merge branch 'STX_fixes' into 'master' 
STX edition fix MDFCs

See merge request core-developers/forge!4389
 2021-04-05 14:57:07 +00:00
paul_snoops
02f25f8816 STX edition fix MDFCs 2021-04-05 15:54:13 +01:00
Sol
fa7e6bfa36 Merge branch 'stx_update' into 'master' 
STX edition file update

See merge request core-developers/forge!4367
 2021-04-05 14:07:13 +00:00
paul_snoops
854890cc77 STX edition file update 2021-04-05 14:57:15 +01:00
Northmoc
5445ec1b8d RememberTriggerCards param support for Conspiracy Theorist 2021-04-05 08:44:40 -04:00
Northmoc
050f11bfab conspiracy_theorist.txt 2021-04-05 08:43:46 -04:00
tool4EvEr
da89b95654 Fix DigMultiple not changing cards when no valid targets 2021-04-05 13:41:46 +02:00
Anthony Calosa
71631ccf0c Merge branch 'churrufli-master-patch-15537' into 'master' 
Update text, resource file size

See merge request core-developers/forge!4384
 2021-04-05 10:24:05 +00:00
Churrufli
f1c38dd742 Update text 2021-04-05 10:01:34 +00:00
Bug Hunter
0fc7126238 Merge branch 'typofix' into 'master' 
Show of Confidence: Fix cost typo

See merge request core-developers/forge!4383
 2021-04-05 09:45:53 +00:00
tool4EvEr
41cf366014 Fix cost typo 2021-04-05 11:45:13 +02:00
Anthony Calosa
4288ae3582 Merge branch 'master' into 'master' 
[Mobile] Seperate cache for Cards and Other Images

See merge request core-developers/forge!4382
 2021-04-05 09:07:03 +00:00
Anthony Calosa
e57d0a4d0e [Mobile] add OtherImageLoader for otherCache 2021-04-05 17:04:40 +08:00
Anthony Calosa
1b6a0188f3 [Mobile] Seperate cache for Cards/Tokens and Icon/Booster/Fatpacks 2021-04-05 15:45:22 +08:00
Michael Kamensky
e225b8a77c Merge branch 'card-fixes' into 'master' 
Codie oracle text

See merge request core-developers/forge!4381
 2021-04-05 04:12:40 +00:00
Michael Kamensky
e4b1c542db Merge branch 'sheetfix' into 'master' 
Sheets / Edition parsing fixes

See merge request core-developers/forge!4377
 2021-04-05 04:12:33 +00:00
Adam Pantel
b960460e02 Codie oracle text 2021-04-04 23:33:31 -04:00
Anthony Calosa
c8f39802ae Merge branch 'master' into 'master' 
Limit preloading

See merge request core-developers/forge!4380
 2021-04-05 03:27:59 +00:00
Anthony Calosa
e3caad856d Limit preloading 2021-04-05 11:25:42 +08:00
Anthony Calosa
97bc512d1c Merge branch 'master' into 'master' 
cleanup

See merge request core-developers/forge!4379
 2021-04-05 02:07:51 +00:00
Anthony Calosa
5752fe698f cleanup 2021-04-05 10:06:16 +08:00
Anthony Calosa
727ef87a11 Merge branch 'master' into 'master' 
[Mobile] Update ImageCache Texture dispose

See merge request core-developers/forge!4378
 2021-04-04 22:56:04 +00:00
Anthony Calosa
a92c85a0be [Mobile] Update ImageCache Texture dispose 2021-04-05 06:51:27 +08:00
tool4EvEr
225790cc4b Fix parsing of new edition sections 2021-04-04 23:52:41 +02:00
tool4EvEr
0202d52e49 Printsheets: Update wrong JMP codes 2021-04-04 22:56:09 +02:00
Bug Hunter
397ad4c597 Merge branch 'brawl2' into 'master' 
Add commander relocation for brawl

See merge request core-developers/forge!4376
 2021-04-04 20:29:12 +00:00
tool4EvEr
ce00f31f0f Add commander relocation for brawl 2021-04-04 22:28:19 +02:00
swordshine
b9dc9e6eb0 Merge branch 'master' into 'master' 
Leonin Vanguard fix + Medomai

See merge request core-developers/forge!4372
 2021-04-04 15:33:30 +00:00
Anthony Calosa
05884bba0d Merge branch 'master' into 'master' 
[Mobile] When generating a lot of image at once (more than 100) in the shop...

See merge request core-developers/forge!4373
 2021-04-04 13:40:36 +00:00
Anthony Calosa
d8f37ac6a7 Merge remote-tracking branch 'core/master' 2021-04-04 21:38:01 +08:00
Anthony Calosa
9c89e0b790 [Mobile] When generating a lot of image at once (more than 100) in the shop list/rewards/unlocked sets, clear the cache 2021-04-04 21:35:01 +08:00
Hythonia
b37d695c8b Minor card fixes 2021-04-04 15:06:50 +02:00
Michael Kamensky
263db54a12 Merge branch 'Williams-master-patch-50535' into 'master' 
STX Discord Contributions

See merge request core-developers/forge!4362
 2021-04-04 11:23:18 +00:00
Michael Kamensky
dc8c25b8bc Merge branch 'master' into 'master' 
STX: Last three cards

See merge request core-developers/forge!4365
 2021-04-04 11:18:53 +00:00
Anthony Calosa
1d43cae1b1 Merge branch 'kevlahnota-master-patch-75509' into 'master' 
unused import

See merge request core-developers/forge!4371
 2021-04-04 10:58:35 +00:00
Anthony Calosa
7e02ae518d unused import 2021-04-04 10:58:14 +00:00
Bug Hunter
4afc439eb1 Merge branch 'Williams-master-patch-14604' into 'master' 
Update make_your_mark.txt

See merge request core-developers/forge!4369
 2021-04-04 10:39:19 +00:00
Anthony Calosa
330d4f006f Merge branch 'kevlahnota-master-patch-65912' into 'master' 
update token-images

See merge request core-developers/forge!4370
 2021-04-04 10:23:17 +00:00
Anthony Calosa
5929a7c6f9 Update token-images.txt 2021-04-04 10:19:57 +00:00
Anthony Calosa
1b95989b05 Update token-images.txt 2021-04-04 10:14:59 +00:00
John
b284fc590e Update make_your_mark.txt 2021-04-04 10:13:45 +00:00
Anthony Calosa
dd3e21e5d4 Merge branch 'kevlahnota-master-patch-92499' into 'master' 
Update ImageCache.java

See merge request core-developers/forge!4368
 2021-04-04 09:29:00 +00:00
Anthony Calosa
31c674c3dc Update ImageCache.java 2021-04-04 09:28:15 +00:00
paul_snoops
b3632417a7 STX edition file update (no tokens yet) 2021-04-04 10:24:35 +01:00
Anthony Calosa
bc28919727 Merge branch 'kevlahnota-master-patch-57420' into 'master' 
Update borderlessCardList.txt

See merge request core-developers/forge!4366
 2021-04-04 09:12:05 +00:00
Anthony Calosa
4333744248 Update borderlessCardList.txt 2021-04-04 09:11:20 +00:00
John
d62599d62c Add new file 2021-04-04 07:31:19 +00:00
John
bad745d2a9 Add new file 2021-04-04 07:30:02 +00:00
Hythonia
0c6aa6afdb STX: Last three cards 2021-04-04 09:29:37 +02:00
John
bb8e68d1b1 Add new file 2021-04-04 07:29:31 +00:00