external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,054 Commits 34 Branches 187 Tags
12be76899a7e68ad0ff394d024128e96e2c72f53
Commit Graph

51054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
55536c6480 Merge branch 'cardfixes' into 'master' 
Fix keywords

See merge request core-developers/forge!4922
 2021-06-27 11:49:17 +00:00
Lyu Zong-Hong
b59ef4e43e Update some cards that needs to sacrifice maximum possible of permanents 2021-06-27 20:47:03 +09:00
tool4EvEr
42696363d3 Fix keywords 2021-06-27 13:01:46 +02:00
Michael Kamensky
85d6dce7f4 Merge branch 'venture_into_the_dungeon' into 'master' 
Implement Dungeon mechanism and related spoiled cards

See merge request core-developers/forge!4920
 2021-06-27 10:33:56 +00:00
Lyu Zong-Hong
8b66ab3600 Fix SacEachValid for some corner cases 2021-06-27 19:06:37 +09:00
Lyu Zong-Hong
c5e9e0e703 Update oracle texts for Dungeon cards 2021-06-27 15:53:28 +09:00
Lyu Zong-Hong
15852e2c01 Merge branch 'master' into venture_into_the_dungeon 2021-06-27 15:24:57 +09:00
Lyu Zong-Hong
ed0c5aac5e Add localization strings, draw markers, and updated Oubliette room 2021-06-27 15:22:33 +09:00
Michael Kamensky
59e82a33ab - Basic implementation for the Dungeon mechanic AI. 2021-06-27 08:48:49 +03:00
Michael Kamensky
54cbd32229 Merge branch 'fix26' into 'master' 
getPossibleReplaceDamageList: Fix NPE

See merge request core-developers/forge!4921
 2021-06-27 04:07:20 +00:00
tool4EvEr
ec33e028f6 Fix NPE 2021-06-26 23:31:28 +02:00
Lyu Zong-Hong
be40fce2c6 Implement Dungeon mechanism and related spoiled cards 2021-06-26 18:29:14 +09:00
Michael Kamensky
0d9590f12a Merge branch 'AFR' into 'master' 
AFR update 25 Jun

See merge request core-developers/forge!4917
 2021-06-26 03:42:23 +00:00
Michael Kamensky
04403d12d7 Merge branch 'fixstuff' into 'master' 
Fix Nykthos Paragon

See merge request core-developers/forge!4919
 2021-06-26 03:42:16 +00:00
Bug Hunter
96fcd3decd Fix Nykthos Paragon 2021-06-26 03:42:16 +00:00
paul_snoops
5e79ff5a20 AFR update 25 Jun 2021-06-26 00:08:05 +01:00
paul_snoops
9487d84e06 AFR update 25 Jun 2021-06-25 23:03:04 +01:00
Michael Kamensky
6e2a7904bb Merge branch 'master' into 'master' 
Update BoosterCovers for recent sets.

See merge request core-developers/forge!4918
 2021-06-25 16:22:00 +00:00
Michael Kamensky
a098e659a8 - Update BoosterCovers for recent sets. 2021-06-25 19:20:10 +03:00
paul_snoops
ae9e9c5201 AFR update 26 Jun 2021-06-25 16:49:25 +01:00
Michael Kamensky
44910573de Merge branch '1902-kodama-of-the-east-tree-triggers-again-when-you-choose-card-with-etbreplacement' into 'master' 
Resolve "Kodama of the East Tree triggers again when you choose card with ETBreplacement"

Closes #1902

See merge request core-developers/forge!4916
 2021-06-25 14:54:21 +00:00
Hans Mackowiak
4876fb0212 Fixes Cause for ETBReplacementEffect 2021-06-25 12:16:25 +00:00
Michael Kamensky
9eabe65496 Merge branch 'fix_aerial_caravan' into 'master' 
Fix Aerial Caravan

See merge request core-developers/forge!4915
 2021-06-24 11:58:41 +00:00
Lyu Zong-Hong
9681ce5f9b Fix Aerial Caravan 2021-06-24 20:10:05 +09:00
Michael Kamensky
8ea07e67f8 Merge branch 'zaffai' into 'master' 
Fix wrong calculated CMC for copied spells

See merge request core-developers/forge!4910
 2021-06-23 16:32:31 +00:00
