external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,400 Commits 32 Branches 187 Tags
32a71f7d3a2d80df15c9bf3328b10db743eb268c
Commit Graph

56400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
89de0103a8 remove unnecessary check 2022-02-17 18:09:16 +08:00
Anthony Calosa
cac9e818bf add cursor sprite 2022-02-17 13:25:49 +08:00
Anthony Calosa
b825be4d9e update check 2022-02-17 13:18:31 +08:00
Anthony Calosa
ce1bc2211d unused imports 2022-02-17 12:49:34 +08:00
Anthony Calosa
2606f9aa67 add Cursor Indicator for Card Magnifier toggle 2022-02-17 12:31:35 +08:00
Anthony Calosa
a8b80e2f28 Merge remote-tracking branch 'core/master' 2022-02-17 09:14:39 +08:00
Anthony Calosa
9a7349f045 Merge branch 'kevlahnota-master-patch-80486' into 'master' 
prevent NPE ControlGainAi.java

See merge request core-developers/forge!6244
 2022-02-17 01:12:46 +00:00
Anthony Calosa
7983ca7cf0 Fix NPE ControlGainAi.java 2022-02-17 01:11:55 +00:00
Renato Santos
23de92a6a4 Update forge-gui/res/cardsfolder/upcoming/bearer_of_memory.txt 2022-02-17 00:32:18 +00:00
Renato Santos
90ab91bc08 Tested card scripts for NEO (2022-02-16) 2022-02-17 00:30:08 +00:00
Anthony Calosa
517d9c5d7c add right click control to adventure mode 2022-02-17 07:44:00 +08:00
Anthony Calosa
daaa418583 add double right click control 
- single right click will turn on/off the magnified card
- double right click will toggle the magnified display
 2022-02-17 07:00:40 +08:00
Anthony Calosa
ca9bf9180b Merge remote-tracking branch 'core/master' 2022-02-17 06:33:04 +08:00
Anthony Calosa
4f9c64019c add mouse right click toggle 
- right click can switch on/off the magnified card.
- todo add custom cursor indicator and magnified card display switch
 2022-02-17 06:30:09 +08:00
Paul Hammerton
3487f72581 Merge branch 'precipitous_drop' into 'master' 
a-precipitous_drop.txt fix

See merge request core-developers/forge!6242
 2022-02-16 22:21:33 +00:00
paul_snoops
63400ada2c a-precipitous_drop.txt drop fix 2022-02-16 22:18:04 +00:00
Michael Kamensky
29032b9c2c Merge branch 'neo_14' into 'master' 
NEO – 15 Feb

See merge request core-developers/forge!6238
 2022-02-16 18:38:28 +00:00
Tim Mocny
1526e9da1f NEO – 15 Feb 2022-02-16 18:38:26 +00:00
Michael Kamensky
a0240ffd98 Merge branch 'draft_update' into 'master' 
Implement DBL draft and NEO rankings

See merge request core-developers/forge!6222
 2022-02-16 14:35:54 +00:00
Michael Kamensky
99d8476020 Merge branch 'vivien' into 'master' 
Fix Vivien, Monsters' Advocate counters for all tokens

See merge request core-developers/forge!6239
 2022-02-16 14:34:57 +00:00
Anthony Calosa
d89a05e6c1 fix crash 2022-02-16 20:41:44 +08:00
Anthony Calosa
910f3cfd0c update 2022-02-16 20:38:55 +08:00
Anthony Calosa
a9bb6de9a5 Merge remote-tracking branch 'core/master' 2022-02-16 20:32:29 +08:00
Anthony Calosa
05f266b47d unused imports 2022-02-16 20:23:59 +08:00
Anthony Calosa
1c750146cc added match transition 2022-02-16 20:17:20 +08:00
Hans Mackowiak
fab0fc08da Merge branch 'arlinnLayerFix' into 'master' 
CardFactoryUtil: use new Transform layer for Daybound

