external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,167 Commits 33 Branches 187 Tags
77b46d0a840ce95f0460e43e96742f8ff3dd406c
Commit Graph

53167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
77b46d0a84 Merge branch 'junk' into 'master' 
Fix Junk Winder

See merge request core-developers/forge!5534
 2021-10-10 04:46:41 +00:00
tool4EvEr
d359d6dc3c Fix Junk Winder 2021-10-10 01:05:05 +02:00
Bug Hunter
e9b93e2215 Merge branch 'payfix' into 'master' 
canPlayAndPayFor: Improve check

See merge request core-developers/forge!5532
 2021-10-09 11:11:00 +00:00
tool4EvEr
53499296bc Improve check 2021-10-09 13:00:10 +02:00
Michael Kamensky
29f836344b Merge branch 'payfix' into 'master' 
canPlayAndPayFor: check for RaiseCost

Closes #871

See merge request core-developers/forge!5531
 2021-10-09 10:52:09 +00:00
Michael Kamensky
e99e535ee4 Merge branch 'twosat-master-patch-15209' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5530
 2021-10-09 10:51:38 +00:00
tool4EvEr
6789c29c6b canPlayAndPayFor: check for RaiseCost 2021-10-09 12:37:21 +02:00
Andreas Bendel
ab6fc6e2bf Update de-DE.properties 
translated UseLaserArrows and ReplaceCard
 2021-10-09 10:06:34 +00:00
Michael Kamensky
514cd61863 Merge branch 'gristAgain' into 'master' 
Card: fix Grist again

Closes #1985

See merge request core-developers/forge!5529
 2021-10-09 09:18:20 +00:00
Hans Mackowiak
93a0a83854 Card: fix Grist again 2021-10-09 10:37:36 +02:00
Michael Kamensky
029b72573b Merge branch 'bearer' into 'master' 
Bearer of the Heavens: fix crash

See merge request core-developers/forge!5528
 2021-10-09 04:17:34 +00:00
Michael Kamensky
3f810f3907 Merge branch 'changezoneall' into 'master' 
Allow additional reordering when moving cards together

See merge request core-developers/forge!5524
 2021-10-09 04:17:16 +00:00
tool4EvEr
04c1b2664f Clean up 2021-10-08 21:35:50 +02:00
tool4EvEr
9f7012f718 fix crash 2021-10-08 20:00:49 +02:00
Michael Kamensky
77f7966a2c Merge branch 'kamahl' into 'master' 
Kamahl's Sledge: fix crash

See merge request core-developers/forge!5527
 2021-10-08 17:54:43 +00:00
tool4EvEr
ffacead162 fix crash 2021-10-08 19:45:22 +02:00
tool4EvEr
8c3fe81669 Allow reordering of multiple attachments 2021-10-08 19:34:23 +02:00
tool4EvEr
421474b025 Fix for Null Profusion 2021-10-08 19:34:23 +02:00
TRT
7dfab9c54e Reorder for Genesis Ultimatum 2021-10-08 19:34:22 +02:00
TRT
4939a5ef8c Allow additional reordering when moving cards together 2021-10-08 19:34:21 +02:00
Hans Mackowiak
c905dd753b Merge branch '1984' into 'master' 
move eff.updateStateForView() in other effects

Closes #1984

See merge request core-developers/forge!5526
 2021-10-08 15:33:17 +00:00
Northmoc
e29718444e move eff.updateStateForView() in other effects 2021-10-08 11:10:05 -04:00
Michael Kamensky
7af36d7c0f Merge branch 'master' into 'master' 
VentureAi timing tweaks, minor AI hint

See merge request core-developers/forge!5525
 2021-10-08 14:56:59 +00:00
Michael Kamensky
dd63093642 - Tweak the timing for VentureAi activations when it has an associated cost. 2021-10-08 17:55:04 +03:00
Michael Kamensky
e417d510c4 - Added an AI hint to Devoted Paladin. 2021-10-08 17:42:53 +03:00
Michael Kamensky
6a15f3d30c Merge branch 'damageprevent' into 'master' 
DamagePreventAi: Add extra sanity check

