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
39,874 Commits 33 Branches 187 Tags
07c2065917c28f3d1615efeb6bd67e21fd5f301c
Commit Graph

39874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
1ab9f2cae5 - Fixed a stack overflow when the AI is considering Pause for Reflection. 
- Improved the implementation of AiCardMemory a little, making it a little safer to use as well in routines which may also be used to simulate human behavior.
 2018-10-30 13:06:33 +03:00
Michael Kamensky
df22cc7be4 Merge branch 'update-and-merge-1' into 'master' 
Update and merge Jamin Collins's file settings for mobile forge (deck location MR).

See merge request core-developers/forge!1046
 2018-10-29 06:38:07 +00:00
Agetian
ec25f31718 - Update file settings description. 2018-10-29 09:36:54 +03:00
Agetian
0c6883caf0 Merge branch 'android-improvements' of git.cardforge.org:jamincollins/forge into update-and-merge-1 2018-10-29 09:34:04 +03:00
Michael Kamensky
bbe84b8092 Merge branch 'fix-stonehewer-avtr' into 'master' 
Fix Stonehewer Avatar not working correctly.

Closes #753

See merge request core-developers/forge!1045
 2018-10-27 08:11:13 +00:00
Michael Kamensky
ee895f23cf Merge branch 'omnispell-adept-ai' into 'master' 
Improve Omnispell Adept AI

Closes #751

See merge request core-developers/forge!1043
 2018-10-26 20:00:01 +00:00
Michael Kamensky
cfd4aafc35 Improve Omnispell Adept AI 2018-10-26 20:00:00 +00:00
Agetian
3e91c95dcf - When making token copies of permanents, set the copied permanent so that its CMC can be calculated. 2018-10-26 22:58:16 +03:00
Hans Mackowiak
04f69bb554 Merge branch 'ai-hints-npe-fix' into 'master' 
Prevent NPEs caused by the AI when testing for the new style AI hints

See merge request core-developers/forge!1044
 2018-10-26 14:34:22 +00:00
