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

39585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
81d3425b03 - Activate Millstone at the end of opponent's turn. 2018-11-17 18:42:20 +03:00
Michael Kamensky
c8cf407bd5 Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_GRN6, added a way to put a card on top of the library in dev mode.

See merge request core-developers/forge!1109
 2018-11-17 07:09:04 +00:00
Agetian
8b566c0bbb - Dev mode: added a way to add a card to top of the library instead of the bottom. 
- Fixed a bug that caused the zone index not to be accounted for during changeZone (not sure how many things were affected by this, but it prevented putting a card on top of the library via moveToLibrary).
 2018-11-17 10:08:11 +03:00
Agetian
d277ba0420 - Added puzzle PS_GRN6. 2018-11-17 09:40:54 +03:00
Michael Kamensky
6a543f8b49 Merge branch 'master' into 'master' 
Simple logic for Enhanced Surveillance. Fix description.

Closes #769

See merge request core-developers/forge!1108
 2018-11-17 06:24:32 +00:00
Agetian
7adb8201c6 - Simple logic for Enhanced Surveillance. Fix description. 2018-11-17 09:23:40 +03:00
Michael Kamensky
0390a5c886 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.18.002 [hotfix].

See merge request core-developers/forge!1107
 2018-11-16 11:40:40 +00:00
Agetian
7114563027 - Preparing Forge for Android publish 1.6.18.002 [hotfix]. 2018-11-16 14:34:44 +03:00
Michael Kamensky
750b6cca38 Merge branch 'revert-3c8f3ab1' into 'master' 
Revert "Merge branch 'add-mobile-art-download' into 'master'"

See merge request core-developers/forge!1106
 2018-11-16 11:30:57 +00:00
Michael Kamensky
83f8acd0c7 Revert "Merge branch 'add-mobile-art-download' into 'master'" 
This reverts merge request !1049
 2018-11-16 11:30:03 +00:00
Michael Kamensky
3a5b843063 Merge branch 'ai-tilonalli' into 'master' 
Fixed the AI playing Tilonalli's Crown on 1-toughness creatures.

See merge request core-developers/forge!1105
 2018-11-15 20:13:32 +00:00
Agetian
c539f5d1a3 - Improved damage trigger detection in AttachAi. 2018-11-15 20:21:44 +03:00
Agetian
ea35e04ba8 - Back to the more complex yet comprehensive way of figuring out damage on attach, but keep AITgts in AttachAi, might come in handy later. 2018-11-15 18:48:30 +03:00
Agetian
68d62b9eb8 - Account for effective toughness after damage for Tilonalli's Crown. 2018-11-15 17:59:00 +03:00
Agetian
c98ad6a097 - A simpler implementation for Tilonalli, using AITgts. 2018-11-15 17:16:01 +03:00
Agetian
b3f66d2b64 - Fixed the AI playing Tilonalli's Crown on 1-toughness creatures. 2018-11-15 16:22:19 +03:00
Michael Kamensky
31690c6b59 Merge branch 'master' into 'master' 
Fixed implementation for Mishra double damage AI count.

See merge request core-developers/forge!1104
 2018-11-14 20:17:39 +00:00
Agetian
e1b18857fe - A better implementation for Mishra double damage AI count. 2018-11-14 23:16:52 +03:00
Michael Kamensky
3925b57180 Merge branch 'master' into 'master' 
Account for double damage coming from Mishra Vanguard avatar.

See merge request core-developers/forge!1103
 2018-11-14 20:15:05 +00:00
Agetian
f3912e4eb0 - Account for double damage coming from Mishra Vanguard avatar. 2018-11-14 23:14:28 +03:00
Michael Kamensky
c71ceca3a9 Merge branch 'master' into 'master' 
Some more Evra logic.

See merge request core-developers/forge!1102
 2018-11-14 14:41:21 +00:00
Agetian
cea32aa83b - Some more Evra logic. 2018-11-14 14:54:21 +03:00
Michael Kamensky
7c0229974b Merge branch 'master' into 'master' 
Some additional Evra logic.

See merge request core-developers/forge!1101
 2018-11-14 06:06:12 +00:00
Agetian
b6fb570944 - Some additional Evra logic. 2018-11-14 08:49:21 +03:00
Michael Kamensky
9bdd58ae30 Merge branch 'ai-evra' into 'master' 
Some extra AI for Evra, Halcyon Witness.

See merge request core-developers/forge!1100
 2018-11-14 05:37:37 +00:00
