external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,877 Commits 31 Branches 187 Tags
a75b4824e0e994e8fccb2a19ef05de6e9853e7cc
Commit Graph

46877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
paul_snoops
a75b4824e0 KHM edition file... incomplete 
Firja's Judgment renamed to Firja's Retribution
 2021-01-24 12:13:02 +00:00
Hans Mackowiak
b1d62ffedf Merge branch 'fixCube' into 'master' 
Fix cube draft crash on saving

See merge request core-developers/forge!3633
 2021-01-24 07:56:45 +00:00
Hans Mackowiak
567f60b24a Merge branch 'fixRepeal' into 'master' 
Fix repeal not fizzling when cast on face down creature turning up

See merge request core-developers/forge!3629
 2021-01-24 07:41:42 +00:00
Bug Hunter
9a6edcb30e Fix repeal not fizzling when cast on face down creature turning up 2021-01-24 07:41:41 +00:00
Michael Kamensky
f05a07bae9 Merge branch 'undefined' into 'master' 
KHC Ruthless Winnower

See merge request core-developers/forge!3635
 2021-01-24 04:17:15 +00:00
John
7206599114 Upload New File 2021-01-23 21:54:22 +00:00
Michael Kamensky
b422e403f3 Merge branch 'undefined' into 'master' 
KHC Crown of Skemfar

See merge request core-developers/forge!3634
 2021-01-23 19:43:59 +00:00
John
2dec4e4eb0 Upload New File 2021-01-23 15:35:56 +00:00
Sol
a2cdc280c1 Merge branch 'fixCrash' into 'master' 
Fix desktop GUI crash

Closes #950

See merge request core-developers/forge!3625
 2021-01-23 15:14:59 +00:00
tool4EvEr
0eaa83c689 Fix cube draft crash on saving 2021-01-23 14:16:15 +01:00
Michael Kamensky
5d3e1f5d12 Merge branch 'boastV2' into 'master' 
Boast: Birgi + Frenzied Raider

See merge request core-developers/forge!3632
 2021-01-23 11:45:14 +00:00
Hans Mackowiak
241852a2c1 Boast: Birgi + Frenzied Raider 2021-01-23 11:40:51 +01:00
Hans Mackowiak
95d5a8fbb8 fix import 2021-01-23 11:19:13 +01:00
Michael Kamensky
4b116a8484 Merge branch 'goblin_artisans' into 'master' 
Goblin Artisans

See merge request core-developers/forge!3627
 2021-01-23 06:31:44 +00:00
Alumi
8294e154ab Goblin Artisans 2021-01-23 06:31:44 +00:00
Michael Kamensky
4c00126b31 Merge branch 'undefined' into 'master' 
KHC-Wolverine Riders

See merge request core-developers/forge!3618
 2021-01-23 06:30:49 +00:00
Sol
d54ece783c Merge branch 'fix-darksteel-ingot' into 'master' 
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!3631
 2021-01-23 03:30:39 +00:00
Sol
220fa6c594 Update Secret Lair Drop Series.txt 2021-01-23 03:30:11 +00:00
Sol
d007521a11 Merge branch 'fixYawg' into 'master' 
Revert Yawgmoth, Thran Physician

See merge request core-developers/forge!3630
 2021-01-23 01:44:43 +00:00
tool4EvEr
1eaaca94b7 Revert CantFizzle 2021-01-22 22:26:15 +01:00
Hans Mackowiak
8a6bdf8b8d fix Splice Effects 2021-01-22 14:12:16 +01:00
Michael Kamensky
08e84cb15d Merge branch 'fixGrip' into 'master' 
Fix ChangeTargets not finding StackInstance

Closes #941

See merge request core-developers/forge!3624
 2021-01-22 09:30:36 +00:00
Michael Kamensky
19db90b17f Merge branch 'urzas_miter' into 'master' 
Urza's Miter

See merge request core-developers/forge!3623
 2021-01-22 09:01:13 +00:00
Michael Kamensky
543982d4cf Merge branch 'infernal_denizen' into 'master' 
Infernal denizen

See merge request core-developers/forge!3620
 2021-01-22 09:01:10 +00:00