Agetian
f4db360265 - Prevent NPEs caused by the AI when testing for the new style AI hints from within AI methods on Card objects, which is dangerous because Card.getRules() is not guaranteed to be non-null, and may indeed be null for objects such as tokens (especially noticeable in Momir Basic and MoJhoSto). 
- Currently relegated 99% of AI calls to those getAIHints tests to a wrapper method which checks for a non-null getRules.
- The card predicate has to test for non-null directly to avoid adding an unnecessary dependency on the AI module (the alternative would be to add the wrapper methods to the Card object, but that'll clutter it even more and the AI hints belong to the AI side of things, not the card itself).
 2018-10-26 17:16:12 +03:00
Michael Kamensky
a001cb78c0 Merge branch 'revertDefaultSort' into 'master' 
Revert Default sort in Deckbuilder to code before Merge Request !1035

See merge request core-developers/forge!1042
 2018-10-25 04:44:38 +00:00
tjtillmancoag
af7c5f7506 Revert Default sort in Deckbuilder to code before !1035 Merge Request 2018-10-24 19:24:28 -07:00
swordshine
e7cf359659 Merge branch 'patch-4' into 'master' 
Update direct_current.txt

Closes #749

See merge request core-developers/forge!1041
 2018-10-24 08:37:47 +00:00
Hans Mackowiak
ec5a7903b0 Update direct_current.txt 2018-10-24 08:36:35 +00:00
Jamin W. Collins
662f6f79ea allow decks to be stored elsewhere 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-10-23 17:41:00 -06:00
Michael Kamensky
f7b88a6f8f Merge branch 'puzzle-engine' into 'master' 
Adding puzzle PS_GRN3 (Possibility Storm - Guilds of Ravnica 03)

See merge request core-developers/forge!1039
 2018-10-23 05:12:29 +00:00
Agetian
4d8b6eb785 Merge remote-tracking branch 'origin/puzzle-engine' into puzzle-engine 2018-10-23 08:11:30 +03:00
Agetian
6055f9ddc4 - Added puzzle PS_GRN3. 2018-10-23 08:11:13 +03:00
Agetian
7b10e3a9fc Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-23 08:04:21 +03:00
Michael Kamensky
2cce3ab252 Merge branch 'sorting' into 'master' 
Update item manager groupings

See merge request core-developers/forge!1035
 2018-10-23 05:03:50 +00:00
Michael Kamensky
67bcb9e75a Merge branch 'patch-14' into 'master' 
Update trench_gorger.txt

See merge request core-developers/forge!1038
 2018-10-23 04:57:36 +00:00
Michael Kamensky
7b3b3068e6 Merge branch 'patch-13' into 'master' 
Fix non-bug typo

See merge request core-developers/forge!1037
 2018-10-23 04:57:21 +00:00
Meerkov
2b4435de2e Update trench_gorger.txt 2018-10-23 01:19:18 +00:00
Meerkov
2d7d15193e Update ranging_raptors.txt 2018-10-23 01:18:10 +00:00
swordshine
0712f7a074 Merge branch 'skalla_wolf_patch' into 'master' 
Add missing trigger to Skalla Wolf

See merge request core-developers/forge!1036
 2018-10-22 04:28:03 +00:00
Rob Schnautz
7e62fd42fb Add missing trigger to Skalla Wolf 2018-10-22 00:53:47 +00:00
Rob Schnautz
b1d62d32ca Tribal instant gets its own section 2018-10-21 22:54:29 +00:00
Rob Schnautz
df52202f65 Update Type, Default, and add a PW Deck style sort 2018-10-21 18:21:23 +00:00
Agetian
aff1ce8dae Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-21 07:24:58 +03:00
Michael Kamensky
c50edc2139 Merge branch 'fix-npes' into 'master' 
Fix NPEs reported by Sentry

See merge request core-developers/forge!1034
 2018-10-21 03:54:26 +00:00
Chris H
ff4622954f Fix NPEs reported by Sentry 2018-10-20 22:07:57 -04:00
Michael Kamensky
7e8899acb6 Merge branch 'historicformats' into 'master' 
historic DCI sanctioned formats M19-GRN.

See merge request core-developers/forge!1032
 2018-10-20 04:19:19 +00:00
Michael Kamensky
b22461ebc6 Merge branch 'clear-new-cards-on-quest-create' into 'master' 
Clear the new column after a quest starts.

See merge request core-developers/forge!1033
 2018-10-20 04:18:43 +00:00
Chris H
e403c9d764 Clear the new column after a quest starts. 2018-10-19 21:48:16 -04:00
Rob Schnautz
4c2c1ec86a historic DCI sanctioned formats M19-GRN. 2018-10-19 22:25:51 +00:00
Agetian
02329cf25e Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-19 22:39:11 +03:00
Michael Kamensky
ae4978abe6 Merge branch 'ai-parsing-variables' into 'master' 
Ai parsing variables

See merge request core-developers/forge!1027
 2018-10-19 19:38:34 +00:00
Sol
79f580d55a Update PowerExchangeAi.java 2018-10-19 13:37:29 +00:00
Sol
67889b4979 Merge branch 'ai-svar-update' into 'ai-parsing-variables' 
Update direct references to RemAIDeck/RemRandomDeck to use the new format

See merge request friarsol/forge!1
 2018-10-19 12:13:31 +00:00
Michael Kamensky
4b52ff05d5 Update direct references to RemAIDeck/RemRandomDeck to use the new format 2018-10-19 12:13:31 +00:00
Agetian
dc1cb92eb6 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-19 07:19:07 +03:00
Michael Kamensky
02beb9fd3d Merge branch 'bug-fixes' into 'master' 
bug fixes

See merge request core-developers/forge!1030
 2018-10-19 04:12:50 +00:00
Jamin W. Collins
2e81a939b9 fix deck import exception message 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-10-18 18:11:45 -06:00
Jamin W. Collins
fda3e81d9a ignore deck lines that start with // 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-10-18 17:56:21 -06:00
Agetian
c2290d5002 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-10-18 07:59:12 +03:00
swordshine
50c827495a Merge branch 'patch' into 'master' 
- Fixed Blood Operative

See merge request core-developers/forge!1029
 2018-10-18 04:16:20 +00:00
swordshine
8e018f9c51 - Fixed Blood Operative 2018-10-18 12:15:44 +08:00
swordshine
2828e5717c Merge branch 'patch' into 'master' 
Fixed Sentinel Tower

See merge request core-developers/forge!1028
 2018-10-18 02:58:01 +00:00
swordshine
42c3fd09db Fixed Sentinel Tower 2018-10-18 10:57:00 +08:00
Sol
0f118da920 Merge branch 'master' into 'ai-parsing-variables' 
# Conflicts:
#   forge-gui/res/cardsfolder/d/detection_tower.txt
#   forge-gui/res/cardsfolder/m/myr_superion.txt
 2018-10-18 02:42:53 +00:00