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
45,146 Commits 34 Branches 187 Tags
7b6a3b70e9119f0612ef2d4bf516e2d03e148bcc
Commit Graph

45146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John
7b6a3b70e9 Update Secret Lair Drop Series.txt (Every Dog Has Its Day) 2020-08-20 21:40:33 +00:00
Hans Mackowiak
37a94a741b Update yorvo_lord_of_garenbrig.txt 2020-08-20 07:34:57 +00:00
Michael Kamensky
8c23911259 Merge branch 'patch-10' into 'master' 
Update Secret Lair Drop Series.txt (Slime Drop)

See merge request core-developers/forge!3063
 2020-08-18 15:18:08 +00:00
John
3a48885820 Update Secret Lair Drop Series.txt 2020-08-18 08:36:54 +00:00
Michael Kamensky
9c3411738f Merge branch 'newBranch' into 'master' 
Various Fixes (Android Updater, MenuBar Touch, LibGDXUpdate)

See merge request core-developers/forge!3062
 2020-08-18 03:57:11 +00:00
Anthony Calosa
a7293a774c fixes black quest avatar 2020-08-18 04:04:33 +08:00
Anthony Calosa
00f9350b06 Fixes Android Update Downloader, Fixes touch for MenuBar (For Tall Devices) 2020-08-18 00:12:00 +08:00
Anthony Calosa
2ea857225c LibGDX Nightly Update 8-13-2020 (Libgdx Fixes specially GlyphLayout) 2020-08-18 00:09:02 +08:00
Michael Kamensky
b0da8a07c9 Merge branch 'akr' into 'master' 
Amonkhet Remastered support

See merge request core-developers/forge!3060
 2020-08-16 04:03:29 +00:00
Michael Kamensky
472d19b8e1 Merge branch 'jmptypos' into 'master' 
JMP typo fixing

See merge request core-developers/forge!3059
 2020-08-16 04:00:28 +00:00
Tim Mocny
e29862e8e8 JMP typo fixing 2020-08-16 04:00:28 +00:00
Michael Kamensky
4d3e3c4c84 Merge branch 'master' into 'master' 
A better PlayMain1 hint for Chasm guide

See merge request core-developers/forge!3061
 2020-08-16 03:59:51 +00:00
Michael Kamensky
eadaffb5ec - A better PlayMain1 hint for Chasm guide 2020-08-15 21:50:03 +03:00
Northmoc
5695f7dd76 AKR support 2020-08-15 11:43:58 -04:00
Michael Kamensky
0573aa8d9e Merge branch 'master' into 'master' 
Basic Balan, Wandering Knight AI logic

Closes #1538

See merge request core-developers/forge!3058
 2020-08-15 13:25:32 +00:00
Michael Kamensky
9630786fa6 - Basic Balan, Wandering Knight AI logic 2020-08-14 20:20:31 +03:00
Michael Kamensky
b61d4e87be Merge branch 'master' into 'master' 
Various minor AI flags and improvements.

See merge request core-developers/forge!3057
 2020-08-13 10:42:37 +00:00
Michael Kamensky
5fd74c53c9 - Various AI flags and improvements. 2020-08-13 13:34:03 +03:00
Michael Kamensky
bcb8a4bb9d Merge branch 'jmp-packs' into 'master' 
Playing Jumpstart with Sealed play

See merge request core-developers/forge!3056
 2020-08-12 04:31:07 +00:00
friarsol
af50800f1c Playing Jumpstart with Sealed play 2020-08-11 23:29:48 -04:00
Michael Kamensky
b86ef81e59 Merge branch 'm21_deckgen' into 'master' 
Updated deckgen data

See merge request core-developers/forge!3054
 2020-08-10 08:49:22 +00:00
Michael Kamensky
0634f1caf4 Merge branch 'master' into 'master' 
Lorescale Coatl: trigger no longer optional

See merge request core-developers/forge!3053
 2020-08-10 08:49:16 +00:00
austinio7116
f23ea3377f Updated deckgen data 
(cherry picked from commit 4377289)
 2020-08-10 07:07:33 +01:00
Michael Kamensky
3cd2125d88 Merge remote-tracking branch 'origin/master' into agetian-master 2020-08-09 14:24:10 +03:00
Michael Kamensky
4296638df8 - Lorescale Coatl triggered ability is no longer optional as of M21. 2020-08-09 14:23:14 +03:00
Michael Kamensky
86c96390ef Merge branch 'patch-8' into 'master' 
Update worlds.txt to include future Double Masters Release

