external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,520 Commits 34 Branches 187 Tags
a5aa29f65e77ff1a186fdb3ea2bfbb0af200a39c
Commit Graph

52520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
f2f1b3d873 Merge remote-tracking branch 'remotes/core/master' 2021-09-03 09:04:39 +08:00
Northmoc
d2630e5e76 add Decayed keyword 2021-09-02 20:57:47 -04:00
Bug Hunter
0ebd6abcc8 Update forge-gui/res/cardsfolder/p/promise_of_tomorrow.txt 2021-09-02 20:32:16 +00:00
Bug Hunter
7df2696e79 Merge branch 'TRT-master-patch-70638' into 'master' 
Update forge-gui/res/cardsfolder/d/devour_intellect.txt

See merge request core-developers/forge!5280
 2021-09-02 19:10:22 +00:00
Bug Hunter
c6dbeeaa98 Update forge-gui/res/cardsfolder/d/devour_intellect.txt 2021-09-02 19:09:41 +00:00
Anthony Calosa
fb26931520 fix card detail for choicelist 2021-09-02 21:23:45 +08:00
Anthony Calosa
30e7e3242a update card renders 2021-09-02 20:31:48 +08:00
Anthony Calosa
c50858e67d Merge remote-tracking branch 'remotes/core/master' 2021-09-02 20:29:20 +08:00
Michael Kamensky
d7d56d6fbe Merge branch 'TRT-master-patch-10861' into 'master' 
Update forge-gui/res/cardsfolder/k/kathril_aspect_warper.txt

See merge request core-developers/forge!5279
 2021-09-02 07:40:22 +00:00
Michael Kamensky
e75e5ecf8c Merge branch 'johnwilliams7-master-patch-31128' into 'master' 
Update Judge Gift Cards 2021.txt

See merge request core-developers/forge!5277
 2021-09-02 07:38:16 +00:00
Bug Hunter
930ebcd6c4 Update forge-gui/res/cardsfolder/k/kathril_aspect_warper.txt 2021-09-02 05:31:06 +00:00
Anthony Calosa
a88ac4ec00 fix PW Crop 2021-09-02 04:42:50 +08:00
Anthony Calosa
49d968a5d7 fix NPE 2021-09-02 03:56:08 +08:00
Anthony Calosa
9f21d17429 update names 2021-09-02 02:24:24 +08:00
Anthony Calosa
5690b0625c [Mobile] added "Art" Border Masking Option & Card BG Textures 2021-09-02 01:59:04 +08:00
John Williams
dfae166e34 Update Judge Gift Cards 2021.txt 2021-09-01 15:19:38 +00:00
John Williams
29c7aa2452 Update Judge Gift Cards 2021.txt 2021-09-01 15:18:50 +00:00
Michael Kamensky
cc8c17b0dd Merge branch 'phantom' into 'master' 
Phantom Steed: Fix creating copies of tokens

See merge request core-developers/forge!5276
 2021-08-31 14:03:40 +00:00
TRT
5d93b22b74 Fix creating copies of tokens 2021-08-31 09:09:17 +02:00
Michael Kamensky
f356f3ef5b Merge branch 'psdg' into 'master' 
Sega Dreamcast cards :)

See merge request core-developers/forge!5275
 2021-08-31 04:23:04 +00:00
Michael Kamensky
d5ccccf42b Merge branch 'johnwilliams7-master-patch-95033' into 'master' 
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!5273
 2021-08-31 04:22:32 +00:00
Michael Kamensky
31f48b0565 Merge branch 'checkForManaSacrificeCost' into 'master' 
checkForManaSacrificeCost: skip from autopay for now

See merge request core-developers/forge!5274
 2021-08-31 04:22:29 +00:00
TRT
3a39ffa05e checkForManaSacrificeCost: skip from autopay for now 2021-08-30 22:35:05 +02:00
Northmoc
a30ddcf5ee velican_dragon.txt 2021-08-30 16:33:50 -04:00
Northmoc
ef488fc0d4 tornellan_protector.txt 2021-08-30 16:33:50 -04:00
Northmoc
faf3efdf74 sajis_torrent.txt 2021-08-30 16:33:49 -04:00
Northmoc
ff64b8f926 murgish_cemetery.txt 2021-08-30 16:33:49 -04:00
Northmoc
4def4271b0 ashuzas_breath.txt with Count$Random 2021-08-30 16:33:49 -04:00
Northmoc
025fa88aa4 lydari_elephant.txt 2021-08-30 16:33:49 -04:00
Northmoc
b583fe3a5e lydari_druid.txt 2021-08-30 16:33:49 -04:00
Northmoc
16f043f6a1 hapatos_might.txt 2021-08-30 16:33:49 -04:00
Northmoc
8a60d7006e camato_scout.txt 2021-08-30 16:33:49 -04:00
Northmoc
a67686ee8a ChooseTypeEffect support AtRandom 2021-08-30 16:33:49 -04:00
Northmoc
60ed3bf48b ashuzas_breath.txt 2021-08-30 16:33:49 -04:00
Northmoc
5c0ee31698 arden_angel.txt 2021-08-30 16:33:49 -04:00
Northmoc
4a4983cd6d Sega Dreamcast Cards edition file 2021-08-30 16:33:49 -04:00
John Williams
8560b8bd89 Update Secret Lair Drop Series.txt 2021-08-30 13:08:22 +00:00
Michael Kamensky
9996bef604 Merge branch 'patch-carddb-performance' into 'master' 
Code to cover cases for Randomly generated Deck (from Archetypes)

See merge request core-developers/forge!5268
 2021-08-30 08:15:21 +00:00
Michael Kamensky
f2b128985e Merge branch 'venture' into 'master' 
Fix VentureAi

See merge request core-developers/forge!5272
 2021-08-30 08:14:22 +00:00
TRT
93421a753d Fix VentureAi 2021-08-30 07:44:25 +02:00
Anthony Calosa
17f60dbfd8 Merge branch 'master' into 'master' 
Update Venture Effect

See merge request core-developers/forge!5270
 2021-08-29 13:21:48 +00:00
Anthony Calosa
eb0a6d47b1 updateTest 2021-08-29 21:19:30 +08:00
Anthony Calosa
d19f30e9ab Update Venture Effect 2021-08-29 21:11:42 +08:00
leriomaggio
24c31e9de9 Restored sort in CardPool using Collections to allow for Android comp. 2021-08-29 11:02:26 +01:00
leriomaggio
b1ed8565d3 FIXED typo in using iterator rather than keyset directly 2021-08-29 08:06:43 +01:00
leriomaggio
831b40e753 Removed unused imports! 2021-08-28 21:13:59 +01:00
leriomaggio
924c57be70 FIX typo, and renamed vars! 2021-08-28 20:58:06 +01:00
leriomaggio
eea2b754ec Added new Lookup table for sortable collector number to avoid repeated computations for the same coll numbers! 
FIX typo and made map final!
 2021-08-28 20:55:33 +01:00
leriomaggio
e2034ebd51 Added new Lookup table for sortable collector number to avoid repeated computations for the same coll numbers! 2021-08-28 20:48:27 +01:00
leriomaggio
8d35f747c0 Restored original implementation (but still using iterator) 2021-08-28 20:47:03 +01:00