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
51,595 Commits 31 Branches 187 Tags
4108b56135ad60198b718c6f4a48f2c33e38cc7c
Commit Graph

51595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alumi
a12848864b Implement some cards with dungeon mechanism that needs engine change. 2021-07-02 05:03:28 +00:00
Michael Kamensky
e2785d4180 Merge branch 'AFR' into 'master' 
AFR update 01 Jul

See merge request core-developers/forge!4935
 2021-07-02 03:35:26 +00:00
paul_snoops
1421e1617d AFR update 01 Jul 2021-07-01 18:16:01 +01:00
Michael Kamensky
a45cbff98b Merge branch 'worstland' into 'master' 
Update getWorstLand

See merge request core-developers/forge!4933
 2021-07-01 03:30:14 +00:00
Michael Kamensky
270c7e3571 Merge branch 'AFR' into 'master' 
AFR update 30 Jun

See merge request core-developers/forge!4932
 2021-07-01 03:29:03 +00:00
tool4EvEr
1b3cf98372 Update getWorstLand 2021-07-01 00:02:57 +02:00
paul_snoops
b647a74469 AFR update 30 Jun 2021-06-30 16:31:10 +01:00
Michael Kamensky
31d0d4535e Merge branch 'notnamed_comma_workaround' into 'master' 
Add the same workaround to `notnamed` property for card name with comma

See merge request core-developers/forge!4931
 2021-06-30 03:00:51 +00:00
Lyu Zong-Hong
e15c4be102 Add the same workaround to 
otnamed property for card name with comma
 2021-06-30 09:52:38 +09:00
Michael Kamensky
846b6de9ab Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4930
 2021-06-29 15:52:25 +00:00
CCTV-1
673f26cab2 translate venture effect strings. 2021-06-29 20:02:44 +08:00
Michael Kamensky
ffb05ed1b6 Merge branch 'twosat-master-patch-37299' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4929
 2021-06-29 10:11:45 +00:00
Andreas Bendel
c4eb1ceb10 Update de-DE.properties 
translated the two new dungeon strings
 2021-06-29 09:56:20 +00:00
Sol
21e27534f8 Update LEG Challenge Arboria.dck 2021-06-29 01:16:19 +00:00
Bug Hunter
b874c202cb Merge branch 'TRT-master-patch-19714' into 'master' 
Update forge-gui/res/cardsfolder/f/frostwielder.txt

See merge request core-developers/forge!4928
 2021-06-28 12:30:08 +00:00
Bug Hunter
de163b31d8 Update forge-gui/res/cardsfolder/f/frostwielder.txt 2021-06-28 12:28:08 +00:00
Michael Kamensky
b5d93cabd3 Merge branch 'master' into 'master' 
Added puzzles PS_KHM6 through PS_STX4.

See merge request core-developers/forge!4927
 2021-06-28 09:46:45 +00:00
Michael Kamensky
0d30d8659a - Added puzzles PS_STX3, PS_STX4. Tweaked PS_STX1. 
- PS_STX4 needs extra AI logic for Leyline Tyrant (DamageDealAi#chkAIDrawback).
 2021-06-28 12:38:18 +03:00
Michael Kamensky
b5bc614c65 - Added puzzle PS_STX2 with GameState support. 2021-06-28 07:22:11 +03:00
Michael Kamensky
ac23ad25fc - Added puzzles PS_KHM6, PS_TSR1, PS_STX1. 2021-06-28 06:44:37 +03:00
Michael Kamensky
510063bd98 Merge branch 'update_to_the_slaughter' into 'master' 
Revert To the Slaughter to use StoreSVar to save Delirium mode before resolving

See merge request core-developers/forge!4926
 2021-06-28 03:23:53 +00:00
Lyu Zong-Hong
83e65d3b4d Revert To the Slaughter to use StoreSVar to save Delirium mode before resolving 2021-06-28 10:17:42 +09:00
swordshine
2c5548bc88 Merge branch 'smallfix' into 'master' 
Small fixes

See merge request core-developers/forge!4925
 2021-06-28 00:48:22 +00:00
tool4EvEr
71ab3310da Small fixes 2021-06-27 23:21:11 +02:00
Michael Kamensky
73929b3e1a Merge branch 'fix_sac_each_valid' into 'master' 
Update some sacrifice spells that also should use SacEachValid

See merge request core-developers/forge!4923
 2021-06-27 13:27:10 +00:00
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
leriomaggio
c5eaef01ce Merge remote-tracking branch 'upstream/master' into editions-type-review 2021-06-25 17:13:25 +01:00
leriomaggio
6712a25bfc Updated New Edition type (Promos => Promo) 2021-06-25 17:09:20 +01:00
leriomaggio
bed2d0bddc Merge remote-tracking branch 'upstream/master' into editions-type-review 2021-06-25 17:08:45 +01: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