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
40,065 Commits 33 Branches 187 Tags
ef6e09d4c4c70b56b2c7bf40966bc34a8901366c
Commit Graph

40065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hanmac
d3395e95bc Keyword: add Spectacle 2018-12-23 18:47:37 +01:00
Hanmac
dd759352de Keyword: add Adapt 2018-12-23 18:47:37 +01:00
Hanmac
e85f9e08be Keyword: add Afterlife 2018-12-23 18:47:37 +01:00
Hans Mackowiak
b0c5cacc05 Merge branch 'sentryExceptionRework' into 'master' 
Sentry exception rework

See merge request core-developers/forge!1242
 2018-12-23 17:46:57 +00:00
Hans Mackowiak
9b991635fb Sentry exception rework 2018-12-23 17:46:57 +00:00
Hans Mackowiak
50ad26f2b4 Merge branch 'patch-2' into 'master' 
Update Etrata the Silencer

See merge request core-developers/forge!1244
 2018-12-23 17:45:12 +00:00
Hans Mackowiak
946115c2a6 Update Etrata the Silencer 2018-12-23 17:44:51 +00:00
Hans Mackowiak
f4619fb7fd Merge branch 'patch-1' into 'master' 
Update rot_hulk.txt: Oracle Text

See merge request core-developers/forge!1241
 2018-12-21 14:09:49 +00:00
Computica
976d51b777 Update rot_hulk.txt 2018-12-21 13:38:10 +00:00
Hans Mackowiak
7e50abdd5c Merge branch 'patch-2' into 'master' 
Fix Reyhan, Last of the Abzan

See merge request core-developers/forge!1240
 2018-12-20 14:26:32 +00:00
Hans Mackowiak
34273c6ce9 Fix Reyhan, Last of the Abzan 2018-12-20 14:25:53 +00:00
Michael Kamensky
ac2c23795b Merge branch 'master' into 'master' 
Fixed the +0 ability of Tezzeret, Cruel Machinist not being marked as Planeswalker ability.

See merge request core-developers/forge!1239
 2018-12-20 12:31:47 +00:00
Agetian
8c710a1618 - Fixed the +0 ability of Tezzeret, Cruel Machinist not being marked as Planeswalker ability. 2018-12-20 15:31:08 +03:00
Michael Kamensky
95d9f07900 Merge branch 'master' into 'master' 
Fixed a bug which made the Qty and New columns disappear in Quest Deck Editor.

See merge request core-developers/forge!1238
 2018-12-20 05:52:02 +00:00
Agetian
c83a364e41 - Fixed a bug which made the Qty and New columns disappear when switching between Main and Sideboard in quest deck editor. 2018-12-20 08:51:17 +03:00
Michael Kamensky
935db635c9 Merge branch 'master' into 'master' 
Flashback zone needs to be updated when the Stack changes, useful e.g. for Lightning Storm.

See merge request core-developers/forge!1237
 2018-12-20 05:34:00 +00:00
Agetian
b792f13c70 - Flashback zone needs to be updated when the Stack changes, useful e.g. for Lightning Storm. 2018-12-20 08:33:25 +03:00
Michael Kamensky
ccd8a85550 Merge branch 'master' into 'master' 
Fixed Vindictive Lich and SAView update for Charm in general (fixes related crashes and oddities).

See merge request core-developers/forge!1236
 2018-12-20 05:28:24 +00:00
Agetian
382d3f7752 - Unfreeze the tracker to update SpellAbilityViews for Charm, otherwise it may crash (fixes Vindictive Lich). 2018-12-20 08:27:02 +03:00
Michael Kamensky
50e1d7425a Merge branch 'master' into 'master' 
Fixed Lazav, the Multifarious ability description.

See merge request core-developers/forge!1235
 2018-12-19 15:08:15 +00:00
Agetian
6880596ca5 - Fixed Lazav, the Multifarious ability description. 2018-12-19 18:07:22 +03:00
Michael Kamensky
f75961f00f Merge branch 'game-night' into 'master' 
Game Night (GNT) edition file and exclusive cards

See merge request core-developers/forge!1232
 2018-12-18 19:37:43 +00:00
Michael Kamensky
7eed98a1e5 Merge branch 'master' into 'master' 
- Tweaked the Teneb event a little more.