Bug Hunter
f281287c69 Fix wrong calculated CMC for copied spells 2021-06-23 16:32:30 +00:00
Michael Kamensky
e5bdcead2a Merge branch 'master' into 'master' 
Net Decks Archive Updates

See merge request core-developers/forge!4914
 2021-06-23 09:36:48 +00:00
Churrufli
6b22266602 Net Decks Archive Updates 2021-06-23 08:39:34 +02:00
Churrufli
ad41eec543 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-06-23 08:34:14 +02:00
Michael Kamensky
1af68d9212 Merge branch 'CollectorBoosters' into 'master' 
Collector boosters

See merge request core-developers/forge!4913
 2021-06-23 03:44:28 +00:00
friarsol
dc886b139a Add full availability of other booster types 2021-06-22 23:36:12 -04:00
Michael Kamensky
806d8f35c2 Merge branch 'PLG21' into 'master' 
Added PLG21 and fixed PLGS>PLG20

See merge request core-developers/forge!4912
 2021-06-22 13:40:17 +00:00
paul_snoops
b17e88a80c Added PLG21 and fixed PLGS>PLG20 2021-06-22 12:43:17 +01:00
friarsol
2619cca56f Add support for collector boosters 2021-06-21 21:44:54 -04:00
Michael Kamensky
ea138b8c36 Merge branch 'fix-image-fetcher-backface-1882' into 'master' 
FIX ImageFetcher BackFace card check

Closes #1882

See merge request core-developers/forge!4911
 2021-06-21 12:44:56 +00:00
leriomaggio
5ba6f29ebb FIX ImageFetcher BackFace card check 
Quick FIX to restore correct download of backface of cards using directly imageKey string pattern
 2021-06-21 13:33:18 +01:00
Michael Kamensky
ee7ac95b6a Merge branch 'endurance-library-position' into 'master' 
Endurance should send cards to bottom of library

See merge request core-developers/forge!4909
 2021-06-21 03:01:20 +00:00
Michael Kamensky
5c46556537 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4908
 2021-06-21 03:01:16 +00:00
Brock Fanning
70a6a9bda5 Endurance send to bottom of library 2021-06-20 22:05:25 -04:00
Michael Kamensky
a5c30cadb4 Merge branch 'add_remaining_commander_cards' into 'master' 
Add remaining missing cards in Commander sets

See merge request core-developers/forge!4907
 2021-06-20 10:56:44 +00:00
Bug Hunter
fcdc8d691d Merge branch 'glinting-creeper-blocking-fix' into 'master' 
Fix for Glinting Creeper blocking ability and text

See merge request core-developers/forge!4905
 2021-06-20 09:00:59 +00:00
Lyu Zong-Hong
6daf4ac78d Add remaining commander cards 2021-06-20 17:22:49 +09:00
CCTV-1
ad72b44e12 translate new strings 2021-06-20 11:52:45 +08:00
Michael Kamensky
d395af122c Merge branch 'add_cruel_entertainment' into 'master' 
Add Cruel Entertainment

See merge request core-developers/forge!4906
 2021-06-20 03:44:05 +00:00
Lyu Zong-Hong
cb0259c946 Add AI:RemoveDeck:All flag 2021-06-20 12:07:38 +09:00
Lyu Zong-Hong
6e5d79a8e0 Add Cruel Entertainment 2021-06-20 12:00:28 +09:00
Brock Fanning
7d8ea744c3 Fix for Glinting Creeper blocking 2021-06-19 20:55:41 -04:00
Michael Kamensky
8a96bbb3d4 Merge branch 'update_oracle_mh2' into 'master' 
Update oracle mh2

See merge request core-developers/forge!4901
 2021-06-19 14:54:47 +00:00
Michael Kamensky
36e2c16c9d Merge branch 'vermin-gorger-fix' into 'master' 
Fix "Defined" syntax in Vermin Gorger

See merge request core-developers/forge!4903
 2021-06-19 14:54:42 +00:00
Michael Kamensky
8928c9eb88 Merge branch 'ozolith' into 'master' 
CountersMoveAi: avoid buffing opponent creatures with The Ozolith

See merge request core-developers/forge!4904
 2021-06-19 14:54:09 +00:00