Northmoc
|
b473faba84
|
nebelgast_beguiler.txt fix Oracle
|
2021-12-12 16:32:18 -05:00 |
|
Michael Kamensky
|
c6a20d39c4
|
Merge branch 'johnwilliams7-master-patch-89767' into 'master'
Update Resale Promos.txt
See merge request core-developers/forge!5933
|
2021-12-11 18:22:11 +00:00 |
|
John Williams
|
e523e2649d
|
Update Resale Promos.txt
|
2021-12-11 17:18:37 +00:00 |
|
Tim Mocny
|
c18f7221c6
|
Merge branch 'tibalt' into 'master'
tibalt_wicked_tormentor spelling fix
See merge request core-developers/forge!5929
|
2021-12-10 20:25:47 +00:00 |
|
paul_snoops
|
3a863155ca
|
tibalt_wicked_tormentor spelling fix
|
2021-12-10 20:19:12 +00:00 |
|
Michael Kamensky
|
f7655f46f6
|
Merge branch 'crossr' into 'master'
Y22: Forsaken Crossroads and support
See merge request core-developers/forge!5921
|
2021-12-10 19:16:47 +00:00 |
|
Michael Kamensky
|
a91a1bb390
|
Merge branch 'y22' into 'master'
Y22 Edition File
See merge request core-developers/forge!5927
|
2021-12-10 12:10:34 +00:00 |
|
Paul Hammerton
|
5b549e6f9f
|
Y22 Edition File
|
2021-12-10 08:56:50 +00:00 |
|
Michael Kamensky
|
65b1c2478f
|
Merge branch 'efreet' into 'master'
Fix Fickle Efreet duplicating itself when dead before flip resolves
See merge request core-developers/forge!5925
|
2021-12-09 18:52:49 +00:00 |
|
tool4EvEr
|
00ce9bacdd
|
Fix Fickle Efreet duplicating itself when dead before flip resolves
|
2021-12-09 19:22:43 +01:00 |
|
Michael Kamensky
|
642ac6f4ec
|
Merge branch 'TRT-master-patch-00429' into 'master'
Encore: don't sacrifice if you're not the controller
See merge request core-developers/forge!5924
|
2021-12-09 17:01:11 +00:00 |
|
Michael Kamensky
|
4b3c961a22
|
Merge branch 'twosat-master-patch-91620' into 'master'
Update de-DE.properties
See merge request core-developers/forge!5923
|
2021-12-09 14:53:22 +00:00 |
|
Bug Hunter
|
2b45f3b000
|
Encore: don't sacrifice if you're not the controller
|
2021-12-09 13:33:48 +00:00 |
|
Andreas Bendel
|
418fd4739a
|
Update de-DE.properties
translated lblChooseCardDraft
|
2021-12-09 10:44:59 +00:00 |
|
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 |
|