Closes #2087

See merge request core-developers/forge!6224
 2022-02-16 12:10:18 +00:00
Hans Mackowiak
21e403e2e4 Merge branch 'TRT-master-patch-97239' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/the_kami_war_o_kagachi_made_manifest.txt

See merge request core-developers/forge!6241
 2022-02-16 12:06:11 +00:00
Hans Mackowiak
44984951d1 Merge branch 'DFCcopy' into 'master' 
Fix DFC copy having both faces

See merge request core-developers/forge!6236
 2022-02-16 12:04:50 +00:00
Bug Hunter
cbf1bdd3a5 Fix DFC copy having both faces 2022-02-16 12:04:44 +00:00
Bug Hunter
7237f07b34 Update forge-gui/res/cardsfolder/upcoming/the_kami_war_o_kagachi_made_manifest.txt 2022-02-16 07:21:42 +00:00
Anthony Calosa
d5a57dc38c fix encoding 2022-02-16 07:23:57 +08:00
Anthony Calosa
039ae3be79 [Mobile] Hide overlay on closing screen animation 2022-02-16 06:56:28 +08:00
Anthony Calosa
3a693515e3 Merge remote-tracking branch 'core/master' 2022-02-16 06:45:16 +08:00
Anthony Calosa
d562562547 [Mobile] restore revealAISkipCards for mobile port 2022-02-16 06:42:40 +08:00
tool4EvEr
443b55f4a9 Fix Vivien, Monsters' Advocate counters for all tokens 2022-02-15 21:19:47 +01:00
Northmoc
6b273a0d74 BoosterGenerator support sheetReplaceCardFromSheet 2022-02-15 19:55:25 +00:00
Northmoc
a718d0039f CardEdition implement sheetReplaceCardFromSheet 2022-02-15 19:55:25 +00:00
Northmoc
1940b484af DBL edition tweak syntax for dfc replacements 2022-02-15 19:55:25 +00:00
paul_snoops
1c2335883b Implement DBL and NEO drafts 2022-02-15 19:55:25 +00:00
Michael Kamensky
39c49b2315 Merge branch 'ninjutsu_sd' into 'master' 
ChangeZoneEffect - improve changeHiddenOriginStackDescription (focus on Ninjutsu)

See merge request core-developers/forge!6237
 2022-02-15 18:54:55 +00:00
Northmoc
1bca6d158e ChangeZoneEffect - improve changeHiddenOriginStackDescription (focus on Ninjutsu) 2022-02-15 13:24:02 -05:00
Michael Kamensky
123c111914 Merge branch 'johnwilliams7-master-patch-78046' into 'master' 
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!6235
 2022-02-15 16:20:46 +00:00
Anthony Calosa
b833cacd09 update input for magnify 2022-02-15 20:33:24 +08:00
John Williams
4c59819dff Update Secret Lair Drop Series.txt 2022-02-15 12:28:49 +00:00
Anthony Calosa
c4384b3fb1 revert2 2022-02-15 19:19:01 +08:00
Anthony Calosa
355d194962 revert 2022-02-15 19:09:52 +08:00
Anthony Calosa
cb4adbde64 update CardRenderer.java 2022-02-15 15:52:31 +08:00
Anthony Calosa
ea6aaa1efb [Mobile] Card Magnifier 
- Add option to display larger version of the hovered card.
 2022-02-15 15:31:44 +08:00
Michael Kamensky
1b5de6c2b3 Merge branch 'freshmaster' into 'master' 
Tested card scripts for NEO (2022-02-13)

See merge request core-developers/forge!6227
 2022-02-15 04:17:37 +00:00
Michael Kamensky
d690e3d28b Merge branch 'neo_kotose' into 'master' 
NEO: Kotose, the Silent Spider and support

See merge request core-developers/forge!6232
 2022-02-15 04:17:27 +00:00