external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,013 Commits 33 Branches 187 Tags
e60d5173f4335afb7d0809b9aa79d63c9fbd9a4d
Commit Graph

2901 Commits

Author SHA1 Message Date
Michael Kamensky
78525a830b Merge branch 'assorted-fixes' into 'master' 
Added NPE prevention for situations where AI evaluation for targeting cards with Shroud in MoJhoSto crashes the game.

See merge request core-developers/forge!455
 2018-04-21 20:16:58 +00:00
Agetian
819301c7d8 - FIXME: Added NPE prevention for situations where targeting cards with Shroud would be tested, but the SA activator would be null at this point (seems to happen for the AI in MoJhoSto matches; probably needs a more thorough long-term solution). 2018-04-21 19:58:03 +03:00
Blacksmith
0d375ecd93 [maven-release-plugin] prepare for next development iteration 2018-04-21 01:18:35 +00:00
Blacksmith
970f684345 [maven-release-plugin] prepare release forge-1.6.9 2018-04-21 01:18:32 +00:00
Hanmac
c47da9acdd PlayEffect: don't cast to CardCollection 2018-04-20 13:01:29 +02:00
Michael Kamensky
5844de9b3c Merge branch 'assorted-fixes' into 'master' 
Fixed the AI hanging the game in AF ChooseSource in corner cases

See merge request core-developers/forge!440
 2018-04-20 04:33:41 +00:00
Agetian
a1a7390d80 - Fixed the AI hanging the game when trying to choose a source in absence of a creature in combat on the opponent's battlefield. 2018-04-20 07:13:25 +03:00
Michael Kamensky
3bb69e356c Merge branch 'healinggrace' into 'master' 
ReplaceDamage: new Effect for reducing Damage inside ReplacementEffect

Closes #268

See merge request core-developers/forge!427
 2018-04-18 18:20:17 +00:00
Michael Kamensky
e5d436c295 Merge branch 'master' into 'master' 
Memory Leaks, Unused code, compiler warnings, etc.

See merge request core-developers/forge!423
 2018-04-18 15:40:37 +00:00
Hanmac
211157c0d0 ReplaceDamage: new Effect for reducing Damage inside ReplacementEffect 2018-04-18 17:24:59 +02:00
Michael Kamensky
e186356591 Merge branch 'torgaar' into 'master' 
Add Torgaar (DOM)

See merge request core-developers/forge!424
 2018-04-18 04:23:00 +00:00
Chris H
f3afaf9c51 Add Torgaar (DOM) 2018-04-17 23:08:53 -04:00
Meerkov
6efd631fd8 Declares a serialVersionUID. 
Lots of classes here are serializable, but warn due to missing UID. Serializables are supposed to have a UID for version compatability. Fixes a bunch of compiler warnings.

Also adds in "default:" branch to a few switches which were warning due to missing cases.
 2018-04-17 16:48:18 -07:00
Meerkov
db3e4d9e83 Fixes ~50 compiler warnings for unused libraries. 2018-04-17 16:06:00 -07:00
Meerkov
338ba5afdc Fixes some compile errors in Eclipse due to empty folders. 2018-04-17 15:50:53 -07:00
Michael Kamensky
f51b80739a Merge branch 'master' into 'master' 
Re-merge request for RNG Changes etc

See merge request core-developers/forge!422
 2018-04-17 15:35:05 +00:00
Michael Kamensky
d1eea7e7ba Merge branch 'mayPlayLand' into 'master' 
May play land

See merge request core-developers/forge!415
 2018-04-17 14:54:04 +00:00
Hanmac
3b9ea37907 Player: add playLandNoCheck to be used by LandAbility 2018-04-17 09:04:50 +02:00
Michael Kamensky
1a5710c564 Merge branch 'ai-better-pw-damage' into 'master' 
Better ranking system for damaging planeswalkers directly

See merge request core-developers/forge!414
 2018-04-17 07:01:47 +00:00
Hanmac
79c9c914e2 LandAbility: do extra ability class, so it can use mayPlay 2018-04-17 08:07:11 +02:00
Hanmac
190db26ebd MayPlay: fixed Bestow and MorphDown Effects 2018-04-17 08:07:11 +02:00
Meerkov
5c9a27c930 Update lots of code to use MyRandom directly. 
Some parts of the code were using the normal random, instead of going through the MyRandom class. This makes it much harder to change the RNG method later. For example, you may want to change the RNG to always be seeded with the same number, for running AI experiments. This change makes that easier.
 2018-04-16 21:26:12 -07:00
