external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,142 Commits 32 Branches 187 Tags
6a15f3d30c75b99fa84b45c590911abbad2f6f2c
Commit Graph

53142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anthony Calosa
3c2f618faf adjust avatar targeting origin 2021-10-07 16:44:55 +08:00
Anthony Calosa
ad939ea3bd [Mobile] Refactor Targeting Arrows 
- Added option to use new arrow overlay
 2021-10-07 16:22:56 +08:00
Michael Kamensky
cb5f0f360b Merge branch 'hideaway' into 'master' 
allow for Watcher for Tomorrow to have correct reminder text

See merge request core-developers/forge!5514
 2021-10-07 03:49:39 +00:00
Michael Kamensky
5124c04ce4 Merge branch 'fix' into 'master' 
fix wandering_archaic_explore_the_vastlands.txt

See merge request core-developers/forge!5513
 2021-10-07 03:49:36 +00:00
Northmoc
63a7b68642 allow for Watcher for Tomorrow to have correct reminder text 2021-10-06 20:18:20 -04:00
Northmoc
3cb322ae5f fix wandering_archaic_explore_the_vastlands.txt 2021-10-06 17:59:41 -04:00
Michael Kamensky
fdb2c87d57 Merge branch 'master' into 'master' 
[Mobile] refactor netplay phase indicator

See merge request core-developers/forge!5511
 2021-10-06 20:05:55 +00:00
Michael Kamensky
e7f06887f0 Merge branch 'ai' into 'master' 
Add ReplaceDamageAi

See merge request core-developers/forge!5512
 2021-10-06 20:05:51 +00:00
tool4EvEr
d175f6cb6d Clean up 2021-10-06 20:59:51 +02:00
tool4EvEr
c8ed52a309 Fix NeedsPrevention logic 2021-10-06 18:26:15 +02:00
tool4EvEr
e21871b1e7 Clean up 2021-10-06 18:09:57 +02:00
Anthony Calosa
050ecb51bd [Mobile] refactor netplay phase indicator 2021-10-06 21:28:39 +08:00
Anthony Calosa
38f7d1ba83 Merge branch 'master' into 'master' 
fix disable card images

See merge request core-developers/forge!5509
 2021-10-06 09:47:08 +00:00
Anthony Calosa
eb01aa8e58 phase indicator 2021-10-06 17:46:00 +08:00
Anthony Calosa
0c2b0b3d9a fix disable card images 2021-10-06 17:33:02 +08:00
tool4EvEr
24f84c2835 Add ReplaceDamageAi 2021-10-06 10:10:47 +02:00
tool4EvEr
c65aa86f6b Clean up 2021-10-06 10:10:19 +02:00
Hans Mackowiak
164784fdad Update the_bears_of_littjara: fix SpellDescription 2021-10-06 07:28:51 +00:00
Michael Kamensky
a8115d8a44 Merge branch 'refrain' into 'master' 
Add AI for Rousing Refrain

See merge request core-developers/forge!5508
 2021-10-05 18:31:46 +00:00
tool4EvEr
8ea9eb6118 Add AI for Rousing Refrain 2021-10-05 20:16:34 +02:00
Anthony Calosa
27b0fb3247 Merge branch 'master' into 'master' 
move back the targeting arrows so they wouldn't drawn on top of the game menu overlay

See merge request core-developers/forge!5507
 2021-10-05 14:18:30 +00:00
Anthony Calosa
df100b5b77 move back the targeting arrows so they wouldn't drawn on top of the game menu overlay 2021-10-05 22:15:54 +08:00
Anthony Calosa
48d5d7112a Merge branch 'master' into 'master' 
unused import

See merge request core-developers/forge!5506
 2021-10-05 08:17:50 +00:00
Anthony Calosa
7edab67dd1 unused import 2021-10-05 16:17:09 +08:00
Anthony Calosa
6949cb0cb6 Merge branch 'master' into 'master' 
move indicators and arrows out of drawoverlay

See merge request core-developers/forge!5505
 2021-10-05 08:09:29 +00:00