external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,286 Commits 31 Branches 187 Tags
2619f87520ae885e447a1bea9323bfd49fe7e80c
Commit Graph

42286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
f3ba20452d Merge branch 'master' into 'master' 
Use a standardized AILogic$ Always name for Hunt the Weak/Savage Stomp instead of inventing a new one

See merge request core-developers/forge!1839
 2019-06-12 05:02:16 +00:00
Agetian
b772b08d03 - A more traditional name for the AI logic 2019-06-12 08:01:35 +03:00
Michael Kamensky
982c138ca6 Merge branch 'master' into 'master' 
Fix AI logic for Hunt the Weak and Savage Stomp

See merge request core-developers/forge!1838
 2019-06-12 05:00:34 +00:00
Agetian
b23fc791a2 - Same tweak for Savage Stomp 2019-06-12 07:59:50 +03:00
Agetian
25995db862 - Fix the AI logic for Hunt the Weak 2019-06-12 07:59:09 +03:00
Michael Kamensky
e09cb43ef8 Merge branch 'master' into 'master' 
Fix AI logic for Domri's Ambush

See merge request core-developers/forge!1837
 2019-06-12 04:50:51 +00:00
Agetian
2acbddbecf - Fix AI logic for Domri's Ambush 2019-06-12 07:44:57 +03:00
Michael Kamensky
54ccf6e7a8 Merge branch 'master' into 'master' 
Tweak ANNOUNCEMENTS.txt.

See merge request core-developers/forge!1836
 2019-06-12 03:50:02 +00:00
Agetian
de0807f6f8 - Tweak ANNOUNCEMENTS.txt. 2019-06-12 06:49:16 +03:00
Michael Kamensky
9dda5bbbcf Merge branch 'patch-2' into 'master' 
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!1835
 2019-06-12 03:48:01 +00:00
Sol
84b26638dd Update ANNOUNCEMENTS.txt 2019-06-12 01:52:32 +00:00
Michael Kamensky
54f397cca9 Merge branch 'master' into 'master' 
Tweak the new cubes for better AI rankings.

See merge request core-developers/forge!1834
 2019-06-11 19:49:38 +00:00
Agetian
2c7d38fa39 - Tweak the new cubes for better AI rankings. 2019-06-11 22:49:13 +03:00
Michael Kamensky
854a5575e1 Merge branch 'master' into 'master' 
Added 2 draft cubes (cubetutor.com)

See merge request core-developers/forge!1833
 2019-06-11 19:40:46 +00:00
Agetian
a1e8d15818 - Added 2 draft cubes. 2019-06-11 22:40:02 +03:00
Michael Kamensky
4dde3610fa Merge branch 'master' into 'master' 
de-DE internationalization work

See merge request core-developers/forge!1832
 2019-06-11 18:10:21 +00:00
churrufli
704fa9ad5c de-DE internationalization work 2019-06-11 18:50:10 +02:00
Michael Kamensky
ec1d1ec221 Merge branch 'master' into 'master' 
Added Wtwlf123 540-card Powered Cube originally contributed in Forge format by peepser

See merge request core-developers/forge!1831
 2019-06-11 13:09:31 +00:00
Agetian
3145412ca9 - Added Wtwlf123 540-card Powered Cube originally contributed in Forge format by peepser 2019-06-11 16:02:57 +03:00
Michael Kamensky
0fe0ca00bc Merge branch 'master' into 'master' 
DamageDealAi: fix a crash and logic error for cards like Expansion // Explosion, Chamber Sentry, etc.

See merge request core-developers/forge!1830
 2019-06-11 12:20:12 +00:00
Agetian
cfed38f4f1 - DamageDealAi: fix a crash and logic error for cards like Expansion // Explosion, Chamber Sentry, etc. 2019-06-11 15:19:32 +03:00
Michael Kamensky
ee2733cd86 Merge branch 'master' into 'master' 
Added puzzle PS_WAR6 - Possibility Storm - War of the Spark 06

See merge request core-developers/forge!1829
 2019-06-11 10:42:04 +00:00
Agetian
c75d8fa065 - Added puzzle PS_WAR6. 2019-06-11 13:41:06 +03:00
Michael Kamensky
43c7956e13 Merge branch 'master' into 'master' 
Fix RevealAi logic "Kefnet"

See merge request core-developers/forge!1828
 2019-06-11 06:09:15 +00:00
