external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,300 Commits 34 Branches 187 Tags
2f88b45d67a23ceee644b6b6b61b9743e35e94e2
Commit Graph

39300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
6522070c3f Merge branch 'master' into 'master' 
Updating CHANGES.txt.

See merge request core-developers/forge!1087
 2018-11-10 16:28:32 +00:00
Agetian
858ade9341 - Updating CHANGES.txt. 2018-11-10 19:28:02 +03:00
Michael Kamensky
9858baf52e Merge branch 'master' into 'master' 
Commander quest mode

See merge request core-developers/forge!1053
 2018-11-10 16:18:16 +00:00
Michael Kamensky
7f58e5cea6 Merge branch 'quest-decks' into 'master' 
Quest precon decks submitted by nayozzz

See merge request core-developers/forge!1086
 2018-11-10 15:31:46 +00:00
Agetian
9835e4c277 - Fixed set ID in Dimir Intrigues. 2018-11-10 18:30:47 +03:00
Agetian
0389f8bcb5 - Added 5 quest precon decks submitted by nayozzz. 2018-11-10 18:29:46 +03:00
Michael Kamensky
aaf47468eb Merge branch 'mobile-release' into 'master' 
Preparing Forge for Android publish 1.6.18.001 [incremental].

See merge request core-developers/forge!1085
 2018-11-10 06:16:36 +00:00
Agetian
3f31bc9df0 - Preparing Forge for Android publish 1.6.18.001 [incremental]. 2018-11-10 09:16:03 +03:00
Blacksmith
3d706d83d5 Clear out release files in preparation for next release 2018-11-10 06:11:02 +00:00
Blacksmith
66c7f0745d [maven-release-plugin] prepare for next development iteration 2018-11-10 06:06:16 +00:00
Blacksmith
ed1febafe6 [maven-release-plugin] prepare release forge-1.6.18 forge-1.6.18 2018-11-10 06:06:11 +00:00
Blacksmith
4bb6ffec50 Update README.txt for release 2018-11-10 06:03:58 +00:00
Michael Kamensky
2c0189fddd Merge branch 'master' into 'master' 
Finish promoting the life in danger AI profile options from experimental to general use.

See merge request core-developers/forge!1084
 2018-11-10 04:31:29 +00:00
Agetian
02cca3b8c8 - Finish promoting the life in danger AI profile options from experimental to general use. 2018-11-10 07:30:30 +03:00
Michael Kamensky
ddd7651ba0 Merge branch 'master' into 'master' 
Updating CHANGES.txt.

See merge request core-developers/forge!1083
 2018-11-10 04:23:44 +00:00
Agetian
72e010ef66 - Updating CHANGES.txt. 2018-11-10 07:23:21 +03:00
Michael Kamensky
df145a8b1a Merge branch 'copyFixState' into 'master' 
CopyPermanent: the final card need to have the State updated

See merge request core-developers/forge!1082
 2018-11-10 03:56:14 +00:00
Hanmac
396bb2c5b4 CopyPermanent: the final card need to have the State updated 2018-11-09 23:25:52 +01:00
Michael Kamensky
dfdbd923d5 Merge branch 'master' into 'master' 
Updating CHANGES.txt.

See merge request core-developers/forge!1081
 2018-11-09 19:25:10 +00:00
Agetian
ee0e2d1941 - Updating CHANGES.txt. 2018-11-09 22:24:43 +03:00
Michael Kamensky
a0c1f0ee30 Merge branch 'master' into 'master' 
Fixed a logic error in the recent Momir strategy commit.

See merge request core-developers/forge!1080
 2018-11-09 19:20:06 +00:00
Agetian
530f5c2e35 - Fixed a logic error in the recent Momir strategy commit. 2018-11-09 22:19:02 +03:00
Hans Mackowiak
8be1e67eb3 Merge branch 'patch-1' into 'master' 
CardFactoryUtil: fixed Nexus

See merge request core-developers/forge!1079
 2018-11-09 14:05:44 +00:00
Hans Mackowiak
36d6465e49 CardFactoryUtil: fixed Nexus 2018-11-09 14:05:33 +00:00
Michael Kamensky
a12c315d59 Merge branch 'patch-3' into 'master' 
CardFactoryUtil: update the Nexus of Fate RE

See merge request core-developers/forge!1078
 2018-11-09 13:46:39 +00:00
Hans Mackowiak
1c39671c27 CardFactoryUtil: update the Nexus of Fate RE 2018-11-09 13:40:01 +00:00