external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,595 Commits 31 Branches 187 Tags
4108b56135ad60198b718c6f4a48f2c33e38cc7c
Commit Graph

51595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4EvEr
06230ffa40 Fix StaticEffect missing changes from RemoveLandTypes 2021-05-04 19:21:47 +02:00
Hythonia
cac7ac2a8a Remove UnlessAI from shocklands and boltlands 2021-05-04 12:12:26 +02:00
Hythonia
fbbe4f5579 Magus of the Scroll AI 2021-05-04 10:34:38 +02:00
Hythonia
7d8373643f Remove leftover code 2021-05-04 09:25:35 +02:00
Hythonia
97bf88421e Better AI logic for Boltlands 2021-05-04 09:24:41 +02:00
CCTV-1
c067ab7cc9 translate new setting 2021-05-04 09:38:03 +08:00
friarsol
b21e4f5296 Fix AutoUpdater to point to the new snapshot location 2021-05-03 21:32:55 -04:00
tool4EvEr
ea0add13ad Partner with: cleaner fix 2021-05-03 20:14:56 +02:00
Michael Kamensky
bfc3157186 Merge branch 'partner_with' into 'master' 
Partner with support

Closes #1760

See merge request core-developers/forge!4649
 2021-05-03 17:22:13 +00:00
tool4EvEr
a5aeb43305 Partner with support 2021-05-03 18:57:42 +02:00
Michael Kamensky
2b77a15845 Merge branch 'wouldPhaseBeSkipped' into 'master' 
Update wouldPhaseBeSkipped logic

See merge request core-developers/forge!4648
 2021-05-03 15:57:16 +00:00
tool4EvEr
0d1b751600 Update wouldPhaseBeSkipped logic 2021-05-03 17:06:39 +02:00
Bug Hunter
754e2a7aa7 Merge branch 'TRT-master-patch-29542' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/flamescroll_celebrant_revel_in_silence.txt

See merge request core-developers/forge!4647
 2021-05-03 14:27:36 +00:00
Bug Hunter
731f375332 Update forge-gui/res/cardsfolder/upcoming/flamescroll_celebrant_revel_in_silence.txt 2021-05-03 14:27:12 +00:00
tool4EvEr
faa8013208 Restore old controllers for AI checks 2021-05-02 17:03:44 +02:00
Michael Kamensky
90afe81856 Merge branch 'modaloption' into 'master' 
Add preference how to display alternate card states in deck views

See merge request core-developers/forge!4625
 2021-05-02 14:25:36 +00:00
Bug Hunter
c13e379908 Add preference how to display alternate card states in deck views 2021-05-02 14:25:35 +00:00
Michael Kamensky
689d3bb9b5 Merge branch 'fixloop' into 'master' 
Fix multiplayer loop from SA controlled by loser

See merge request core-developers/forge!4636
 2021-05-02 14:25:27 +00:00
Michael Kamensky
9ae8fcf3bc Merge branch 'killing_wave' into 'master' 
payCostToPreventEffect ignores X amount

See merge request core-developers/forge!4645
 2021-05-02 14:25:16 +00:00
tool4EvEr
74f3a0a5ed Fix payCostToPreventEffect for X amount 2021-05-02 14:38:19 +02:00
Anthony Calosa
d51e20bffe Merge branch 'master' into 'master' 
fix localizer

See merge request core-developers/forge!4644
 2021-05-02 11:47:15 +00:00
Anthony Calosa
c5d6214ab2 fix localizer 2021-05-02 19:44:19 +08:00
Michael Kamensky
898921ea4f Merge branch 'untapall' into 'master' 
UntapAllAi: improve logic (Najeela)

See merge request core-developers/forge!4643
 2021-05-02 10:42:12 +00:00
tool4EvEr
8c6194da35 improve logic (Najeela) 2021-05-02 11:55:04 +02:00
Michael Kamensky
8b2a3ccb42 Merge branch 'costfix' into 'master' 
Restore Balance: Fix Cost

Closes #1814

See merge request core-developers/forge!4642
 2021-05-02 09:47:43 +00:00
