external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,586 Commits 33 Branches 187 Tags
308c07c2b352aa9e0af38678e6eb8a00b0d28a8c
Commit Graph

35586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
d8b7214a2b Merge branch 'RIX' into 'master' 
- Updated Commune with Dinosaurs

See merge request core-developers/forge!83
 2018-01-12 08:25:55 +00:00
swordshine
95122ffcf8 - Updated Commune with Dinosaurs 2018-01-12 16:24:04 +08:00
Agetian
3b1b0bc92f - Update Commune with Dinosaurs to work with any Dinosaur card instead of just Creature.Dinosaur. 2018-01-12 11:20:58 +03:00
Agetian
49f789c404 - Removed a couple empty lines. 2018-01-12 10:43:04 +03:00
Agetian
9cf447d422 - Added RIX planeswalker decks as quest mode precons. 2018-01-12 10:36:47 +03:00
Agetian
1dc10b57c6 - Surge of Memories -> Flood of Recollection 2018-01-12 09:58:33 +03:00
Michael Kamensky
3d11422191 Merge branch 'revert-72e78226' into 'master' 
Revert "Merge branch 'patch-4' into 'master'"

See merge request core-developers/forge!81
 2018-01-12 06:48:03 +00:00
Michael Kamensky
fa0fc14c25 Revert "Merge branch 'patch-4' into 'master'" 
This reverts merge request !77
 2018-01-12 06:46:57 +00:00
Agetian
22cdb7e721 Merge branch 'master' of git.cardforge.org:core-developers/forge into assorted-fixes 2018-01-12 09:32:07 +03:00
Agetian
d215657641 - Renamed Shrine Altisaur to Temple Altisaur in the definition file 2018-01-12 09:30:21 +03:00
Rob Schnautz
df33b9388f Update ColumnDef.java 2018-01-12 05:41:09 +00:00
Rob Schnautz
ac53f16098 Sort Conspiracies before Eldrazi 2018-01-12 05:39:12 +00:00
Sol
36d6342e77 Merge branch 'fix-reckless-rage-desc' into 'master' 
Fix reckless rage description

See merge request core-developers/forge!78
 2018-01-12 04:04:48 +00:00
Sol
72e7822616 Merge branch 'patch-4' into 'master' 
Fix slowness when removing a card from a deck by only getting the key once instead of twice.

See merge request core-developers/forge!77
 2018-01-12 04:04:29 +00:00
Chris H
ea8f990172 Fix reckless rage description 2018-01-11 23:02:19 -05:00
Rob Schnautz
8003ade509 Fix slowness when removing a card from a deck by only getting the key once instead of twice. 2018-01-12 03:51:36 +00:00
Sol
3795232b2c Merge branch 'assorted-fixes' into 'master' 
- Fix capitalization in the name of The City's Blessing token.

See merge request core-developers/forge!74
 2018-01-12 02:20:45 +00:00
Sol
dda26098f4 Merge branch 'upcoming_rix2' into 'master' 
Fixed Zacama's IsCast Property

See merge request core-developers/forge!76
 2018-01-12 02:19:29 +00:00
maustin
ae042d98f4 Merge remote-tracking branch 'origin/upcoming_rix2' into upcoming_rix2 2018-01-11 21:53:07 +00:00
austinio7116
649faa3371 Fixed Zacama's IsCast property 2018-01-11 21:52:35 +00:00
Michael Kamensky
cea0c3f628 Merge branch 'upcoming_rix2' into 'master' 
Added Release to the Wind (RIX)

See merge request core-developers/forge!75
 2018-01-11 20:25:06 +00:00
Michael Kamensky
dce2ebbafb Update release_to_the_wind.txt (spell description fix). 2018-01-11 20:24:07 +00:00
austinio7116
c80d703acf Added Release to the Wind (RIX) 2018-01-11 19:54:27 +00:00
Agetian
f0418b8d2a - Name the Blessing token as it is named on the physical card. 2018-01-11 18:42:27 +03:00
Agetian
f363ae0f1e - Fix capitalization in the name of The City's Blessing token. 2018-01-11 18:31:49 +03:00
Michael Kamensky
24d3801316 Merge branch 'upcoming_rix2' into 'master' 
Added Tilonallis Summoning with Swordshine's fixes

