external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,899 Commits 33 Branches 187 Tags
0aea9ce1535abb2e402a8c992094c18de7af9f3c
Commit Graph

36899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
austinio7116
fbfc4c43f4 Added some missing raritites from the dominaria editions file - rat colony and voltaic servant 2018-04-14 19:13:39 +01:00
Michael Kamensky
1c4670e42f Merge branch 'dom-card-fixes' into 'master' 
Helm of the Host ability triggers at beginning of combat

See merge request core-developers/forge!403
 2018-04-14 15:57:03 +00:00
Luke Way
268ccc2cd5 Helm of the Host ability triggers at beginning of combat 2018-04-14 11:30:52 -04:00
Michael Kamensky
2e342b32f2 Merge branch 'muldrotha' into 'master' 
MayPlay: fixed mayPlay with multiple static abilities

See merge request core-developers/forge!402
 2018-04-14 14:57:48 +00:00
Hanmac
32737ed9a3 MayPlay: fixed mayPlay with multiple static abilities 2018-04-14 09:24:26 +02:00
austinio7116
a280772be0 Merge branch 'assorted-fixes' into 'master' 
- Dominaria Planeswalker deck fix + minor update.

See merge request core-developers/forge!401
 2018-04-14 05:31:17 +00:00
Agetian
f75ed58a97 - Fixed Teferi planeswalker deck. 
- Somewhat more informative descriptions for Dominaria planeswalker decks.
 2018-04-14 08:24:00 +03:00
Hans Mackowiak
f1084158e1 Merge branch 'KickedManaRestrict' into 'master' 
AbilityManaPart: add valid check for the SA itself

Closes #445 and #456

See merge request core-developers/forge!384
 2018-04-14 05:12:46 +00:00
Hanmac
aae587c618 SpellAbility: if it has MultikickerCost it is kicked too 2018-04-13 23:41:45 +02:00
Michael Kamensky
ac72402af4 Merge branch 'bugfixes' into 'master' 
Removed promo card and planeswalker deck cards from booster drafts

See merge request core-developers/forge!400
 2018-04-13 19:23:00 +00:00
austinio7116
f8d0281931 corrected typo 2018-04-13 20:08:59 +01:00
austinio7116
06e192f595 Removed promo card and planeswalker deck cards from booster drafts 2018-04-13 20:04:25 +01:00
Michael Kamensky
75eb551e22 Merge branch 'patch' into 'master' 
DOM: A few fixes

See merge request core-developers/forge!399
 2018-04-13 18:54:42 +00:00
Misha Colbourne
64796da026 Update spore_swarm.txt 2018-04-13 18:53:33 +00:00
Misha Colbourne
d00914a11c Update org.eclipse.core.resources.prefs 2018-04-13 18:50:41 +00:00
OgreBattlecruiser
325e404de1 DOM: A few fixes 2018-04-13 19:47:30 +01:00
Agetian
e28b683b89 - Correct some code style issues. 2018-04-13 21:43:31 +03:00
Agetian
82bd0325cf - Only process actual planeswalkers when choosing PW to damage. 2018-04-13 21:41:10 +03:00
Agetian
a88c8fba76 Merge remote-tracking branch 'origin/ai-dealdamage-to-planeswalker' into ai-dealdamage-to-planeswalker 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
 2018-04-13 21:31:00 +03:00
Michael Kamensky
f561f4d67b Merge branch 'bugfixes' into 'master' 
Corrected call the cavalry's token image set code

See merge request core-developers/forge!398
 2018-04-13 18:29:53 +00:00
