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

56242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renato Santos
303be10839 Corrections requested and implied 2022-02-19 01:43:25 +00:00
Northmoc
acb75de48c fix some bad Graveyard targeting 2022-02-18 17:46:32 -05:00
tool4EvEr
2886711f4e DiscardEffect: don't reveal to all if effect is just look 2022-02-18 22:38:34 +01:00
Michael Kamensky
8c8d7af137 Merge branch 'neo_rs' into 'master' 
NEO: Reckoner Shakedown and BranchEffect upgrade

See merge request core-developers/forge!6240
 2022-02-18 19:42:44 +00:00
Tim Mocny
00ceefa8d9 NEO: Reckoner Shakedown and BranchEffect upgrade 2022-02-18 19:42:44 +00:00
Renato Santos
a1873ea331 Update forge-gui/res/cardsfolder/upcoming/planar_incision.txt 2022-02-18 18:58:18 +00:00
TRT
dba802124d blockedThisTurn: switch to LKI list 2022-02-18 18:09:42 +01:00
Renato Santos
89a11460bf Tested card scripts for NEO (2022-02-18) 2022-02-18 17:08:50 +00:00
Bug Hunter
d1210d46c1 Merge branch 'fixstatic' into 'master' 
Fix StaticAbilityContinuous wrong indentation

See merge request core-developers/forge!6255
 2022-02-18 16:15:36 +00:00
TRT
b88ddf14e4 Fix StaticAbilityContinuous wrong indentation 2022-02-18 17:14:34 +01:00
Hans Mackowiak
88af696073 Merge branch 'TRT-master-patch-70820' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/shigeki_jukai_visionary.txt

See merge request core-developers/forge!6254
 2022-02-18 12:01:50 +00:00
Anthony Calosa
fc53c86685 added transition.png 2022-02-18 19:54:55 +08:00
Bug Hunter
f84acff981 Update forge-gui/res/cardsfolder/upcoming/shigeki_jukai_visionary.txt 2022-02-18 11:54:33 +00:00
Anthony Calosa
65998b0c92 update pom 2022-02-18 19:54:07 +08:00
Hans Mackowiak
7ef684c973 Merge branch 'excess2' into 'master' 
Rework ExcessDamage trigger

Closes #2097

See merge request core-developers/forge!6249
 2022-02-18 11:18:49 +00:00
Bug Hunter
e0c718c790 Rework ExcessDamage trigger 2022-02-18 11:18:47 +00:00
Renato Santos
dce447eeb8 Update forge-gui/res/cardsfolder/upcoming/kumano_faces_kakkazan_etching_of_kumano.txt 2022-02-18 09:11:13 +00:00
Paul Hammerton
03b47f69a2 Merge branch 'sld_update' into 'master' 
Update SLD - February 2022 Superdrop

See merge request core-developers/forge!6252
 2022-02-18 08:33:57 +00:00
Paul Hammerton
03c091fb80 Update Secret Lair Drop Series.txt 2022-02-18 08:31:19 +00:00
Anthony Calosa
2c78f9c6b6 update pom to include transition texture 2022-02-18 12:53:51 +08:00
Anthony Calosa
817a60c9fe unused imports 2022-02-18 12:27:10 +08:00
Anthony Calosa
d0d1ef023f Merge remote-tracking branch 'core/master' 2022-02-18 12:23:15 +08:00
Anthony Calosa
4464b138fb include lq transition bg 2022-02-18 12:19:03 +08:00
Michael Kamensky
770cfc57b3 Merge branch 'learn' into 'master' 
Learn: add missing reveal

See merge request core-developers/forge!6250
 2022-02-18 03:49:28 +00:00
Michael Kamensky
87bd3ace53 Merge branch 'altaddkw' into 'master' 
Improve Card Detail formatting for AlternateAdditionalCost keyword

See merge request core-developers/forge!6251
 2022-02-18 03:49:10 +00:00
Anthony Calosa
a933b850f7 update splash 2022-02-18 09:22:48 +08:00
Renato Santos
721e247239 Corrections requested or implied so far 2022-02-18 00:06:16 +00:00
Anthony Calosa
e6443e0658 unused imports 2022-02-18 07:17:35 +08:00
Anthony Calosa
510925d16d update cursor check 2022-02-18 07:10:01 +08:00
Anthony Calosa
a17341058e Merge remote-tracking branch 'core/master' 2022-02-18 04:28:34 +08:00
Anthony Calosa
5335df3dcc unified controls 2022-02-18 04:10:11 +08:00
tool4EvEr
b91a29ba31 Learn: add missing reveal 2022-02-17 20:29:00 +01:00
Northmoc
90cf9d7537 Improve Card Detail formatting for AlternateAdditionalCost keyword 2022-02-17 14:08:50 -05:00
Michael Kamensky
738afacbf7 Merge branch 'neo_17' into 'master' 
NEO - 17 Feb

See merge request core-developers/forge!6248
 2022-02-17 18:59:44 +00:00
Tim Mocny
64b17eabf6 NEO - 17 Feb 2022-02-17 18:59:43 +00:00
Michael Kamensky
1901595ae1 Merge branch 'excess' into 'master' 
Excess damage fix

See merge request core-developers/forge!6245
 2022-02-17 18:59:39 +00:00
Anthony Calosa
64414ab1fe add fullscreen and video mode 2022-02-18 01:30:26 +08:00
TRT
1dca57c5b5 AI fix 2022-02-17 17:51:25 +01:00
Anthony Calosa
693d7055c2 simpler adventure mode screen settings 
- available modes 720p, 768p, 900p, 1080p
since the classic mode and adventure mode uses the same config.
 2022-02-18 00:38:47 +08:00
TRT
536642d1e0 Logic fix 2022-02-17 16:02:20 +01:00
TRT
98b6f33d18 Excess damage fix 2022-02-17 14:16:36 +01:00
Anthony Calosa
0efcb72206 update cursor indicators 2022-02-17 19:10:21 +08:00
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