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

35723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
d8a284ebb9 Merge branch 'unstable-basic-lands' into 'master' 
- Render Unstable basic lands borderless.

See merge request core-developers/forge!160
 2018-01-30 16:22:08 +00:00
Michael Kamensky
1c64ebd05b Merge branch 'upcoming_rix2' into 'master' 
Added HOU, XLN and RIX image file paths to the lists for quest mode

See merge request core-developers/forge!159
 2018-01-30 15:39:53 +00:00
Agetian
0727c83a43 - Render Unstable basic lands borderless. 2018-01-30 18:14:06 +03:00
maustin
eb4a8caefc Removed unneeded targeting of opponent in Huatli Radiant Champion 2018-01-30 12:51:53 +00:00
Michael Kamensky
253efc6c6d Merge branch 'assorted-fixes' into 'master' 
Several card fixes and an AI pump prediction fix

See merge request core-developers/forge!158
 2018-01-30 10:45:28 +00:00
Agetian
d8be06c165 - Fixed Battle at the Bridge SpellDescription. 2018-01-30 13:17:43 +03:00
Agetian
e02baac897 - Fixed Wandering Fumarole not gaining its {0} ability properly 2018-01-30 13:17:32 +03:00
Agetian
46f19b6079 Merge remote-tracking branch 'origin/assorted-fixes' into assorted-fixes 2018-01-30 13:12:32 +03:00
austinio7116
2f3ba53a89 Added HOU, XLN and RIX image file paths to the lists for quest mode 2018-01-30 08:56:48 +00:00
Agetian
b763e06560 - AiAttackController: Don't check targeting restrictions if the ability doesn't target. 2018-01-30 08:45:25 +03:00
Agetian
2447ea4fb0 - AiAttackController/AiBlockController: do not count activated abilities that can't target the attacker/blocker when trying to predict P/T bonus from AF Pump (fixes the AI suicide attacking/blocking with cards like Pia Nalaar) 2018-01-30 08:45:25 +03:00
Agetian
75f86352be - AiAttackController: Don't check targeting restrictions if the ability doesn't target. 2018-01-30 08:44:16 +03:00
Agetian
19dd58d1d3 - AiAttackController/AiBlockController: do not count activated abilities that can't target the attacker/blocker when trying to predict P/T bonus from AF Pump (fixes the AI suicide attacking/blocking with cards like Pia Nalaar) 2018-01-30 08:34:01 +03:00
Hanmac
68843db5b8 Card: changed how instant and Sorcery show keywords 2018-01-29 22:52:02 +01:00
Hanmac
586c2eb9b0 cards: update Buyback scripts 2018-01-29 22:50:07 +01:00
Hanmac
156cdf812d CardFactoryUtil: use : for Buyback, make some effect Secondary 2018-01-29 22:49:51 +01:00
Michael Kamensky
5e6d9749fb Merge branch 'patch-3' into 'master' 
Quick Start Set: Rivals

See merge request core-developers/forge!157
 2018-01-29 05:00:54 +00:00
Rob Schnautz
2392aeeb0c Add new file 2018-01-28 20:01:16 +00:00
Hanmac
5a29b05e88 CardFactoryUtil: move Totem Armor to ReplacementAbilities 2018-01-28 14:40:37 +01:00
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