Agetian
9a02c5394d - Only process planeswalkers in dealDamageChooseTgtPW. 2018-04-13 21:25:29 +03:00
Agetian
ec09738321 - Added a TODO entry. 2018-04-13 21:24:33 +03:00
Agetian
2258506383 - Do not consider "indirect Planeswalker burn" when deliberately evaluating a planeswalker vs. a player target (the clause must be removed and set as default later when the planeswalker redirection rule is fully removed). 2018-04-13 21:24:33 +03:00
Agetian
f2af85597e - Fixed a typo in the PLANESWALKERS card predicate preset. 2018-04-13 21:24:33 +03:00
Agetian
e4e08609d9 - Only process planeswalkers in dealDamageChooseTgtPW. 2018-04-13 21:24:33 +03:00
Agetian
98e16b2e28 - DealDamageAi for triggered direct damage to planeswalkers. 2018-04-13 21:24:33 +03:00
Agetian
5af6197c9d - Initial implementation: for the AI, consider dealing damage to planeswalkers directly when applicable. 2018-04-13 21:24:33 +03:00
maustin
0ad4af8927 Merge remote-tracking branch 'origin/bugfixes' into bugfixes 2018-04-13 19:06:15 +01:00
austinio7116
ad87aa3eca Corrected call the cavalry's token image set code 2018-04-13 19:05:59 +01:00
swordshine
3caf94b919 Merge branch 'dominariadraft' into 'master' 
Added dominaria draft and rankings

See merge request core-developers/forge!396
 2018-04-13 10:06:37 +00:00
austinio7116
3cc1246bf4 Added dominaria draft and rankings 2018-04-13 10:44:07 +01:00
swordshine
d89f732faa Merge branch 'blackblade' into 'master' 
Blackblade reforged

Closes #230

See merge request core-developers/forge!394
 2018-04-13 08:16:11 +00:00
Hanmac
2b8f650a6c add Blackblade reforged 2018-04-13 08:25:14 +02:00
swordshine
90aa0d8c61 Merge branch 'master' into 'master' 
- Updated more cards

See merge request core-developers/forge!393
 2018-04-13 04:30:28 +00:00
swordshine
ec5e8302d7 - Updated more cards 2018-04-13 12:29:56 +08:00
swordshine
ce1df9a7ec Merge branch 'master' into 'master' 
- Updated some scripts

See merge request core-developers/forge!392
 2018-04-13 03:45:26 +00:00
swordshine
421eb35e2c - Updated some scripts 2018-04-13 11:44:52 +08:00
swordshine
393b7c76bd Merge branch 'master' into 'master' 
- Fixed two card's names

See merge request core-developers/forge!391
 2018-04-13 03:08:00 +00:00
swordshine
efc4cbc07f - Fixed two card's names 2018-04-13 11:07:40 +08:00
swordshine
85f710dafa Merge branch 'master' into 'master' 
Updated some scripts

See merge request core-developers/forge!390
 2018-04-13 03:00:03 +00:00
swordshine
8380c23bca - Updated Fiery Intervention 2018-04-13 10:59:34 +08:00
swordshine
7ec77ee40a Merge branch 'master' into 'master' 
Updated some scripts

See merge request core-developers/forge!389
 2018-04-13 02:41:39 +00:00
swordshine
7c0c3ee25b - Updated Fungal Plots' card name 2018-04-13 10:40:56 +08:00
swordshine
b92a6ab04b - Updated Relic Runner 2018-04-13 10:39:11 +08:00
swordshine
1b19c85611 - Updated some scripts 2018-04-13 10:38:04 +08:00
swordshine
5e1848270f Merge branch 'master' into 'master' 
Fixed Fiery Intervention's oracle text

See merge request core-developers/forge!388
 2018-04-13 02:10:00 +00:00
swordshine
e1f262bd26 - Fixed Fiery Intervention's oracle text 2018-04-13 10:08:51 +08:00
swordshine
547d36793a Merge branch 'patch' into 'master' 
DOM: Added some cards

See merge request core-developers/forge!386
 2018-04-13 02:02:43 +00:00
swordshine
31e711bd6a Merge branch 'planeswalker-decks' into 'master' 
Planeswalker decks

See merge request core-developers/forge!387
 2018-04-13 02:00:25 +00:00
swordshine
f2483766cf Merge branch 'dominaria' into 'master' 
Dominaria editions file

See merge request core-developers/forge!330
 2018-04-13 01:03:03 +00:00