See merge request core-developers/forge!1234
 2018-12-18 19:37:35 +00:00
Agetian
d2ae58fdeb - Tweaked the Teneb event a little more. 2018-12-18 22:36:51 +03:00
Agetian
6ca217cc53 - Attacking a planeswalker shouldn't count as attacking the opponent. 2018-12-18 16:11:41 +03:00
Agetian
7604e8c524 - Added token specs to Game Night edition file (not yet used). 2018-12-18 15:55:59 +03:00
Agetian
9fdc972704 - Added missing part of Oracle. 2018-12-18 14:56:05 +03:00
Agetian
d898ef0ddc - Added a missing part of Oracle. 2018-12-18 14:55:23 +03:00
Agetian
d5c576274a - Updating CHANGES.txt. 2018-12-18 13:56:22 +03:00
Michael Kamensky
50d33fcb9f Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_UMA (Possibility Storm - Ultimate Masters Puzzle).

See merge request core-developers/forge!1233
 2018-12-18 10:08:26 +00:00
Agetian
fd70b921f2 - Added puzzle PS_UMA. 2018-12-18 13:07:44 +03:00
Michael Kamensky
88a516ac04 Merge branch 'master' into 'master' 
Improved the Teneb event in Time Vault to be more consistent.

See merge request core-developers/forge!1231
 2018-12-18 08:56:10 +00:00
Agetian
a794313ba9 - TODO entry for TokenScript. 2018-12-18 11:55:10 +03:00
Agetian
1a6401797a - Added 5 deck-exclusive cards. 2018-12-18 11:52:07 +03:00
Agetian
cf0b007961 - Added 5 Gift Pack cards. 2018-12-18 10:27:13 +03:00
Agetian
c12d7a055b - Added Game Night definition. 2018-12-18 10:03:19 +03:00
Agetian
988d0559aa - Improved the Teneb event in Time Vault to be more consistent. 2018-12-18 10:01:52 +03:00
Michael Kamensky
d454253faa Merge branch 'fix-changezone-for-transformed' into 'master' 
Transformed objects must be reset to Original before they go through copyCard on ChangeZone (+ a few minor fixes)

Closes #786

See merge request core-developers/forge!1230
 2018-12-17 17:18:24 +00:00
Agetian
01026e5d74 - Assorted fixes: 
* Fixed ConcurrentModificationException when controlling something with Old Man of the Sea
* Added an AI hint to River Sneak.
* Fixed The Scorpion God.
 2018-12-17 18:44:45 +03:00
Agetian
f703a903f5 - Transformed objects must be reset to Original before they go through CardFactory.copyCard, or they end up in a mixed state, at least visually (since the transformed state is set on the copied object). 2018-12-17 17:21:34 +03:00
Michael Kamensky
82bd4ad235 Merge branch 'master' into 'master' 
Added a previously unoverridden method to WrappedAbility which is needed for Street Sweeper.

See merge request core-developers/forge!1229
 2018-12-17 14:20:09 +00:00
Agetian
0bd8e3a9a2 - Added a previously unoverridden method to WrappedAbility which is needed for checking AttachedTo on triggers properly (fixes Street Sweeper). 2018-12-17 16:17:13 +03:00
Michael Kamensky
14f458b327 Merge branch 'master' into 'master' 
Fixed Bogardan Phoenix.

Closes #785

See merge request core-developers/forge!1228
 2018-12-17 06:30:52 +00:00
Agetian
4efc697c4f - Removed an unnecessary reference. 2018-12-17 08:38:26 +03:00
Agetian
c1c7147f00 - More meaningful names in Bogardan Phoenix script. 2018-12-17 08:04:55 +03:00
Agetian
7875707f3c - Fixed Bogardan Phoenix. 2018-12-16 23:47:17 +03:00
Michael Kamensky
fa5f0fbd95 Merge branch 'ai-optional-costs' into 'master' 
AI optional cost choice update

Closes #783

See merge request core-developers/forge!1227
 2018-12-16 20:16:35 +00:00
Agetian
69446cd5a2 - Fixed Bone Dragon. 2018-12-16 22:54:03 +03:00
Agetian
6bc46c2e56 - Fix imports. 2018-12-16 15:06:26 +03:00
Agetian
767e13c547 - NPE guard. 2018-12-16 09:50:18 +03:00