tool4EvEr
820c869e2c Avoid clearTriggers 2021-05-02 11:44:41 +02:00
tool4EvEr
9a21a3e2a4 Fix Cost 2021-05-02 11:04:59 +02:00
Hans Mackowiak
03e47cee56 Merge branch 'suspend' into 'master' 
AI: Fix backing out of Suspend

See merge request core-developers/forge!4640
 2021-05-02 08:55:10 +00:00
Michael Kamensky
1a28f15f75 Merge branch 'NPE' into 'master' 
viewDeckList: Fix NPE

See merge request core-developers/forge!4639
 2021-05-02 03:55:14 +00:00
Anthony Calosa
72d5c74631 Merge branch 'master' into 'master' 
[Mobile] Fix ExceptionInInitializerError forge.screens.home.NewGameMenu$NewGameScreen

See merge request core-developers/forge!4641
 2021-05-02 01:20:52 +00:00
Anthony Calosa
322ebdf8a6 Update spacing 2021-05-02 09:16:55 +08:00
Anthony Calosa
3d3296d1b7 [Mobile] Fix ExceptionInInitializerError forge.screens.home.NewGameMenu$NewGameScreen 
- some mobile issues reported via Sentry is related to Translation errors and it should return the default original value from English locale.
 2021-05-02 09:13:49 +08:00
tool4EvEr
e3715c3f81 Update ceasetoExist check 2021-05-02 00:02:49 +02:00
tool4EvEr
db9e019519 Fix backing out of Suspend 2021-05-01 23:05:52 +02:00
tool4EvEr
3a2ea56c92 Fix NPE 2021-05-01 21:26:49 +02:00
tool4EvEr
df6b552ac1 Fully clear unwanted triggers 2021-05-01 20:36:42 +02:00
Michael Kamensky
9bb4d7ed93 Merge branch 'turns' into 'master' 
Update advanceToNextPhase logic

See merge request core-developers/forge!4633
 2021-05-01 17:36:38 +00:00
Anthony Calosa
562ef1b147 Merge branch 'kevlahnota-master-patch-03506' into 'master' 
Update GuiDownloadZipService.java

See merge request core-developers/forge!4638
 2021-05-01 14:27:56 +00:00
Anthony Calosa
6d31a2f656 Update GuiDownloadZipService.java 2021-05-01 14:27:02 +00:00
Bug Hunter
62c16d9f08 Merge branch 'fixcost' into 'master' 
Fix typo

Closes #1813

See merge request core-developers/forge!4637
 2021-05-01 10:44:55 +00:00
tool4EvEr
db17973ea6 Fix cost 2021-05-01 12:43:26 +02:00
tool4EvEr
8155376c45 Fix multiplayer loop from SA controlled by loser 2021-05-01 12:33:25 +02:00
Anthony Calosa
ae26c7bc7a Merge branch 'master' into 'master' 
[Mobile] ExceptionInInitializerError (forge.screens.FScreen in <init>)

See merge request core-developers/forge!4635
 2021-05-01 05:17:33 +00:00
Anthony Calosa
fa4e4cb2bb [Mobile] ExceptionInInitializerError (forge.screens.FScreen in <init>) 
- it seems it was trying to draw the bug reporter interface while ending the graphics if sentry is not enabled
 2021-05-01 13:15:10 +08:00
Hans Mackowiak
7842b7e0fd Merge branch 'ResolvedThisTurn' into 'master' 
Fix ResolvedThisTurn

See merge request core-developers/forge!4631
 2021-04-30 23:33:44 +00:00
Anthony Calosa
52d6245b4a Merge branch 'master' into 'master' 
[Mobile] fix cache capacity initialization

See merge request core-developers/forge!4634
 2021-04-30 22:42:19 +00:00
Anthony Calosa
4c03d4f0b4 [Mobile] fix cache capacity initialization 2021-05-01 06:41:04 +08:00
tool4EvEr
de8aaf35a3 Update advanceToNextPhase logic 2021-04-30 23:34:16 +02:00
Anthony Calosa
dda5d8206f Merge branch 'master' into 'master' 
[Mobile] fix black image

See merge request core-developers/forge!4632
 2021-04-30 18:53:22 +00:00
Anthony Calosa
f8ca2a50b7 [Mobile] fix black image 2021-05-01 02:34:04 +08:00