See merge request core-developers/forge!5523
 2021-10-08 13:17:36 +00:00
TRT
b5800afa65 Add extra sanity check 2021-10-08 15:14:24 +02:00
Michael Kamensky
490c1ce7bc Merge branch 'damagedeal' into 'master' 
DamageDealAi: Improve mandatory targeting with stuff like Fury, so AI less masochistic

See merge request core-developers/forge!5522
 2021-10-08 09:24:05 +00:00
TRT
5b99cea173 Clean up 2021-10-08 11:21:25 +02:00
Michael Kamensky
7e8b8e9f6d Merge branch 'changedTypeTable' into 'master' 
Card: changed Color/Type as Table

Closes #1982

See merge request core-developers/forge!5521
 2021-10-08 09:02:03 +00:00
Michael Kamensky
7380de6bb5 Merge branch 'master' into 'master' 
[Mobile] Add Replace Card Variant Option for Deck Editor

See merge request core-developers/forge!5520
 2021-10-08 09:01:15 +00:00
tool4EvEr
d3a24a93ce Improve mandatory targeting with stuff like Fury, so AI less masochistic 2021-10-08 09:42:29 +02:00
Hans Mackowiak
b83174e6ee Card: changed Color/Type as Table 2021-10-08 07:22:00 +02:00
Anthony Calosa
f867c99113 update 2021-10-08 11:49:29 +08:00
Anthony Calosa
0fb7ea9e00 Merge remote-tracking branch 'core/master' 2021-10-08 11:41:29 +08:00
Anthony Calosa
9061f36a34 [Mobile] Add Replace Card option for Deck Editor 2021-10-08 11:35:58 +08:00
Michael Kamensky
88c29ce2a3 Merge branch 'manifest' into 'master' 
Fix ManifestAi

See merge request core-developers/forge!5519
 2021-10-08 03:35:54 +00:00
tool4EvEr
34b19c0207 Clean up 2021-10-07 23:38:14 +02:00
Sol
35ee2aa80b Update seismic_shift.txt 2021-10-07 19:59:47 +00:00
Sol
c7d0d65aab Update seismic_shift.txt 2021-10-07 19:59:33 +00:00
tool4EvEr
2b2545d4ae Fix ManifestAi 2021-10-07 21:55:26 +02:00
Michael Kamensky
6e39e698b0 Merge branch 'master' into 'master' 
Patch getPaperCardFromImageKey not to crash for the Commander replacement effect

See merge request core-developers/forge!5518
 2021-10-07 19:14:48 +00:00
Michael Kamensky
ccc423dd26 - Patch getPaperCardFromImageKey not to crash for the Commander replacement effect 2021-10-07 22:09:53 +03:00
Michael Kamensky
476edd03ea Merge branch 'master' into 'master' 
[Mobile] Refactor Targeting Arrows

See merge request core-developers/forge!5515
 2021-10-07 13:33:49 +00:00
Michael Kamensky
64a91fd534 Merge branch 'hideaway2' into 'master' 
better Hideaway reminder text fix

See merge request core-developers/forge!5516
 2021-10-07 13:33:15 +00:00
Michael Kamensky
e9dc4a5442 Merge branch 'fix' into 'master' 
tidy up sublime_epiphany.txt

See merge request core-developers/forge!5517
 2021-10-07 13:32:35 +00:00
Michael Kamensky
760a25a5fa Merge branch 'sacrifice' into 'master' 
getPlayers: use APNAP order

See merge request core-developers/forge!5510
 2021-10-07 13:32:12 +00:00
Bug Hunter
ff257f89f7 getPlayers: use APNAP order 2021-10-07 13:32:12 +00:00
Northmoc
7a224548a5 better Hideaway fix 2021-10-07 09:26:54 -04:00
Northmoc
1e83e5364f tidy up sublime_epiphany.txt 2021-10-07 09:10:02 -04:00