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
54,905 Commits 31 Branches 187 Tags
2af4b814649e3ef04a6b55efd4cf10cded44510c
Commit Graph

54905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
81531b3339 Merge branch 'ordering' into 'master' 
Fix missing zone ordering e.g. Plow Under

See merge request core-developers/forge!5922
 2021-12-09 03:25:31 +00:00
Michael Kamensky
fde571548e Merge branch 'adventure' into 'master' 
Some bugfixes and a new statistic screen

See merge request core-developers/forge!5917
 2021-12-09 03:25:18 +00:00
tool4EvEr
3109745a9d Fix missing zone ordering e.g. Plow Under 2021-12-08 21:49:46 +01:00
Northmoc
4b4c62f77d AbilityUtils: add StartingPlayer Count calculation 2021-12-08 10:50:08 -05:00
Northmoc
920f762a91 Player.java: add isStartingPlayer boolean 2021-12-08 10:49:47 -05:00
Northmoc
0cb66b4a1a GameAction.java: add setStartingPlayer 2021-12-08 10:49:02 -05:00
Northmoc
193834af48 add startingPlayer to Game 2021-12-08 10:48:29 -05:00
Northmoc
82325bd634 forsaken_crossroads.txt 2021-12-08 10:48:04 -05:00
Bug Hunter
3bfe96aaeb Merge branch 'fix' into 'master' 
Fix typo

See merge request core-developers/forge!5920
 2021-12-08 11:36:20 +00:00
tool4EvEr
9a9060c4c0 Fix typo 2021-12-08 12:35:47 +01:00
Michael Kamensky
fedd1439de Merge branch 'a22_7' into 'master' 
A22 - 7 Dec

See merge request core-developers/forge!5919
 2021-12-08 10:22:00 +00:00
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