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
48,875 Commits 32 Branches 187 Tags
0ac4f98ffaaa4622acacad039145af646d35e14c
Commit Graph

48875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans Mackowiak
38b584d431 ChangeZoneEffect: add WithCountersType for non Battlefield 2021-02-18 15:13:30 +01:00
John
af2c8965df Update worlds.txt 2021-02-18 14:07:46 +00:00
Michael Kamensky
df61b15f8e Merge branch 'fixLivio' into 'master' 
Livio, Oathsworn Sentinel: fix first ability by adding Chooser to known origin

See merge request core-developers/forge!3886
 2021-02-18 09:41:09 +00:00
Hans Mackowiak
a019d6ca5b ComputerUtilMana: fix predict Mana, TapsForMana + Amount$ X 2021-02-18 07:59:56 +01:00
Michael Kamensky
7443cac601 Merge branch 'excess' into 'master' 
Fix excess damage calculation

See merge request core-developers/forge!3883
 2021-02-18 05:16:42 +00:00
Michael Kamensky
d47c1a55f8 Merge branch 'iguana' into 'master' 
Impatient Iguana

See merge request core-developers/forge!3884
 2021-02-18 05:16:06 +00:00
Michael Kamensky
195669fe77 Merge branch 'geometric' into 'master' 
Geometric Weird

See merge request core-developers/forge!3879
 2021-02-18 05:15:59 +00:00
Michael Kamensky
c2e31a28dc Merge branch 'vazal' into 'master' 
Vazal the Compleat

See merge request core-developers/forge!3882
 2021-02-18 05:14:49 +00:00
Michael Kamensky
3376a25536 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!3891
 2021-02-18 05:14:07 +00:00
CCTV-1
cfe7519eb5 update simplified chinese translation 2021-02-18 11:44:49 +08:00
Anthony Calosa
a52fff1dea Merge branch 'twosat-master-patch-84754' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3888
 2021-02-17 22:59:52 +00:00
Anthony Calosa
1243018246 Merge branch 'master' into 'master' 
[Mobile] fix preferred icons

See merge request core-developers/forge!3889
 2021-02-17 22:45:48 +00:00
Anthony Calosa
564a019706 Merge remote-tracking branch 'core/master' 2021-02-18 06:44:09 +08:00
Anthony Calosa
ffb6fc4b97 [Mobile] fix preferred icons 2021-02-18 06:42:12 +08:00
Andreas Bendel
d542af919c Update de-DE.properties 
translated lblRevealFaceDownCards
 2021-02-17 20:01:07 +00:00
Michael Kamensky
69c3843df9 Merge branch 'master' into 'master' 
AltSoundSystem: don't crash in case an unsupported mixer is tried in getMixer

See merge request core-developers/forge!3885
 2021-02-17 19:05:12 +00:00
Michael Kamensky
8be093c948 Merge branch 'inzerva' into 'master' 
Fix Inzerva script

See merge request core-developers/forge!3887
 2021-02-17 18:57:15 +00:00
Adam Pantel
876b73a7d8 Fix Inzerva script 2021-02-17 13:41:50 -05:00
tool4EvEr
3fdb0c6d44 Add Chooser to known Origin for Livio 2021-02-17 19:32:26 +01:00
Agetian
94c2203b6c - AltSoundSystem: don't crash in case an unsupported mixer is tried in getMixer 2021-02-17 21:27:43 +03:00
Adam Pantel
eeb3284f1b Impatient Iguana 2021-02-17 13:23:51 -05:00
Michael Kamensky
929cd3a22d Merge branch 'mirrored' into 'master' 
Mirrored Lotus

See merge request core-developers/forge!3876
 2021-02-17 18:09:49 +00:00
Adam Pantel
9af2f4b17e Fix excess damage calculation 2021-02-17 11:49:19 -05:00
Adam Pantel
18921e954a Mirrored Lotus 2021-02-17 10:14:13 -05:00
Adam Pantel
36313ca4e2 Geometric Weird 2021-02-17 09:38:35 -05:00
Adam Pantel
6c3f1e5f2f Vazal the Compleat 2021-02-17 09:33:32 -05:00
Anthony Calosa
e38bfeca5a Merge branch 'master' into 'master' 
[Mobile] support preferred SPRITE_MANAICONS_FILE

