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,242 Commits 32 Branches 187 Tags
75b4ef9df84f736ae54dff3526dba9c9ba904d9c
Commit Graph

56242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4EvEr
47be073c50 Fix hasCreatureType 2021-12-20 18:32:36 +01:00
TRT
d9683252f1 Deal combat damage to players simultaneously 2021-12-20 18:09:57 +01:00
Bug Hunter
f0d87e2f31 Merge branch 'TRT-master-patch-93448' into 'master' 
Update forge-gui/res/cardsfolder/t/teferis_protection.txt

Closes #2041

See merge request core-developers/forge!5959
 2021-12-20 11:50:31 +00:00
Bug Hunter
2f3ba9b2e5 Update forge-gui/res/cardsfolder/t/teferis_protection.txt 2021-12-20 11:49:56 +00:00
Hans Mackowiak
473cb47c83 ~ cleanup logback dependencies 2021-12-20 11:50:15 +01:00
Bug Hunter
7069e5739b Merge branch 'TRT-master-patch-15571' into 'master' 
Update forge-gui/res/cardsfolder/w/wolverine_riders.txt

See merge request core-developers/forge!5958
 2021-12-20 07:55:07 +00:00
Bug Hunter
e00ae42696 Update forge-gui/res/cardsfolder/w/wolverine_riders.txt 2021-12-20 07:53:43 +00:00
Michael Kamensky
8ae0b968f0 Merge branch 'highlighting' into 'master' 
Fix player highlighting when selected

Closes #2040

See merge request core-developers/forge!5957
 2021-12-20 04:13:52 +00:00
tool4EvEr
4c3598d069 Fix mandatory 2021-12-20 00:02:33 +01:00
tool4EvEr
ddc12e2867 Clean up 2021-12-19 23:23:01 +01:00
Sol
8bd790cd1c Merge branch 'logRework' into 'master' 
replace log4j with logback

See merge request core-developers/forge!5955
 2021-12-19 22:18:48 +00:00
tool4EvEr
402ecc607e Fix NPE 2021-12-19 23:09:58 +01:00
tool4EvEr
c2f1472db7 Fix player highlighting when selected 2021-12-19 20:31:49 +01:00
Bug Hunter
78b4c07eec Merge branch 'TRT-master-patch-78524' into 'master' 
Update forge-gui/res/cardsfolder/b/basic_conjuration.txt

See merge request core-developers/forge!5956
 2021-12-19 11:50:36 +00:00
Bug Hunter
f7004369a0 Update forge-gui/res/cardsfolder/b/basic_conjuration.txt 2021-12-19 11:49:41 +00:00
Hans Mackowiak
fb529368fa replace log4j with logback 2021-12-19 10:32:18 +01:00
Michael Kamensky
4d68a4030b Merge branch 'y22_18' into 'master' 
Inquisitor Captain (Y22)

See merge request core-developers/forge!5953
 2021-12-18 17:40:43 +00:00
Michael Kamensky
2c01aa81b8 Merge branch 'npe' into 'master' 
untilHostLeavesPlayCommand: Fix NPE when returning Aura

See merge request core-developers/forge!5954
 2021-12-18 14:41:06 +00:00
tool4EvEr
0df3e72d00 untilHostLeavesPlayCommand: Fix NPE when returning Aura 2021-12-18 12:56:45 +01:00
paul_snoops
28f0c0c674 Y22 cards 18 Dec 2021-12-18 11:23:39 +00:00
Michael Kamensky
c3a0e437d9 Merge branch 'neo_cards_17_12' into 'master' 
NEO cards 17 Dec

See merge request core-developers/forge!5950
 2021-12-18 03:59:48 +00:00
Bug Hunter
d9460e7fe7 Merge branch 'trigger' into 'master' 
Fix trigger remembering

See merge request core-developers/forge!5952
 2021-12-17 21:00:49 +00:00
