external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,094 Commits 31 Branches 187 Tags
bc85d9fcbe01c3be80426c76b36b78692901f21c
Commit Graph

55094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
c260fffb2d Merge branch 'eber' into 'master' 
A22: Captain Eberhart

See merge request core-developers/forge!5915
 2021-12-08 03:53:44 +00:00
Michael Kamensky
a273663d92 Merge branch 'a22_draft' into 'master' 
A22: Draft mechanic and cards

See merge request core-developers/forge!5914
 2021-12-08 03:52:33 +00:00
Michael Kamensky
66dd08d18f Merge branch 'patch' into 'master' 
Some prompt tweaks

See merge request core-developers/forge!5918
 2021-12-08 03:52:25 +00:00
Michael Kamensky
ec8bfd57bb Merge branch 'a22_6' into 'master' 
A22 - 6 Dec

See merge request core-developers/forge!5916
 2021-12-08 03:51:35 +00:00
Northmoc
2778008d4d eliminate redundant "Select X Card card(s)" 2021-12-07 21:39:46 -05:00
Northmoc
9638983775 HumanPlay allow for customizable OrString 2021-12-07 21:38:16 -05:00
Northmoc
9384a7380c cap lblIfYouDo 2021-12-07 21:37:03 -05:00
Northmoc
e972fc8635 faithful_disciple.txt add SacMe 2021-12-07 21:35:51 -05:00
Northmoc
2e6c73456f tibalt_wicked_tormenter.txt 2021-12-07 21:35:15 -05:00
Northmoc
45d0d646d4 cursebound_witch.txt 2021-12-07 21:33:54 -05:00
Grimm
0f4be415f5 Fixed context menu in shop and deck editor 2021-12-08 03:17:07 +01:00
Grimm
54246b9d36 Fixed statistic save 2021-12-08 00:11:36 +01:00
Grimm
582636b2d0 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-12-07 23:04:03 +01:00
Grimm
58eded5d09 Added 2 small poi 
fixed some crashes in the item view
 2021-12-07 23:03:40 +01:00
Northmoc
c80562f83e prompt capping 2021-12-07 15:42:17 -05:00
Northmoc
a452db8f93 break_expectations.txt 2021-12-07 15:39:12 -05:00
Northmoc
7b38e608fe RevealEffect: support "RevealAllValid" 2021-12-07 15:39:03 -05:00
Northmoc
7a265a0d4a expand MakeCardEffect 2021-12-07 15:38:30 -05:00
Northmoc
029b99ec50 ChooseCardNameEffect: improve draft mechanic support 2021-12-07 15:36:46 -05:00
Northmoc
012b88e5e0 arms_scavenger.txt 2021-12-07 15:36:03 -05:00
Northmoc
5f8432a5a8 geistchanneler.txt 2021-12-07 12:15:49 -05:00
Northmoc
ba7c3964b7 gitrog fix 2021-12-07 10:51:51 -05:00
Northmoc
2032faf5e9 add drawnThisTurn to list of things to copy when moving to stack 2021-12-07 09:11:17 -05:00
Northmoc
c7b3c5fa8e update noChangeKeys 2021-12-07 08:18:55 -05:00
Northmoc
bb6b37953b tireless_angler.txt 2021-12-07 08:18:54 -05:00
Northmoc
aed0c9f6a9 ominous_traveler.txt 2021-12-07 08:18:54 -05:00
Northmoc
86965e823f ishkanah_broodmother.txt 2021-12-07 08:18:53 -05:00
Northmoc
b61e89f0bd faithful_disciple.txt 2021-12-07 08:18:53 -05:00
Northmoc
5449b9eddd slayers_bounty.txt and RevealHandEffect support for "RevealType" 2021-12-07 08:18:52 -05:00
Northmoc
d662f97f90 new label prompt for Draft mechanic 2021-12-07 08:18:52 -05:00
Northmoc
ab4cb03839 support for Draft mechanic in ChooseCardNameEffect 2021-12-07 08:18:51 -05:00
Northmoc
f808074e8d captain_eberhart.txt 2021-12-07 08:06:11 -05:00
Michael Kamensky
e241619990 Merge branch 'karn' into 'master' 
RestartGameEffect: fix Mindslaver activation carrying over

See merge request core-developers/forge!5913
 2021-12-07 04:33:08 +00:00
Michael Kamensky
852be7b1a6 Merge branch 'zero' into 'master' 
A22: Patient Zero and support

See merge request core-developers/forge!5912
 2021-12-07 04:32:47 +00:00
Northmoc
5d822543ed toralfs_disciple.txt 2021-12-06 19:11:24 -05:00
Northmoc
8142274a81 gitrog_horror_of_zhava.txt 2021-12-06 19:11:17 -05:00
Grimm
d6f55eddfe Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-12-07 00:11:45 +01:00
Grimm
aee9699d14 Added statistic 2021-12-07 00:11:41 +01:00
tool4EvEr
ceeb5f4589 Clean up 2021-12-06 23:24:59 +01:00
tool4EvEr
35162c0c55 RestartGameEffect: fix Mindslaver activation carrying over 2021-12-06 20:46:35 +01:00
Northmoc
ff10e33d3e patient_zero.txt and support 2021-12-06 13:11:35 -05:00
Michael Kamensky
12df06eac1 Merge branch 'twosat-master-patch-90873' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5911
 2021-12-06 13:50:00 +00:00
Andreas Bendel
e20c457c96 Update de-DE.properties 
corrected btnNextGame
 2021-12-06 08:30:43 +00:00
Michael Kamensky
f9289ab566 Merge branch 'ActivationFirstCombat$_True' into 'master' 
ActivationFirstCombat$

See merge request core-developers/forge!5910
 2021-12-06 04:22:01 +00:00
tool4EvEr
9878cc91bf Clean up 2021-12-05 22:17:23 +01:00
tool4EvEr
21ea36de4e Improve discard check 2021-12-05 21:50:01 +01:00
tool4EvEr
59c6134586 Improve StackDescription 2021-12-05 20:54:29 +01:00
tool4EvEr
9aea6eb6f1 Update cards 2021-12-05 20:44:27 +01:00
tool4EvEr
acf57d1032 ActivationFirstCombat 2021-12-05 20:32:46 +01:00
tool4EvEr
26edab4373 Fix crash with Master Warcraft 2021-12-05 20:02:11 +01:00