Agetian
483fdbee4d - Some extra AI for Evra, Halcyon Witness. 2018-11-14 08:27:54 +03:00
Hans Mackowiak
32aad7536c Merge branch 'ai-syncopate' into 'master' 
Fix the AI overpaying for Syncopate and similar counterspells.

See merge request core-developers/forge!1097
 2018-11-13 05:41:43 +00:00
Michael Kamensky
cf5cf1fc7a Merge branch 'quest-decks' into 'master' 
Added 2 quest opponent decks (UB Surveil).

See merge request core-developers/forge!1099
 2018-11-12 19:24:52 +00:00
Agetian
5a83df9025 - Added quest opponents Remington Smisse 2 and Remington Smisse 3 (UB Surveil). 2018-11-12 22:22:57 +03:00
Michael Kamensky
3b99d418b0 Merge branch 'master' into 'master' 
Updating CHANGES.txt.

See merge request core-developers/forge!1098
 2018-11-12 18:01:59 +00:00
Agetian
8fbf34fe3d - Updating CHANGES.txt. 2018-11-12 21:01:33 +03:00
Agetian
509b5532b4 - Fix the AI overpaying for Syncopate and similar counterspells. 2018-11-12 15:56:05 +03:00
Michael Kamensky
4dd0b618c5 Merge branch 'planar-conquest' into 'master' 
Planar Conquest content update: enable GRN for Ravnica, add a few GRN events.

See merge request core-developers/forge!1094
 2018-11-12 12:14:08 +00:00
Michael Kamensky
c2e958360d Merge branch 'patch' into 'master' 
- Fix two cards' descriptions

See merge request core-developers/forge!1096
 2018-11-11 16:12:08 +00:00
swordshine
18bb200387 - Fix two cards' descriptions 2018-11-11 23:12:49 +08:00
Michael Kamensky
45a21e00a3 Merge branch 'master' into 'master' 
A little more work on combat tricks.

See merge request core-developers/forge!1095
 2018-11-11 15:01:36 +00:00
Agetian
7b18df3730 - A little more work on combat tricks. 2018-11-11 18:00:29 +03:00
Agetian
617f31cd32 - Enabled GRN for the Ravnica plane in Planar Conquest. 
- Added and updated several events to utilize GRN cards.
- Fixed a couple Ravnica event avatars.
 2018-11-11 17:54:27 +03:00
Michael Kamensky
2a24114bc2 Merge branch 'master' into 'master' 
A little bit more work on AI combat tricks.

See merge request core-developers/forge!1093
 2018-11-11 14:48:18 +00:00
Agetian
03571f3466 - A little bit more work on combat tricks. 2018-11-11 17:47:47 +03:00
Michael Kamensky
3306ac9327 Merge branch 'master' into 'master' 
Fixed logic in reserving mana for combat tricks.

See merge request core-developers/forge!1092
 2018-11-11 14:40:15 +00:00
Agetian
fcc3a28b86 - Fixed logic in reserving mana for combat tricks. 2018-11-11 17:38:32 +03:00
Michael Kamensky
8a05a5a9fe Merge branch 'master' into 'master' 
Fixed a logic error in Surveil AI.

See merge request core-developers/forge!1091
 2018-11-11 11:19:17 +00:00
Agetian
829a82b98f - Fixed a logic error in Surveil AI. 
- Added a couple card hints.
 2018-11-11 14:18:34 +03:00
Michael Kamensky
8c0caecd3e Merge branch 'patch-1' into 'master' 
Update godsend.txt from Eehoe

See merge request core-developers/forge!1089
 2018-11-11 04:02:51 +00:00
Michael Kamensky
fe290f795e Merge branch 'patch-2' into 'master' 
Removed counter restriction for generous_patron.txt

See merge request core-developers/forge!1090
 2018-11-11 03:55:34 +00:00
Sol
c7ad075bb3 Removed counter restriction for generous_patron.txt 2018-11-11 01:31:59 +00:00
Sol
a2dd5c7180 Update godsend.txt from Eehoe 2018-11-11 01:29:31 +00:00
Hans Mackowiak
ae5c60d816 Merge branch 'ai-setstate' into 'master' 
Attempt to fix the AI transforming Azcanta if a copy of the transformed land already exists.

See merge request core-developers/forge!1088
 2018-11-10 19:08:55 +00:00
Agetian
1a73c6bea5 - Attempt to fix the AI transforming Azcanta if a copy of the transformed legendary land already exists on the battlefield. 2018-11-10 20:41:52 +03:00