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,877 Commits 31 Branches 187 Tags
a75b4824e0e994e8fccb2a19ef05de6e9853e7cc
Commit Graph

46877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Northmoc
0f462784fb + Ability$Sacrifice 2021-01-15 08:33:36 -05:00
Northmoc
570d6992b9 axgard_armory.txt 2021-01-15 08:32:17 -05:00
Tim Mocny
a32611528e Merge branch 'patch-12' into 'master' 
Update Secret Lair Ultimate Edition.txt

See merge request core-developers/forge!3601
 2021-01-15 13:19:50 +00:00
Northmoc
5389105e5b skemfar_elderhall.txt 2021-01-15 08:17:34 -05:00
Northmoc
db175c767d uncommon land cycle 2021-01-15 08:17:33 -05:00
Northmoc
f728e52ab5 + DeckHas:Ability$Counters 2021-01-15 08:17:33 -05:00
Northmoc
e5164f4e87 gates_of_istfell.txt (Marvel) 2021-01-15 08:17:32 -05:00
Northmoc
e577898e78 ascendant_spirit.txt (Marvel) 2021-01-15 08:17:32 -05:00
John
93bc3d4868 Update Secret Lair Ultimate Edition.txt 2021-01-15 13:13:57 +00:00
Hans Mackowiak
6778b54afc Merge branch 'cleanupRestartGameEffect' into 'master' 
RestartGameEffect: Reuse more code

See merge request core-developers/forge!3594
 2021-01-15 09:51:13 +00:00
Bug Hunter
82a2468f70 RestartGameEffect: Reuse more code 2021-01-15 09:51:13 +00:00
Michael Kamensky
acc04122fd Merge branch 'triggerExcessDamage' into 'master' 
TriggerExcessDamage: add Trigger for Toralf, God of Fury

See merge request core-developers/forge!3590
 2021-01-15 05:29:31 +00:00
Michael Kamensky
ad7a49ad0f Merge branch 'patch-8' into 'master' 
Update net-decks-commander.txt

See merge request core-developers/forge!3592
 2021-01-15 05:27:55 +00:00
Michael Kamensky
28a0249dc0 Merge branch 'patch-9' into 'master' 
Update net-decks.txt

See merge request core-developers/forge!3593
 2021-01-15 05:27:48 +00:00
Michael Kamensky
4ce292e1a1 Merge branch 'khm13' into 'master' 
KHM - 13 Jan

See merge request core-developers/forge!3586
 2021-01-15 05:26:52 +00:00
tool4EvEr
9c0a82091b Fix no hover in deck editor when edit from lobby 2021-01-14 21:44:42 +01:00
Anthony Calosa
97391ac54e Merge branch 'master' into 'master' 
Remove unused imports

See merge request core-developers/forge!3595
 2021-01-14 13:39:38 +00:00
Anthony Calosa
2842304d09 Remove unused imports 2021-01-14 21:38:30 +08:00
Hans Mackowiak
3bc6ab5e9d Merge branch 'fixCommanderReplacement' into 'master' 
commander LTB triggers before returning to command zone

Closes #1493

See merge request core-developers/forge!3565
 2021-01-14 13:29:48 +00:00
Bug Hunter
0ff02de485 commander LTB triggers before returning to command zone 2021-01-14 13:29:48 +00:00
Churrufli
7cd86d7bc3 Update net-decks.txt 2021-01-14 12:12:54 +00:00
Churrufli
104b678a7e Update net-decks-commander.txt 2021-01-14 12:10:34 +00:00
Hans Mackowiak
97ac79acca TriggerExcessDamage: add Trigger for Toralf, God of Fury 2021-01-14 09:17:40 +01:00