external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,264 Commits 31 Branches 187 Tags
e030e28d80ed48a8c778d0aedb51d71f75b18344
Commit Graph

48264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
e030e28d80 [Mobile] Add support for viewing both sides of facedown DFC 2021-03-05 01:53:14 +08:00
Anthony Calosa
890733bd44 Merge remote-tracking branch 'core/master' 2021-03-04 18:42:41 +08:00
Anthony Calosa
47bfda3510 [Mobile] fix stack description 2021-03-04 18:41:15 +08:00
Michael Kamensky
9578f982ac Merge branch 'TRT-master-patch-50515' into 'master' 
Update zof_consumption

See merge request core-developers/forge!4097
 2021-03-04 10:28:50 +00:00
Bug Hunter
ed9adbaec6 Update forge-gui/res/cardsfolder/z/zof_consumption_zof_bloodbog.txt 2021-03-04 08:35:54 +00:00
Hans Mackowiak
37a6ed9336 AbilityUtils: add OriginalHost to calculateAmount 2021-03-04 07:48:42 +01:00
Hans Mackowiak
784acdba73 fix broken CardDetailUtil 2021-03-04 07:45:33 +01:00
Hans Mackowiak
7525a1062e StaticAbilityContinuous: fix OriginalHost for abilities gained by static abilities 2021-03-04 07:23:01 +01:00
Michael Kamensky
ab537a9e69 Merge branch 'donot_translation_token' into 'master' 
do not translation non card clone token

See merge request core-developers/forge!2478
 2021-03-04 03:46:46 +00:00
Michael Kamensky
fba029fa4d Merge branch 'twosat-master-patch-89543' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4093
 2021-03-04 03:46:23 +00:00
Anthony Calosa
9870cd833a Merge branch 'kevlahnota-master-patch-88742' into 'master' 
Update AbstractGuiGame.java

See merge request core-developers/forge!4095
 2021-03-03 22:39:49 +00:00
Anthony Calosa
502dbf9c45 Update AbstractGuiGame.java 2021-03-03 22:39:27 +00:00
Andreas Bendel
ffb04d6462 Update de-DE.properties 
translated DisableCardImages and EnableNonLegalCards
 2021-03-03 21:46:43 +00:00
Michael Kamensky
b47f8d126f Merge branch 'fixescape' into 'master' 
Fix Escape not paying additional costs

See merge request core-developers/forge!4092
 2021-03-03 20:31:54 +00:00
tool4EvEr
6aa08b0bc0 Fix Escape not paying additional costs 2021-03-03 20:15:05 +01:00
Michael Kamensky
23121a46af Merge branch 'fixpay' into 'master' 
Force player choice for mandatory costs

See merge request core-developers/forge!4074
 2021-03-03 18:20:12 +00:00
Michael Kamensky
7a76bb098f Merge branch 'narfi' into 'master' 
Fix King Narfi's Betrayal

See merge request core-developers/forge!4089
 2021-03-03 18:20:01 +00:00
Michael Kamensky
ad422bc513 Merge branch 'frank' into 'master' 
Fix Frankensteins Monster

Closes #1749

See merge request core-developers/forge!4090
 2021-03-03 18:19:49 +00:00
Anthony Calosa
a487338f09 Merge branch 'master' into 'master' 
Add Disable Card Images Option

See merge request core-developers/forge!4091
 2021-03-03 18:17:22 +00:00
Anthony Calosa
17944c0e41 Add Disable Card Images Option 2021-03-04 02:15:16 +08:00
tool4EvEr
cce8cf7e85 Fix Frankensteins Monster 2021-03-03 18:20:10 +01:00
tool4EvEr
272a16a9bd Fix King Narfi 2021-03-03 17:40:09 +01:00
Anthony Calosa
083c34acc5 Merge branch 'kevlahnota-master-patch-42147' into 'master' 
Update CardDb.java

See merge request core-developers/forge!4088
 2021-03-03 16:06:39 +00:00
Anthony Calosa
4593298956 Update CardDb.java 2021-03-03 16:06:03 +00:00
Anthony Calosa
fc73d93576 Merge branch 'master' into 'master' 
fix db loading

See merge request core-developers/forge!4087
 2021-03-03 15:08:02 +00:00