Meerkov
645d70e6ce Fixes inefficient shuffle algorithm. 
Note that shuffling 13 times in a row is not necessary. Collections.shuffle will produce every possible shuffle with equal probability already.
 2018-04-16 20:40:20 -07:00
Meerkov
1cfb937490 Updates the project for Java 8. 
Maps.newHashMap() was replaced with null in numerous locations. A null check is performed in the locations that read this value. This prevents unnecessary allocation of memory and fixes compiler errors.

"final" keyword added to RepeatEachEffect, which used local variables in non-local scope.
 2018-04-16 18:26:15 -07:00
Agetian
ae05e58a13 - Somewhat more explicit method name. 2018-04-16 22:18:33 +03:00
Agetian
2c9b23fc6d - Better ranking system for damaging planeswalkers directly (accounts for loyalty and closeness to ultimate for now). 2018-04-16 21:31:49 +03:00
swordshine
85458cfe5a Merge branch 'ai-dealdamage-to-planeswalker' into 'master' 
Simple direct damage to planeswalkers AI

See merge request core-developers/forge!381
 2018-04-15 07:43:54 +00:00
Hanmac
32737ed9a3 MayPlay: fixed mayPlay with multiple static abilities 2018-04-14 09:24:26 +02:00
Hanmac
aae587c618 SpellAbility: if it has MultikickerCost it is kicked too 2018-04-13 23:41:45 +02:00
Agetian
f2af85597e - Fixed a typo in the PLANESWALKERS card predicate preset. 2018-04-13 21:24:33 +03:00
Hanmac
f7bed9089c AbilityManaPart: add valid check for the SA itself 
split later into extra check for SA and Host
 2018-04-12 07:16:31 +02:00
swordshine
333ba13869 Merge branch 'staticDamageToReplace' into 'master' 
Replacement Effect instead of StaticDamage

See merge request core-developers/forge!332
 2018-04-12 00:43:22 +00:00
swordshine
ab6de1752f - Fixed issue #9 (Angrath, Minotaur Pirate vs. indestructible creatures 
)
 2018-04-11 17:48:47 +08:00
Hans Mackowiak
f6dc955d4b Update CopyPermanentEffect 2018-04-10 17:48:30 +00:00
Hanmac
b5be110f0c Replacement Effect instead of StaticDamage 2018-04-10 07:15:41 +02:00
Hanmac
0bc12e744e CopyPerm: rewoke and update with Populate 2018-04-09 07:50:44 +02:00
Hanmac
6c04084891 FlipCoin: add Amount so Head and Tails abilities can use the amount 2018-04-07 11:14:07 +02:00
swordshine
633a1d644a - Added Damping Sphere 2018-04-06 16:05:08 +08:00
swordshine
5af448c039 - Fixed Song of Freyalise 2018-04-06 13:02:10 +08:00
swordshine
ecac92d9b3 - Skipping your "next" untap step is cumulative. 2018-04-05 22:16:54 +08:00
swordshine
45b6f1a6ef - Fixed "precombat main phase" triggers 2018-04-05 22:07:15 +08:00
swordshine
d61aeb09c0 - Fixed Sage of Ancient Lore 2018-04-05 21:28:15 +08:00
swordshine
a5ea35e6b7 - Fixed cost description for Cycling (Street Wraith) 2018-04-05 20:18:21 +08:00
Hanmac
e0dc5d4ced Saga: fix if last ability is countered 2018-04-04 07:49:04 +02:00
Sol
f7099b4555 Merge branch 'network-play' into 'master' 
use CardView for selection of exterting attackers

See merge request core-developers/forge!345
 2018-04-04 02:37:47 +00:00
Jamin W. Collins
3f8a3f3342 use CardView for selection of exterting attackers 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-04-03 20:12:15 -06:00
swordshine
2b8afc3972 Merge branch 'patch' into 'master' 
Fixed a crash when Momir Avatar copys an etbcounter card

See merge request core-developers/forge!344
 2018-04-04 01:03:33 +00:00
swordshine
771341f2e9 - Fixed a crash when MMomir Avatar copys an etbcounter card 2018-04-04 09:02:35 +08:00
Hanmac
8c601f86f6 Do Saga Abilities 2018-04-03 15:19:54 +02:00
Sol
eb4fc9f7ce Merge branch 'momirvariant' into 'master' 
Added MoJhoSto variant

See merge request core-developers/forge!338
 2018-04-03 01:14:19 +00:00