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
35,754 Commits 33 Branches 187 Tags
af14c33e39f0199ca66cdca29eefda7418cc1df5
Commit Graph

35754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hanmac
90b46f4c0f Card & CardState: add has functions to check for SpellAbility, Trigger and ReplacementEffects 2018-01-28 12:31:13 +01:00
Michael Kamensky
1281af0994 Merge branch 'assorted-fixes' into 'master' 
- Fixed a compile time error caused by an unused import statement.

See merge request core-developers/forge!156
 2018-01-28 08:47:48 +00:00
Agetian
b31069866a - Fixed a compile time error caused by an unused import statement. 2018-01-28 11:30:29 +03:00
Michael Kamensky
00f896bbb4 Merge branch 'patch-2' into 'master' 
remove Code2, not needed for this.

See merge request core-developers/forge!154
 2018-01-28 06:47:54 +00:00
Michael Kamensky
cd5c03926f Merge branch 'deck-descriptions' into 'master' 
Deck descriptions

See merge request core-developers/forge!155
 2018-01-28 06:46:20 +00:00
Rob Schnautz
11218913a4 description, premium Aegis Angel 2018-01-28 03:00:13 +00:00
Rob Schnautz
0a039e4f53 description 2018-01-28 02:40:17 +00:00
Rob Schnautz
7e37b3d760 description, premium Grove of the Guardian 2018-01-28 02:37:52 +00:00
Rob Schnautz
d577c229e3 description, premium Noosegraf Mob 2018-01-28 02:36:51 +00:00
Rob Schnautz
6cd74946e4 description 2018-01-28 02:36:06 +00:00
Rob Schnautz
d34b6428ae description 2018-01-28 02:30:18 +00:00
Rob Schnautz
e242e3f371 description 2018-01-28 02:29:47 +00:00
Rob Schnautz
4165004491 description, premium Fathom Mage 2018-01-28 02:23:41 +00:00
Rob Schnautz
d290d5fbf4 typo 2018-01-28 02:21:41 +00:00
Rob Schnautz
81c99209ce description 2018-01-28 02:15:34 +00:00
Rob Schnautz
1962aac95b description, premium Harvester of Souls 2018-01-28 02:07:03 +00:00
Rob Schnautz
60a66585f3 Update Unstable.txt 2018-01-28 02:03:38 +00:00
Rob Schnautz
d7f3842a30 don't need code2 2018-01-28 01:59:23 +00:00
Rob Schnautz
81be883bee Update Unglued.txt 2018-01-28 01:56:30 +00:00
Rob Schnautz
0dfcb225e0 use UGL for pics. no good reason to use the two-letter code. 2018-01-28 01:48:05 +00:00
Sol
06f95efd52 Merge branch 'fix-deck-view' into 'master' 
Improve deck view with multi-monitor systems

See merge request core-developers/forge!153
 2018-01-27 23:50:18 +00:00
Sol
0dae411333 Merge branch 'custom-deck-directories' into 'master' 
Custom deck directories

See merge request core-developers/forge!152
 2018-01-27 21:34:03 +00:00
Jamin W. Collins
c1e1b6f29a Improve deck view with multi-monitor systems 
On Linux multi-monitor systems, the existing logic would create a new
window that was slightly smaller than the total combined display size.
The new logic creates a window that is slightly smaller than the monitor
Forge is currently on.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-01-27 09:49:13 -07:00
Michael Kamensky
a511bdbcd8 Merge branch 'assorted-fixes' into 'master' 
Fixed an AI logic error in CountersPutAi

See merge request core-developers/forge!151
 2018-01-27 16:35:09 +00:00
Agetian
b0037faa11 - Fixed an AI logic error in CountersPutAi which caused the AI to buff the opponent's creatures with Incremental Growth. 2018-01-27 19:34:11 +03:00
Jamin W. Collins
6dc6a7a29c add new parameters and descriptions to properties.example 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-01-27 09:23:51 -07:00
Jamin W. Collins
fd6192a88e remove trailing whitespace 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-01-27 09:12:55 -07:00
Jamin W. Collins
fcb8e1f8c9 allow for custom deck directory paths 
This adds support for two additional configuration options to the
forge.profile.properties file:
 * decksDir
 * decksConstructedDir

