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
46,850 Commits 31 Branches 187 Tags
08e84cb15ddf6f3e9024adaca832c39800c8f7f6
Commit Graph

46850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Lyu Zong-Hong
4cd6fca6d1 Implement Ice Cauldron 2021-01-19 22:35:41 +09: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
Sol
7646c99aca Merge branch 'fixConcedeFreeze' into 'master' 
Fix desktop multiplayer conceding

Closes #1685

See merge request core-developers/forge!3576
 2021-01-17 01:59:06 +00:00
Sol
f339eafdc1 Merge branch 'fixDraftMenu' into 'master' 
Improve Draft GUI flow

Closes #1695

See merge request core-developers/forge!3604
 2021-01-17 01:57:59 +00:00
Anthony Calosa
6375a57524 Merge branch 'fixAvatar' into 'master' 
Fix old avatars for human players

See merge request core-developers/forge!3612
 2021-01-17 01:53:57 +00:00
Hans Mackowiak
e1324916bd PlayEffect: fix Miracle Trigger 2021-01-16 23:49:14 +01:00
tool4EvEr
62e0c60228 Fix old avatars for human players 2021-01-16 17:55:09 +01:00
Michael Kamensky
f0171d5b26 Merge branch 'typo' into 'master' 
Fix some SpellDescription typos

See merge request core-developers/forge!3602
 2021-01-16 16:35:41 +00:00
Michael Kamensky
da39f1edd4 Merge branch 'change-quest-starting-difficulties' into 'master' 
Change quest difficulties

Closes #1674

See merge request core-developers/forge!3608
 2021-01-16 16:34:35 +00:00
Michael Kamensky
a7ef4f58cd Merge branch 'khm14' into 'master' 
KHM - 14 Jan

See merge request core-developers/forge!3600
 2021-01-16 16:33:47 +00:00
Michael Kamensky
b5950f6c16 Merge branch 'illusionary_mask' into 'master' 
Illusionary mask

See merge request core-developers/forge!3591
 2021-01-16 16:33:39 +00:00
Alumi
f3ecad7895 Illusionary mask 2021-01-16 16:33:38 +00:00
Hans Mackowiak
884aa7dc41 Merge branch 'fixHelm' into 'master' 
Fix Helm of Obedience

Closes #1694

See merge request core-developers/forge!3606
 2021-01-16 09:24:10 +00:00
Hans Mackowiak
e009eb50e0 Merge branch 'khm_littjara' into 'master' 
KHM: Littjara Mirrorlake and support

See merge request core-developers/forge!3605
 2021-01-16 09:23:30 +00:00
Tim Mocny
617e77f505 KHM: Littjara Mirrorlake and support 2021-01-16 09:23:30 +00:00
Anthony Calosa
14101c1f5d Merge branch 'master' into 'master' 
[Mobile] Update libs

See merge request core-developers/forge!3610
 2021-01-16 07:02:59 +00:00
Anthony Calosa
fded1d893c [Mobile] Update libs 2021-01-16 15:01:44 +08:00
Anthony Calosa
60667bbdb6 Merge branch 'master' into 'master' 
[Android] Update deviceinfo

See merge request core-developers/forge!3609
 2021-01-16 03:41:45 +00:00
Anthony Calosa
916a7d139f [Android] Update deviceinfo 2021-01-16 11:41:02 +08:00
friarsol
cc8bea403d Change quest difficulties 2021-01-15 21:46:32 -05:00
Anthony Calosa
ff870bebb4 Merge branch 'master' into 'master' 
LibGDX Update

See merge request core-developers/forge!3607
 2021-01-16 02:07:04 +00:00
Anthony Calosa
da54db1fca LibGDX Update 
-Update to 1.9.13
-Add additional info on Forge.log
 2021-01-16 10:00:27 +08:00
tool4EvEr
702f1718d3 Fix helm 2021-01-15 23:39:04 +01:00
tool4EvEr
704f93a4dc Improve Draft GUI flow 2021-01-15 22:32:07 +01:00
Northmoc
e287a3792d gnottvold_slumbermound.txt and token 2021-01-15 09:23:12 -05:00
Northmoc
306b3d59a1 faceless_haven.txt 2021-01-15 09:16:56 -05:00
Northmoc
83da76947f fix SpellDescription 2021-01-15 09:04:47 -05:00
Northmoc
0257689f50 aetherize.txt fix SpellDesc 2021-01-15 09:04:46 -05:00
Northmoc
85e40a9858 bretagard_stronghold.txt 2021-01-15 09:01:41 -05:00