external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,372 Commits 32 Branches 187 Tags
2c616670f51c913e69ca18e39c0867c569bf446c
Commit Graph

54372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
ba96043ebd Merge branch 'smart-card-art-deck-import-desktop-and-mobile' into 'master' 
Smart Card Art option in deck Importer for Desktop and Mobile + updates to Deck Import on Mobile

See merge request core-developers/forge!5754
 2021-11-08 09:41:23 +00:00
TRT
98f752244c Fix Prosper 2021-11-08 09:49:55 +01:00
TRT
6bc8d595bc Fix exileFromMiscZone paying with less than needed 2021-11-08 09:14:16 +01:00
Bug Hunter
7ec1066e2a Merge branch 'ordering-random' into 'master' 
ChangeZoneAllEffect: don't ask to order cards when they're going to end up being randomized.

See merge request core-developers/forge!5753
 2021-11-08 08:04:56 +00:00
leriomaggio
e86745fb34 Merge remote-tracking branch 'upstream/master' into smart-card-art-deck-import-desktop-and-mobile 2021-11-08 07:20:07 +00:00
Michael Kamensky
e2e32204e2 - ChangeZoneAllEffect: don't ask to order cards when they're going to end up being randomized. 2021-11-08 07:16:20 +03:00
Michael Kamensky
564873d05d Merge branch 'backport-rightclick' into 'master' 
Implement right clicking to zoom in mobile backport (desktop use only).

See merge request core-developers/forge!5752
 2021-11-08 04:13:19 +00:00
Michael Kamensky
8ff377444a - Implement right clicking to zoom in mobile backport (desktop use only). 2021-11-08 07:12:16 +03:00
Michael Kamensky
177ab00021 Merge branch 'music-profiles' into 'master' 
Selectable Music sets + Assorted AI improvements, card fixes

See merge request core-developers/forge!5751
 2021-11-08 04:09:20 +00:00
Michael Kamensky
2ab830717e - Update de-DE.properties. 2021-11-08 07:06:25 +03:00
Michael Kamensky
459f704521 Merge remote-tracking branch 'origin/music-profiles' into music-profiles 
# Conflicts:
#	forge-gui/res/languages/de-DE.properties
 2021-11-08 07:05:39 +03:00
Michael Kamensky
37e965d9ee Merge branch 'master' of https://git.cardforge.org/agetian/forge into music-profiles 
 Conflicts:
	forge-gui/res/languages/de-DE.properties
 2021-11-08 07:05:07 +03:00
Michael Kamensky
7bc4c9eb05 Merge branch 'master' into 'music-profiles' 
# Conflicts:
#   forge-gui/res/languages/de-DE.properties
 2021-11-08 04:03:40 +00:00
Michael Kamensky
cde8a122eb Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-11-08 07:00:43 +03:00
Michael Kamensky
f09416fb94 Merge branch 'voc_5' into 'master' 
VOC: 5 Nov

See merge request core-developers/forge!5748
 2021-11-08 03:57:45 +00:00
Northmoc
3927e1ab55 cemetery_desecrator.txt add cleanup 2021-11-07 22:52:58 -05:00
Michael Kamensky
a832cf9c46 Merge branch 'hiveheart' into 'master' 
VOW: Hiveheart Shaman and support

See merge request core-developers/forge!5742
 2021-11-08 03:52:03 +00:00
Northmoc
a9a4149fcd cemetery_desecrator.txt 2021-11-07 22:49:58 -05:00
Northmoc
a1a27b4fdd moldgraf_millipede.txt 2021-11-07 22:49:27 -05:00
Michael Kamensky
efc6a373d3 Merge branch 'vow_6' into 'master' 
VOW: 6 Nov

See merge request core-developers/forge!5741
 2021-11-08 03:49:07 +00:00
Michael Kamensky
420f1618cf Merge branch 'vow_5' into 'master' 
VOW: 5 Nov

See merge request core-developers/forge!5740
 2021-11-08 03:49:02 +00:00
Michael Kamensky
51992223be Merge branch 'vow_4' into 'master' 
VOW: 4 Nov

See merge request core-developers/forge!5739
 2021-11-08 03:48:47 +00:00
Michael Kamensky
2c028c68df Merge branch 'vow_3' into 'master' 
VOW: 3 Nov

See merge request core-developers/forge!5738
 2021-11-08 03:41:35 +00:00
Michael Kamensky
349878ab4e Merge branch 'SacCostCap' into 'master' 
Cleaning up some capitalization in SacCost

See merge request core-developers/forge!5745
 2021-11-08 03:39:16 +00:00
Michael Kamensky
96689b974f Merge branch 'tidy' into 'master' 
Tidy up various cards

See merge request core-developers/forge!5737
 2021-11-08 03:39:14 +00:00
Northmoc
6bfd10304b hopeful_initiate.txt 2021-11-07 22:34:38 -05:00
Northmoc
e96b73033f unhallowed_phalanx.txt (Svaldan) 2021-11-07 22:30:37 -05:00
Northmoc
a923d70222 circle_of_confinement.txt (Svaldan) 2021-11-07 22:11:49 -05:00
Northmoc
9c41fe0fc0 faithbound_judge_sinners_judgment.txt and counter 2021-11-07 22:08:27 -05:00
Northmoc
e205d0ad86 eruth_tormented_prophet.txt 2021-11-07 22:08:07 -05:00
Northmoc
951a67556a stormchaser_drake.txt 2021-11-07 21:09:42 -05:00
Northmoc
f025081f2a alchemists_gambit.txt 2021-11-07 21:09:35 -05:00
Northmoc
2242e164c8 demonic_tutor.txt fix stackdesc 2021-11-07 20:41:00 -05:00
Northmoc
56c2f6c46c witness_the_future.txt 2021-11-07 19:48:02 -05:00
Northmoc
c5bc048dcb skulking_killer.txt 2021-11-07 19:47:16 -05:00
Northmoc
9c5fefc48f sawblade_slinger.txt 2021-11-07 19:00:52 -05:00
Northmoc
98a0517d59 old_rutstein.txt 2021-11-07 19:00:36 -05:00
Northmoc
408ae82351 strefan_maurer_progenitor.txt fix Pump 2021-11-06 20:46:35 -04:00
Northmoc
b0da2cd79c support "sharesLandTypeWith" for Hiveheart Shaman 2021-11-06 20:45:41 -04:00
Northmoc
d04d66db41 hiveheart_shaman.txt 2021-11-06 20:45:05 -04:00
Northmoc
bdb5d5593a dreamshackle_geist.txt 2021-11-06 20:44:34 -04:00
Northmoc
1420c2e276 reclusive_taxidermist.txt 2021-11-06 20:33:50 -04:00
Northmoc
786437cef6 blood_hypnotist.txt 2021-11-06 19:55:43 -04:00
Northmoc
6393ee6d68 spiked_ripsaw.txt 2021-11-06 19:55:33 -04:00
Northmoc
09f46cfe10 markov_waltzer.txt 2021-11-06 19:39:00 -04:00
Northmoc
5cb2d8c6eb bloodtithe_harvester.txt 2021-11-06 14:24:26 -04:00
Northmoc
2081c3631a child_of_the_pack_savage_packmate.txt 2021-11-06 14:20:43 -04:00
Northmoc
567398d098 skull_skaab.txt 2021-11-06 14:07:59 -04:00
Northmoc
d610a37acb markov_purifier.txt 2021-11-06 13:59:29 -04:00
Northmoc
4d04c30e4c mirrorhall_mimic_ghastly_mimicry.txt 2021-11-06 13:52:28 -04:00