The first sets the desired path for all decks.  The second sets the
desired path specifically for constructed decks.  This allows users to
reference an external directory that may be synced between multiple
users or systems by an external (to forge) mechanism.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-01-27 08:53:54 -07:00
Michael Kamensky
2da04fed3d Merge branch 'patch' into 'master' 
- Updated a few scripts

See merge request core-developers/forge!150
 2018-01-27 15:28:17 +00:00
swordshine
00abdccc13 - Simplied two scripts 2018-01-27 21:44:26 +08:00
swordshine
9f25644645 - Fixed Phytotitan 2018-01-27 20:39:39 +08:00
swordshine
83b84dfff7 - Gaze of the Gorgon uses delayed triggers 2018-01-27 20:25:52 +08:00
swordshine
c0f5f0567b - Fixed Glyph of Doom 2018-01-27 20:16:41 +08:00
swordshine
f53a54a126 - Fixed blockedByRemembered when two or more cards are remembered 2018-01-27 19:56:41 +08:00
swordshine
e3ac4433e1 - Venomous Breath now uses delayed triggers 2018-01-27 19:39:20 +08:00
swordshine
1e831513a0 - Shifty Doppelganger now uses delayed triggers 2018-01-27 18:53:20 +08:00
swordshine
a40a6e8023 - Rescue from the Underworld now uses delayed triggers 2018-01-27 17:00:38 +08:00
swordshine
22982178e2 - Attempt to fix the CopyPermanent effect when Crafty Cutpurse is in play 2018-01-27 16:23:55 +08:00
swordshine
63e2854d7a - It should be a special action to remove the effect of Glass Asp (these effects might be transformed to delayed triggers in the future) 2018-01-27 14:53:27 +08:00
swordshine
7117580446 - Some keywords should be "hidden" 2018-01-27 14:42:33 +08:00
swordshine
691562324b - Giant Slug now uses a delayed trigger 2018-01-27 10:40:31 +08:00
swordshine
f0e6e20732 - Elkin Bottle should have a duration 2018-01-27 09:31:25 +08:00
Michael Kamensky
67ab3e1e01 Merge branch 'patch' into 'master' 
- Necromancy and its friends now use delayed triggers instead of animated triggers

See merge request core-developers/forge!149
 2018-01-26 16:54:50 +00:00
Hans Mackowiak
a048ab3327 Merge branch 'assorted-fixes' into 'master' 
Fixed CardState#copyFrom copying non-intrinsic abilities, minor card fix (Nissa, Steward of Elements)

See merge request core-developers/forge!148
 2018-01-26 14:13:22 +00:00
swordshine
af1be79f78 - Necromancy and its friends now use delayed triggers instead of animated triggers 2018-01-26 19:24:29 +08:00
Agetian
81366a1e14 Merge remote-tracking branch 'origin/assorted-fixes' into assorted-fixes 2018-01-26 13:46:23 +03:00
Agetian
21c4e2eeda - Fixed Nissa, Steward of Elements references and AI logic. 2018-01-26 13:36:48 +03:00
Agetian
b866338197 - Only copy the intrinsic abilities in CardState#copyFrom, fixes clone abilities copying too much (e.g. copied tokens from Splinter Twin gaining the copy ability). 2018-01-26 09:16:13 +03:00
Agetian
98e19db3fc Merge branch 'master' of git.cardforge.org:core-developers/forge into assorted-fixes 2018-01-26 09:08:14 +03:00
Agetian
5221d871a0 - Only copy the intrinsic abilities in CardState#copyFrom, fixes clone abilities copying too much (e.g. copied tokens from Splinter Twin gaining the copy ability). 2018-01-26 09:07:50 +03:00