tool4EvEr
40e50cd612 Fix trigger remembering 2021-12-17 22:00:13 +01:00
Michael Kamensky
6b4e7f1521 Merge branch 'edition_fixes' into 'master' 
Wizards Play Network 2022 and edition fixes

See merge request core-developers/forge!5951
 2021-12-17 20:10:48 +00:00
paul_snoops
c0aac4334d kaito_shizuki fix 2021-12-17 17:56:06 +00:00
paul_snoops
9ccc75fcb8 kaito_shizuki 2021-12-17 15:00:18 +00:00
paul_snoops
bb5e1ec47e hidetsugu_devouring_chaos 2021-12-17 13:24:36 +00:00
paul_snoops
b7e8c13b93 NEO cards 17 Dec 2021-12-17 13:24:36 +00:00
paul_snoops
f40643a439 Wizards Play Network 2022 and edition fixes 2021-12-17 12:24:24 +00:00
Michael Kamensky
ac3d009521 Merge branch 'neo_edtion' into 'master' 
NEO edition file

See merge request core-developers/forge!5949
 2021-12-17 10:56:22 +00:00
paul_snoops
cd15187d60 add one card 2021-12-17 09:16:23 +00:00
paul_snoops
add44f99bc NEO edition file 2021-12-17 02:12:00 +00:00
Michael Kamensky
69f1b61fc1 Merge branch 'fixes' into 'master' 
Small fixes

See merge request core-developers/forge!5948
 2021-12-16 18:27:34 +00:00
paul_snoops
0fed13be54 Small fixes 2021-12-16 12:08:31 +00:00
Michael Kamensky
2ffb92ef43 Merge branch 'cleanup' into 'master' 
Remove some redundancy

See merge request core-developers/forge!5945
 2021-12-16 06:38:21 +00:00
Michael Kamensky
2d1ed05849 Merge branch 'sld_arcane_bonus' into 'master' 
SLD and MID update

See merge request core-developers/forge!5946
 2021-12-16 06:37:50 +00:00
Michael Kamensky
4cd7ad6635 Merge branch 'hidden' into 'master' 
Gyruda: if mill is replaced only find the cards if zone is known

See merge request core-developers/forge!5947
 2021-12-16 06:37:39 +00:00
tool4EvEr
a168e5b2ed Stitcher Geralf: avoid prompting when no match 2021-12-15 23:55:50 +01:00
tool4EvEr
cc04ca9e4a Fix Shadow Kin cleanup 2021-12-15 23:47:27 +01:00
tool4EvEr
d9a6fd1cb1 Gyruda: if mill is replaced only find the cards if zone is known 2021-12-15 23:35:19 +01:00
paul_snoops
da612b6c2f grafted_identity 2021-12-15 21:40:21 +00:00
paul_snoops
65030af713 SLD update 2021-12-15 21:35:15 +00:00
tool4EvEr
68fe6ec7e3 Remove some redundancy 2021-12-15 22:14:56 +01:00
Michael Kamensky
3921224e8a Merge branch 'y22_angel' into 'master' 
Y22: Angel of Eternal Dawn and support

See merge request core-developers/forge!5939
 2021-12-15 16:12:58 +00:00
Michael Kamensky
383f5b3f20 Merge branch 'y22_cards' into 'master' 
Y22 cards 13 Dec

See merge request core-developers/forge!5942
 2021-12-14 13:47:09 +00:00
paul_snoops
d4b11579b3 Produced Combo Any 2021-12-14 12:54:08 +00:00
Michael Kamensky
98f0486744 Merge branch 'netplay' into 'master' 
Fix updatePhase

Closes #1939

See merge request core-developers/forge!5943
 2021-12-14 03:54:29 +00:00
Northmoc
4be769fff9 add cantBeNight check to Untap.java 2021-12-13 14:57:02 -05:00
tool4EvEr
f3b9adecd4 Fix updatePhase 2021-12-13 19:59:05 +01:00
paul_snoops
66521783d3 fixes 2021-12-13 17:40:19 +00:00