See merge request core-developers/forge!73
 2018-01-11 15:29:45 +00:00
Sol
2a3f2c6dbd Merge branch 'fix-cantequip-crash' into 'master' 
- Fix a crash when trying to equip a creature with an equipment that has CantEquip (e.g. O-Naginata)

See merge request core-developers/forge!70
 2018-01-11 14:54:21 +00:00
Michael Kamensky
318a6e2924 Merge branch 'RIX' into 'master' 
- Fixed a few cards

See merge request core-developers/forge!72
 2018-01-11 14:15:07 +00:00
austinio7116
800311fed8 Added Tilonallis Summoning with Swordshine's fixes 2018-01-11 14:05:17 +00:00
swordshine
e49d45bf4f - Update more scripts 2018-01-11 21:59:33 +08:00
swordshine
356bd9c635 - Fixed P/T of two cards 2018-01-11 21:07:53 +08:00
Michael Kamensky
b400ea6d33 Merge branch 'upcoming_rix2' into 'master' 
Corrected creature type of Forefunner of the Heralds

See merge request core-developers/forge!71
 2018-01-11 11:28:34 +00:00
austinio7116
7352f9094a Corrected creature type of Forefunner of the Heralds 2018-01-11 10:06:36 +00:00
Agetian
c90e8bd356 - CantEquip: modify the card scripts such that they use a colon delimiter. 2018-01-11 09:41:38 +03:00
Agetian
9f79073d14 - Fix a crash when trying to equip a creature with an equipment that has CantEquip (e.g. O-Naginata). 2018-01-11 09:11:46 +03:00
Sol
249f8a4673 Merge branch 'RIX' into 'master' 
- Added The Immortal Sun

See merge request core-developers/forge!69
 2018-01-11 04:04:08 +00:00
swordshine
fe8ec70159 - Added The Immortal Sun 2018-01-11 11:09:08 +08:00
Sol
1f5375fed2 Merge branch 'rix_edition_file' into 'master' 
Fix RIX edition missing rarity

See merge request core-developers/forge!68
 2018-01-11 02:09:12 +00:00
Chris H
804d47df7b Fix RIX edition missing rarity 2018-01-10 21:07:52 -05:00
Sol
c6dfc1ceb2 Merge branch 'upcoming_rix2' into 'master' 
Added Azor, the Lawbringer (RIX)

See merge request core-developers/forge!67
 2018-01-11 00:30:50 +00:00
austinio7116
b3727f6821 Update azor_the_lawbringer.txt 2018-01-10 23:06:45 +00:00
austinio7116
bc538da8ea Added Azor, the Lawbringer (RIX) 2018-01-10 22:53:30 +00:00
Agetian
465e25adff - Updating CHANGES.txt (some clarifications). 2018-01-10 19:50:09 +03:00
Agetian
809fc513ea Merge remote-tracking branch 'upstream/master' 2018-01-10 19:38:45 +03:00
Agetian
ea101baf0d - Updating CHANGES.txt. 2018-01-10 19:37:28 +03:00
Michael Kamensky
19f88d6e6d Merge branch 'RIX' into 'master' 
Fixed a few cards and added Peace Talks

See merge request core-developers/forge!64
 2018-01-10 15:17:59 +00:00
Michael Kamensky
7499d05bbc Merge branch 'master' into 'master' 
Merge Marek's latest RIX efforts (Ascend)

See merge request core-developers/forge!65
 2018-01-10 15:08:32 +00:00
Agetian
de2e3fc070 Merge branch 'Marek14/forge-master' 2018-01-10 18:03:36 +03:00
Agetian
9b85293349 - Fix a couple cards. 2018-01-10 17:48:33 +03:00
swordshine
bee34c064b - Removed a param in the previous commit 2018-01-10 22:09:26 +08:00