Anthony Calosa
6a2549efd8 fix db loading 2021-03-03 23:06:48 +08:00
Anthony Calosa
56bf121c90 Merge branch 'master' into 'master' 
Add option to enable/disable Non-Legal Cards

See merge request core-developers/forge!4086
 2021-03-03 14:32:05 +00:00
Anthony Calosa
36e55ae72f Add option to enable/disable Non-Legal Cards 
Playtest and Un-sets Cards
 2021-03-03 22:29:44 +08:00
Anthony Calosa
a9487b445c Merge branch 'master' into 'master' 
prevent NPE

See merge request core-developers/forge!4085
 2021-03-03 10:44:33 +00:00
Anthony Calosa
ff4803c506 prevent NPE 
it seems repeated momir ai games and you switch to human player and start any game causes the NPE resulting to crashing the UI
 2021-03-03 18:43:25 +08:00
Michael Kamensky
55e81e0d92 Merge branch 'master' into 'master' 
Net Deck Archive Categories fix

See merge request core-developers/forge!4084
 2021-03-03 10:09:51 +00:00
Churrufli
0c2e0c9cbe Net Deck Archive Categories fix 2021-03-03 10:44:58 +01:00
Anthony Calosa
9594c6b5d3 Merge branch 'master' into 'master' 
prevent NPE

See merge request core-developers/forge!4083
 2021-03-03 09:25:55 +00:00
Anthony Calosa
cde2e6a1bd prevent NPE 2021-03-03 17:25:14 +08:00
Michael Kamensky
d51a518687 Merge branch 'master' into 'master' 
Minor code cleanup

See merge request core-developers/forge!4082
 2021-03-03 06:37:42 +00:00
Michael Kamensky
ce72ee0766 - Remove an unused parameter 2021-03-03 09:37:14 +03:00
Michael Kamensky
1fd32b8843 Merge branch 'master' into 'master' 
Added an AI hint to Together Forever.

See merge request core-developers/forge!4081
 2021-03-03 06:32:05 +00:00
Michael Kamensky
159d358725 - Added an AI hint to Together Forever. 2021-03-03 09:30:18 +03:00
Michael Kamensky
5f3929070a Merge branch 'master' into 'master' 
Comment out some currently unsupported cards in Commander precons.

See merge request core-developers/forge!4080
 2021-03-03 05:52:21 +00:00
Michael Kamensky
1538e8bf14 - Comment out some currently unsupported cards in Commander precons. 2021-03-03 08:51:38 +03:00
Michael Kamensky
b122851dd8 Merge branch 'master' into 'master' 
Refactor and improve the "exile any number" ChangeZoneAi logic, add RollDiceAi logic

See merge request core-developers/forge!4079
 2021-03-03 05:45:45 +00:00
Michael Kamensky
54d2b4e488 - Refactor and improve the "exile any number" ChangeZoneAi logic 2021-03-03 08:43:54 +03:00
CCTV-1
31f9503af8 Merge remote-tracking branch 'upstream/master' into donot_translation_token 2021-03-03 12:31:55 +08:00
Michael Kamensky
641a0793b8 Merge branch 'master' into 'master' 
Add basic AI support for RollDiceEffect

See merge request core-developers/forge!4078
 2021-03-03 04:16:11 +00:00
Michael Kamensky
d841ecf1c7 Add basic AI support for RollDiceEffect 2021-03-03 04:16:11 +00:00
Michael Kamensky
7faf91161c - NPE guard 2021-03-03 07:15:54 +03:00
Michael Kamensky
97237dbfdc - Add basic AI support for RollDiceEffect 2021-03-03 07:13:31 +03:00
Michael Kamensky
a2d4fb3e81 Merge branch 'fixAkiri' into 'master' 
Fix Akiri multiplayer

See merge request core-developers/forge!4051
 2021-03-03 03:50:17 +00:00
Bug Hunter
1a1bd6077b Fix Akiri multiplayer 2021-03-03 03:50:17 +00:00
Michael Kamensky
a51f28ce1d Merge branch 'unset-cards' into 'master' 
Add dice rolling, and Waste Land

See merge request core-developers/forge!4067
 2021-03-03 03:49:42 +00:00