external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,131 Commits 32 Branches 187 Tags
c66a8c20d25b5e3934d3a4cbdcd8095e533bff7f
Commit Graph

37131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
1dcfcc3531 - Healing Grace can target planeswalker 2018-04-19 10:39:13 +08:00
swordshine
11b1d29df6 Merge branch 'master' into 'master' 
Fixed some cards

See merge request core-developers/forge!431
 2018-04-19 00:53:44 +00:00
swordshine
ad30caa7c8 - Fixed some cards by stormcat 2018-04-19 08:52:50 +08:00
austinio7116
77da5c973b Fixed repeated cards in brawl 2018-04-18 22:54:52 +01:00
maustin
622f64ad29 Merge remote-tracking branch 'Core/master' 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/DigAi.java
 2018-04-18 22:42:22 +01:00
Michael Kamensky
0700e7a736 Merge branch 'master' into 'master' 
- Updating CHANGES.txt.

See merge request core-developers/forge!429
 2018-04-18 18:23:51 +00:00
Agetian
4e1e06c8f7 - Updating CHANGES.txt. 2018-04-18 21:23:26 +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
Agetian
9993366ade - Experimental: DigAi prefers to give lands to the opponent instead of functional cards e.g. for Karn, Scion of Urza. 2018-04-18 19:15:45 +01: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
Agetian
f83e097769 Merge remote-tracking branch 'origin/ai-torgaar' into ai-torgaar 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/LifeSetAi.java
 2018-04-18 17:18:49 +03:00
Agetian
dcacdf65ce - Reduced the life threshold for healing self with Torgaar. 2018-04-18 17:14:55 +03:00
Agetian
4b61620538 - Somewhat better LifeSetAi logic for Torgaar which accounts for possible different starting life. 2018-04-18 17:11:02 +03:00
Agetian
8b0a5e886e - Basic AI for Torgaar (currently won't sac anything as a part of cost payment) 
- Fixed references in the script for Torgaar.
 2018-04-18 17:11:02 +03:00
Michael Kamensky
1045204fb7 Merge branch 'ai-give-lands-to-opp' into 'master' 
DigAi prefers to choose lands for opp's Karn, Scion of Urza +1 and other similar abilities.

Closes #508

See merge request core-developers/forge!413
 2018-04-18 14:09:15 +00:00
Agetian
7e1226bc3d - Refactored chooseSingleCard in DigAi. 2018-04-18 17:08:12 +03:00
Agetian
b8deb244ca Merge remote-tracking branch 'origin/ai-torgaar' into ai-torgaar 2018-04-18 09:53:42 +03:00
Agetian
6a47d10d7b - Somewhat better LifeSetAi logic for Torgaar which accounts for possible different starting life. 2018-04-18 09:53:24 +03:00
Agetian
694ac39e89 - Basic AI for Torgaar (currently won't sac anything as a part of cost payment) 
- Fixed references in the script for Torgaar.
 2018-04-18 09:53:24 +03:00
Michael Kamensky
a295f34094 Merge branch 'assorted-fixes' into 'master' 
Fixed references in Torgaar, Famine Incarnate.

See merge request core-developers/forge!426
 2018-04-18 06:52:07 +00:00
Agetian
6bb66646b8 - Fixed references in Torgaar, Famine Incarnate. 2018-04-18 09:49:53 +03:00
Agetian
6c0112262e - Somewhat better LifeSetAi logic for Torgaar which accounts for possible different starting life. 2018-04-18 09:45:00 +03:00
Agetian
4bae4c7491 - Basic AI for Torgaar (currently won't sac anything as a part of cost payment) 
- Fixed references in the script for Torgaar.
 2018-04-18 09:25:58 +03: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
0aea9ce153 Fix imports. 
Woops, commited too fast. Adding imports for MyRandom.
 2018-04-17 16:28:27 -07:00
Meerkov
4925db1b66 Remove Math.Random in favor of MyRandom. 
This is a continuation of the RNG updates. Math.Random is an insecure PRNG which is actually different than java.util.Random as well.
 2018-04-17 16:25:43 -07:00
Meerkov
72baafe4f2 Deletes 5 year old, unused JQuery code. 
It seems like the developer planned to do something with it, but never did. Removing it seems like the only reasonable action.
 2018-04-17 16:14:35 -07:00
Meerkov
64b98a84f5 Fix memory leak in FServerManager. 2018-04-17 16:11:25 -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
Michael Kamensky
a225cf0f92 Merge branch 'frostwielder' into 'master' 
cards: Replace Moved that does check on damaged by need to use ValidLKI

Closes #406

See merge request core-developers/forge!421
 2018-04-17 14:41:14 +00:00
Hanmac
ae5f85352e cards: Replace Moved that does check on damaged by need to use ValidLKI 
Closes #406
 2018-04-17 15:44:32 +02:00
Michael Kamensky
ffc414062b Merge branch 'patch-AnimateAllAI-mandatory' into 'master' 
AnimateAllAi: fixed doTriggerAi for mandatory

See merge request core-developers/forge!420
 2018-04-17 11:50:30 +00:00
Hans Mackowiak
da50071765 AnimateAllAi: fixed doTriggerAi for mandatory 2018-04-17 11:28:08 +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
Agetian
9650014506 - Pay costs for ultimate SA shouldn't be null, but better safe than sorry. 2018-04-17 09:59:22 +03:00
Hanmac
eda7fee2c6 AiController: fixed MayPlay for Land 2018-04-17 08:07:11 +02: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
857f45f9ec Updates AI code to use MyRandom directly. 
This removes java.util.Random from lots of AI code, futher making it unlikely that developers will accidentally use "new Random()" instead of MyRandom class. This will make running AI experiments easier, because there will be exactly one class that controls the randomness.
 2018-04-16 21:31:52 -07: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
130fc4ee18 Complete update to Java 8. 2018-04-16 20:38:20 -07:00
swordshine
ea32363144 Merge branch 'master' into 'master' 
Updated the oracle text of Blackblade Reforged

See merge request core-developers/forge!418
 2018-04-17 02:50:45 +00:00