Agetian
6115c0cc45 - Fix RevealAi logic "Kefnet" 2019-06-11 09:08:44 +03:00
Michael Kamensky
0bbdddada1 Merge branch 'master' into 'master' 
internationalization works

See merge request core-developers/forge!1820
 2019-06-11 05:36:06 +00:00
Michael Kamensky
8c65965669 Merge branch 'london-mulligan-ui' into 'master' 
Improved London Mulligan UI (visually highlight selected cards, don't allow to select more cards than needed)

See merge request core-developers/forge!1826
 2019-06-11 05:33:25 +00:00
Michael Kamensky
391c81101f - Improved London Mulligan UI (visually highlight selected cards, don't allow to select more cards than necessary) 2019-06-11 05:33:25 +00:00
Michael Kamensky
b5d12c809a Merge branch 'revealFirstTrigger' into 'master' 
cards: refactor Reveal the first card you draw into Static Trigger

See merge request core-developers/forge!1827
 2019-06-11 05:33:12 +00:00
Hans Mackowiak
1b138b11f8 cards: refactor Reveal the first card you draw into Static Trigger 2019-06-11 05:33:12 +00:00
Michael Kamensky
1c22f8cc60 Merge branch 'M15-Prerelease-Challenge' into 'master' 
Added M15 Prerelease Challenge Edition

See merge request core-developers/forge!1822
 2019-06-11 04:36:37 +00:00
Michael Kamensky
a6bce235f1 Merge branch 'mulligan-ui' into 'master' 
UI for choosing the Mulligan type

See merge request core-developers/forge!1821
 2019-06-11 04:02:16 +00:00
Michael Kamensky
08e2ba54ea UI for choosing the Mulligan type 2019-06-11 04:02:16 +00:00
Michael Kamensky
dad052fa07 Merge branch 'london-mulligan-feature-flag' into 'master' 
Fix LondonMulligan not actually working

See merge request core-developers/forge!1825
 2019-06-11 04:02:05 +00:00
Chris H
aa5851329d Fix LondonMulligan not actually working 2019-06-10 22:55:50 -04:00
swordshine
37fabf33a6 Merge branch 'support-fixes' into 'master' 
MH1 misc fixes

See merge request core-developers/forge!1824
 2019-06-11 00:36:30 +00:00
apantel
dd404b678e MH1 misc fixes 2019-06-10 19:35:16 -04:00
Michael Kamensky
92ca339c64 Merge branch 'master' into 'master' 
Fixed Spark Double

Closes #1047

See merge request core-developers/forge!1823
 2019-06-10 17:02:28 +00:00
Agetian
f9f710f9b9 - Fixed Spark Double. 2019-06-10 20:01:39 +03:00
Dagin Svezek
ab813e7327 Added M15 Prerelease Challenge Edition 2019-06-10 07:33:42 +00:00
Agetian
e3ee75bd39 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-06-10 06:19:04 +03:00
Michael Kamensky
ef7e23d131 Merge branch 'fix-lavinia' into 'master' 
Fix Lavinia, Azorius Renegade

See merge request core-developers/forge!1819
 2019-06-10 03:06:25 +00:00
Michael Kamensky
b45ef60ed2 Fix Lavinia, Azorius Renegade 2019-06-10 03:06:25 +00:00
churrufli
5a98eafacb internationalization works 2019-06-09 23:08:45 +02:00
Agetian
09a91bd8d2 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-06-09 17:57:49 +03:00
Michael Kamensky
3300ebafb1 Merge branch 'master' into 'master' 
Fix Sorin, Vengeful Bloodlord and implement a basic AI for it.

See merge request core-developers/forge!1818
 2019-06-09 14:08:32 +00:00
Michael Kamensky
caf6c73b7d Fix Sorin, Vengeful Bloodlord and implement a basic AI for it. 2019-06-09 14:08:32 +00:00
Agetian
6588c2d6d3 - Remove the Announce mechanism for X. 2019-06-09 17:07:16 +03:00
Agetian
0252e346c3 - Fix Sorin, Vengeful Bloodlord and implement an AI for it. 2019-06-09 17:03:22 +03:00
Michael Kamensky
8ed4126893 Merge branch 'master' into 'master' 
Fix Deliver unto Evil.

Closes #1044

See merge request core-developers/forge!1817
 2019-06-09 11:46:32 +00:00