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

37696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
d1fbe5c26d Merge remote-tracking branch 'upstream/FriendOrFoe' into FriendOrFoe 
# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/regnas_sanction.txt
 2018-06-04 07:37:06 +03:00
Agetian
b43a313793 - Renamed two cards to match the current standard. 
- Implemented basic AI playability of AssignGroup (Friend/Foe) cards based on NeedsToPlayVar.
- Will need separate AI logic for different cases to improve further (can be tested in canPlayAI).
 2018-06-04 07:35:47 +03:00
Hanmac
d5b96c0051 cards: updated regna sanction 2018-06-03 22:02:54 +02:00
Hanmac
eaa5078521 CountersPut: use Placer 2018-06-03 22:01:56 +02:00
Hanmac
1ac0eb83cf cards: fixed zndrsplt judgment, add regna sanction 2018-06-03 20:45:34 +02:00
Hanmac
f1907012f7 fixed manacost 2018-06-03 19:01:28 +02:00
Hanmac
dc7f692f38 Game: Counters Put effects need to have Putter as Source 2018-06-03 18:21:02 +02:00
Hanmac
8dd5faf9c9 cards: add Zndrsplt's Judgement 2018-06-03 13:44:50 +02:00
Hanmac
80963222d1 CopyPermanent: add Param for Chooser 2018-06-03 13:42:38 +02:00
Agetian
2a3456d0e2 - Corrected the base logic for AssignGroupAi. 
- Added AILogic to Pir's Whim.
 2018-06-03 07:58:34 +03:00
Hanmac
ae5bb38c92 cards: add Pir Whim as example 2018-06-02 20:37:00 +02:00
Hanmac
ccb5e6d6a5 AssignGroup API: use for Friend or Foe 2018-06-02 20:36:37 +02:00
Hanmac
e97b814089 chooseSingleSpellAbility has map params now 2018-06-02 20:34:04 +02:00
Hanmac
6cb14c2568 Card: add removeRemembered for Iterable 2018-06-02 20:24:03 +02:00
Michael Kamensky
38e47bbc5c Merge branch 'master' into 'master' 
Minor tweak for Will and Rowan Kenrith

See merge request core-developers/forge!615
 2018-06-02 03:57:00 +00:00
Agetian
f7a0f528d2 - Minor tweak for Rowan Kenrith / Will Kenrith. 2018-06-02 06:55:37 +03:00
Michael Kamensky
6482c8e05a Merge branch 'patch' into 'master' 
BBD: Added Bonus Round and Generous Patron

See merge request core-developers/forge!614
 2018-06-02 03:54:28 +00:00
Michael Kamensky
881905cf21 Merge branch 'oracle-updates-functional' into 'master' 
Oracle updates functional

See merge request core-developers/forge!613
 2018-06-02 03:53:57 +00:00
OgreBattlecruiser
e531f7300e BBD: Added Bonus Round and Generous Patron 2018-06-02 03:46:22 +01:00
schnautzr
83dfd3c739 "player or planeswalker" 2018-06-01 19:26:15 -05:00
schnautzr
3c17326928 "player or planeswalker" 2018-06-01 19:00:39 -05:00
schnautzr
ac5e585387 "player or planeswalker" 2018-06-01 18:57:10 -05:00
schnautzr
499f90b7a2 "player or planeswalker" 2018-06-01 18:52:04 -05:00
schnautzr
b0b16feb1f "player or planeswalker" 2018-06-01 18:35:06 -05:00
schnautzr
7d13720dad "player or planeswalker" 2018-06-01 18:27:17 -05:00
schnautzr
82dcccb5b3 "player or planeswalker 2018-06-01 18:18:28 -05:00
schnautzr
a3efd3dfe6 "player or planeswalker" 2018-06-01 18:08:02 -05:00
schnautzr
c870edd9f2 "player or planeswalker" 2018-06-01 16:41:53 -05:00
schnautzr
5de048a81a "player or planeswalker" 2018-06-01 16:34:00 -05:00
Michael Kamensky
00dcf5c2c6 Merge branch 'patch' into 'master' 
Added some BBD cards

See merge request core-developers/forge!610
 2018-06-01 04:18:16 +00:00
Michael Kamensky
e89c39d2e1 Merge branch 'oracle-updates-functional' into 'master' 
Oracle updates functional

See merge request core-developers/forge!611
 2018-06-01 04:17:33 +00:00
Michael Kamensky
ccd3e87403 Merge branch 'javadoc' into 'master' 
Add javadoc compatible comments

See merge request core-developers/forge!612
 2018-06-01 04:15:26 +00:00
Rob Schnautz
6e2f668e72 Add javadoc compatible comments 2018-06-01 04:02:25 +00:00
Hans Mackowiak
4896e47b41 Merge branch 'partnerWithCommander' into 'master' 
Partner with commander

See merge request core-developers/forge!600
 2018-05-31 18:44:10 +00:00
Hanmac
0b72fee8a3 Player: use sameTeam logic 2018-05-31 20:42:16 +02:00
Agetian
56e5bfa234 - Krav: for now, marked the activated ability as AI-unplayable and added a TODO. 2018-05-31 21:36:06 +03:00
schnautzr
d9deb6149c "player or planeswalker" 2018-05-31 13:35:46 -05:00
OgreBattlecruiser
b985642e5e Added Arcane Artisan 2018-05-31 18:28:13 +01:00
schnautzr
d49e20cfa4 "player or planeswalker" 2018-05-31 11:14:06 -05:00
OgreBattlecruiser
af34fda5aa Added Rowan and Bramble Sovereign 2018-05-31 16:53:00 +01:00
schnautzr
7f7d2bf1dd "player or planeswalker" 2018-05-31 10:45:23 -05:00
Hans Mackowiak
8dbbfd5c07 Merge branch 'no_card.jpg' into 'master' 
Update to M15 style

See merge request core-developers/forge!609
 2018-05-31 05:45:25 +00:00
Rob Schnautz
02ae4d8460 Update to M15 style 2018-05-31 05:22:22 +00:00
schnautzr
e34adad368 "player or planeswalker" 2018-05-30 11:58:23 -05:00
schnautzr
55ec69ec79 typo 2018-05-30 11:05:25 -05:00
schnautzr
a9cf83aec2 "player or planeswalker" 2018-05-30 10:59:34 -05:00
Hans Mackowiak
35fc6ee211 Merge branch 'fixtests' into 'master' 
Fixed broken tests due to oracle changes

See merge request core-developers/forge!608
 2018-05-30 07:54:24 +00:00
austinio7116
e61c2f1554 Fixed broken tests due to oracle changes 2018-05-30 08:44:01 +01:00
Hanmac
b77d191754 Pir: fixed mana cost 2018-05-30 07:18:07 +02:00
Hanmac
b04f644242 cards: Regna & Krav, fixed YourTeamGainedLife 2018-05-30 07:17:04 +02:00