See merge request core-developers/forge!3052
 2020-08-08 05:39:15 +00:00
Gabriel Franco
be46e8891b Update worlds.txt 2020-08-08 04:13:35 +00:00
Michael Kamensky
3654c017bb Merge branch 'master' into 'master' 
Mark Nylea's Forerunner as PlayMain1 for the AI.

See merge request core-developers/forge!3051
 2020-08-07 09:22:41 +00:00
Agetian
105bcdaea1 - Mark Nylea's Forerunner as PlayMain1 for the AI. 2020-08-07 11:58:42 +03:00
Hans Mackowiak
1b7980331c Update speaker_of_the_heavens.txt 2020-08-06 14:57:55 +00:00
Michael Kamensky
7249526ec9 Merge branch '3AugBnR' into 'master' 
3 Aug bans

See merge request core-developers/forge!3050
 2020-08-05 12:35:25 +00:00
Tim Mocny
6366e905c8 3 Aug bans 2020-08-05 12:35:25 +00:00
Michael Kamensky
302872b58f Merge branch 'master' into 'master' 
Chance Encounter: AI should play earlier to take advantage of other coin flip cards

See merge request core-developers/forge!3049
 2020-08-05 04:46:34 +00:00
Michael Kamensky
5feac63d7f - Chance Encounter: AI should play earlier to take advantage of other stuff that may feature a coin flip. 2020-08-05 07:38:12 +03:00
Michael Kamensky
4aca6ed3fa Merge branch 'master' into 'master' 
Fix a NPE in the AI code related to Unless cost

See merge request core-developers/forge!3048
 2020-08-04 18:45:47 +00:00
Michael Kamensky
4a97e593e9 - Fix NPE in the Unless cost AI. 2020-08-04 21:09:09 +03:00
Michael Kamensky
e19925470d Merge branch 'CurrentBrawlMetagame' into 'master' 
Current brawl metagame

See merge request core-developers/forge!3047
 2020-08-04 10:05:44 +00:00
Michael Kamensky
920d4c0e77 Merge branch 'fix_reg_exp' into 'master' 
fix regular expression

See merge request core-developers/forge!3046
 2020-08-02 15:38:35 +00:00
CCTV-1
03ec616b77 fix regular expressions that do not take effect 2020-08-02 21:34:51 +08:00
Michael Kamensky
bd1b87401a Merge branch 'costFlipCoinRefactor' into 'master' 
Refactor how human pays for FlipCoin part

See merge request core-developers/forge!3041
 2020-08-02 10:45:21 +00:00
Michael Kamensky
b3e66af66a Merge branch 'master' into 'master' 
DestroyAllAi: check for the outcome from DB subabilities (fixes Shatter the Sky logic)

See merge request core-developers/forge!3045
 2020-08-02 10:41:44 +00:00
Michael Kamensky
e2b94c6d1e Merge branch '1534-activating-sorin-imperious-bloodlord-to-deal-damage-to-the-opponent-s-thorn-lieutenant-doesn-t' into 'master' 
Resolve "Activating Sorin, Imperious Bloodlord to deal damage to the opponent's Thorn Lieutenant doesn't produce a token"

Closes #1534

See merge request core-developers/forge!3044
 2020-08-02 10:19:48 +00:00
Michael Kamensky
602fd96a6d - DestroyAllAi: check for the outcome from DB subabilities (fixes Shatter the Sky logic) 2020-08-02 13:17:45 +03:00
Hans Mackowiak
f3145e4fc8 TriggerBecomesTarget: fix ValidSource checking for SpellAbility too 2020-08-02 08:41:45 +02:00
Hans Mackowiak
45b6a0b0a6 Refactor how human pays for FlipCoin part 2020-08-02 08:21:33 +02:00
Sol
2d5c94aac8 Update primordial_mist.txt 2020-08-02 02:04:23 +00:00
Michael Kamensky
6d7a3bde75 Merge branch 'master' into 'master' 
Tweak Sarkhan Vol's PlayMain1 AI hint.

See merge request core-developers/forge!3043
 2020-08-01 19:29:29 +00:00
Michael Kamensky
7778da8d7a Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2020-08-01 16:25:02 +03:00
Michael Kamensky
cd9b25e2dd Merge branch 'substractAllCounterModificationException' into 'master' 
CountersRemove: fix ConcurrentModificationException when removing all counters

See merge request core-developers/forge!3042
 2020-08-01 13:21:32 +00:00
Michael Kamensky
2b1a8735e5 - Tweak Sarkhan Vol's PlayMain1 AI hint. 2020-08-01 16:20:13 +03:00