See merge request core-developers/forge!3881
 2021-02-17 09:37:47 +00:00
Anthony Calosa
c17c467a8e [Mobile] support preferred SPRITE_MANAICONS_FILE 2021-02-17 17:34:56 +08:00
Michael Kamensky
9dcfedc13c Merge branch 'master' into 'master' 
Improve clarity of code a little by inverting the condition check in GameState

See merge request core-developers/forge!3880
 2021-02-17 05:00:23 +00:00
Michael Kamensky
c7f8c1c59e - Improve clarity of code a little by inverting the condition check in GameState 2021-02-17 07:59:32 +03:00
Michael Kamensky
bfd743cd88 Merge branch 'master' into 'master' 
AI shouldn't miss mandatory triggers for FogAi

Closes #1723

See merge request core-developers/forge!3878
 2021-02-17 04:24:21 +00:00
Michael Kamensky
f78a375402 - AI shouldn't miss mandatory triggers for FogAi 2021-02-17 07:23:27 +03:00
Michael Kamensky
e28df0a723 Merge branch 'fixflash' into 'master' 
[Desktop] Fix flash icon being shown from opponents hidden hand

See merge request core-developers/forge!3875
 2021-02-17 04:10:47 +00:00
Michael Kamensky
7445374841 Merge branch 'daxos' into 'master' 
Cleanup Daxos of Meletis

See merge request core-developers/forge!3872
 2021-02-17 04:10:29 +00:00
Michael Kamensky
6bd7d027e5 Merge branch 'reveal_foretold_endgame' into 'master' 
Reveal foretold cards and other face-down cards when a player leaves the game or the game ends

See merge request core-developers/forge!3865
 2021-02-17 04:07:59 +00:00
Alumi
3ff19f7957 Reveal foretold cards and other face-down cards when a player leaves the game or the game ends 2021-02-17 04:07:59 +00:00
Michael Kamensky
2e5a950afd Merge branch 'unset-cards' into 'master' 
Some un-set/cmb1 card scripts

See merge request core-developers/forge!3857
 2021-02-17 04:07:38 +00:00
Michael Kamensky
ef48d0bbc3 Merge branch 'cmb1' into 'master' 
Edition file prep

See merge request core-developers/forge!3852
 2021-02-17 04:07:24 +00:00
Anthony Calosa
75e2fe60bf Merge branch 'master' into 'master' 
updateMergeCollections

See merge request core-developers/forge!3877
 2021-02-17 02:51:58 +00:00
Anthony Calosa
cddd0f6fb3 updateMergeCollections 2021-02-17 10:50:25 +08:00
Hans Mackowiak
201f53fb09 Merge branch 'card-fixes' into 'master' 
Prevent crash with Back for More

Closes #1717

See merge request core-developers/forge!3874
 2021-02-17 00:49:01 +00:00
tool4EvEr
4b25332a9d Refactor 2021-02-16 22:42:46 +01:00
tool4EvEr
54d7e89953 Fix flash icon being shown from opponents hidden hand 2021-02-16 22:13:20 +01:00
Adam Pantel
9ecad3f775 Prevent crash with Back for More 2021-02-16 15:14:20 -05:00
tool4EvEr
499e7d12af Cleanup Daxos of Meletis 2021-02-16 20:27:07 +01:00
Michael Kamensky
d0e8052c9f Merge branch 'soulecho' into 'master' 
AI support for soul echo

See merge request core-developers/forge!3871
 2021-02-16 19:27:03 +00:00
tool4EvEr
44df63adee AI support for soul echo 2021-02-16 20:17:24 +01:00
Anthony Calosa
8180243283 Merge branch 'twosat-master-patch-41935' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3870
 2021-02-16 18:13:02 +00:00
Anthony Calosa
182b97e369 Merge branch 'fixFlash' into 'master' 
[Desktop] Fix flash icon showing in library

See merge request core-developers/forge!3869
 2021-02-16 18:12:38 +00:00
Andreas Bendel
feaca17b4e Update de-DE.properties 
translated new DeckChooser strings
 2021-02-16 18:02:19 +00:00