Alumi
b68fa3dd77 Fix the bug that if Infernal Denizen is transferred to opponent by its trigger, kill it will return it back instead of kill it 2021-01-22 09:01:10 +00:00
Michael Kamensky
cce497f48e Merge branch 'fix_illusionary_mask' into 'master' 
Add spell description for Illusionary Mask

See merge request core-developers/forge!3626
 2021-01-22 09:00:41 +00:00
Lyu Zong-Hong
8e7225ed11 Add spell description so it also show oracale texts in-game. 2021-01-22 16:35:31 +09:00
tool4EvEr
87542521f1 Fix crash 2021-01-21 23:37:33 +01:00
tool4EvEr
8f7dad17ce Prevent infinite error msg loop 2021-01-21 23:06:17 +01:00
tool4EvEr
afd3d176c9 Fix ChangeTargets not finding StackInstance 2021-01-21 22:35:03 +01:00
Lyu Zong-Hong
cb6ac17977 Add Urza's Miter 2021-01-21 22:23:17 +09:00
Michael Kamensky
fcbafef37f Merge branch 'ice_cauldron' into 'master' 
Implement Ice Cauldron

See merge request core-developers/forge!3619
 2021-01-20 17:15:02 +00:00
John
221eb523cb Update forge-gui/res/cardsfolder/upcoming/wolverine_riders.txt 2021-01-20 10:32:27 +00:00
John
6ae253cd9f Update forge-gui/res/cardsfolder/upcoming/wolverine_riders.txt 2021-01-19 14:00:19 +00:00
Lyu Zong-Hong
4cd6fca6d1 Implement Ice Cauldron 2021-01-19 22:35:41 +09:00
John
dd1c2a003f Update forge-gui/res/cardsfolder/upcoming/wolverine_riders.txt 2021-01-19 13:07:31 +00:00
John
229989ae8b Upload New File 2021-01-19 13:00:26 +00:00
Sol
e10c982b7e Merge branch 'fixVraska' into 'master' 
Fix emblem achievement

Closes #1510

See merge request core-developers/forge!3616
 2021-01-19 01:36:30 +00:00
Hans Mackowiak
437fdbc9f5 Merge branch 'fixXantcha' into 'master' 
Add CardOwner property

Closes #772

See merge request core-developers/forge!3617
 2021-01-19 00:15:25 +00:00
Hans Mackowiak
149f221d8b CardProperty: hotfix ArrayList from iterable 2021-01-18 12:03:09 +01:00
Sol
20d9a77761 Merge branch 'annoyanceCardfixes' into 'master' 
Card trigger fixes

Closes #355 and #208

See merge request core-developers/forge!3541
 2021-01-18 03:25:27 +00:00
Bug Hunter
3a618228f0 Revert "Some script adjustments" 
This reverts commit 5ee91a21259e95e184c5b4a9e2c09509e78fb7df.
 2021-01-18 03:25:27 +00:00
Sol
97f6806beb Merge branch 'fixDeckEditorHover' into 'master' 
Fix no hover in deck editor when edit from lobby

Closes #1549

See merge request core-developers/forge!3598
 2021-01-18 03:24:42 +00:00
tool4EvEr
dd50ab03e8 Add CardOwner property 2021-01-17 22:44:44 +01:00
tool4EvEr
7b1ffd7554 Fix emblem achievement 2021-01-17 21:43:45 +01:00
Hans Mackowiak
46f5fefd2c Merge branch 'fixandroidlambda' into 'master' 
Fix Android Lambda

See merge request core-developers/forge!3615
 2021-01-17 10:46:29 +00:00
klaxnek
afe7f84571 Fix Android Lambda 2021-01-17 10:46:29 +00:00
Michael Kamensky
20accbdc0b Merge branch 'khm15' into 'master' 
KHM - 15 Jan

See merge request core-developers/forge!3603
 2021-01-17 10:23:03 +00:00
Anthony Calosa
1d64058bea Merge branch 'master' into 'master' 
Fix android build (opcode error)

See merge request core-developers/forge!3614
 2021-01-17 09:15:47 +00:00
Anthony Calosa
db96c30cb7 Fix android build (opcode error) 2021-01-17 17:14:27 +08:00