external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,524 Commits 31 Branches 187 Tags
617ff419b9af2e4aea3609eae61d8524f94f5fca
Commit Graph

37524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
fcc8a8f9ce Merge branch 'mergebranch' into 'master' 
Fixed missing Extended format required for quests if Historic mode switched off in settings

See merge request core-developers/forge!571
 2018-05-20 17:09:53 +00:00
austinio7116
67e5ae9ee0 Attempt to fix BoosterUtils Extended format issue in quests 2018-05-20 17:59:52 +01:00
austinio7116
2b49f70ae3 Attempt to fix BoosterUtils Extended format issue in quests 2018-05-20 17:55:45 +01:00
Michael Kamensky
7813483a08 Merge branch 'dom-puzzles' into 'master' 
Added puzzle PS_DOM3.

See merge request core-developers/forge!569
 2018-05-20 10:12:39 +00:00
Agetian
045b303deb - Added puzzle PS_DOM3. 2018-05-20 13:12:10 +03:00
Hanmac
57af402bcf cards: PutCounter use Triggered LKICopy 2018-05-20 11:37:28 +02:00
Hanmac
e4b7c105b1 cards: update Monstrosity using TriggeredCount 2018-05-20 11:33:43 +02:00
Hanmac
3b5d273409 CounterEffects: use gameState and timestamp checks 2018-05-20 11:33:18 +02:00
austinio7116
07c29999c6 Merge branch 'historicmerge' into 'master' 
Completed historic formats from Schnautzr, the Wurmcaller

See merge request core-developers/forge!567
 2018-05-20 06:51:21 +00:00
austinio7116
9dc7632e68 Completed historic formats from Schnautzr, the Wurmcaller 2018-05-20 07:47:38 +01:00
Michael Kamensky
442ffdcb37 Merge branch 'brawlcolourless' into 'master' 
Brawl deck generators make use of new colourless rules for basic lands

See merge request core-developers/forge!565
 2018-05-20 04:19:46 +00:00
Michael Kamensky
f02ba82471 Merge branch 'basicLandAbility' into 'master' 
Card: move Abilities to Card and only create them once

See merge request core-developers/forge!560
 2018-05-20 03:40:05 +00:00
austinio7116
553cec6d60 Brawl deck generators make use of new colourless rules for basic lands 2018-05-19 22:25:01 +01:00
Hanmac
8e7f055b59 try Spell.performanceMode only for other player, enable Bestow and Morph 2018-05-19 10:26:45 +02:00
Hanmac
ece779c88e unSuppress basicLandAbilities 2018-05-19 10:21:01 +02:00
Hanmac
c1da970c47 Card: move Abilities to Card and only create them once 2018-05-19 10:21:01 +02:00
Michael Kamensky
3505047c9b Merge branch 'brawlruleschanges' into 'master' 
New Brawl rules updates

See merge request core-developers/forge!564
 2018-05-19 05:25:26 +00:00
austinio7116
1458184500 New Brawl rules updates 2018-05-18 23:29:15 +01:00
austinio7116
52fe47c3ee Merge branch 'master' into 'master' 
Prevent views flickering during gameplay from state-based effects.

See merge request core-developers/forge!563
 2018-05-18 18:58:24 +00:00
Alexei Svitkine
1a81f24c45 remove unrelated changes 2018-05-18 10:58:52 -04:00
Alexei Svitkine
63210a42b0 fix merge 2018-05-18 10:58:02 -04:00
Alexei Svitkine
09900a3457 Merge remote-tracking branch 'upstream/master' 2018-05-18 10:53:23 -04:00
Alexei Svitkine
7071be93f7 fix unit tests with anti flicker fixes, by having CurrentState be 
settable when frozen if it's null
 2018-05-18 10:40:30 -04:00
Alexei Svitkine
96a7d7d0d2 Prevent views flickering during gameplay when state-based affects 
change card state (e.g. Painter's Servant, Ambush Commander, etc)
 2018-05-18 10:02:16 -04:00
Alexei Svitkine
2974e33751 fix error when trying to set up game state and the file 
doesn't exist
 2018-05-18 09:57:12 -04:00
Michael Kamensky
74e4f2aa4a Merge branch 'ldaupdates' into 'master' 
Update to LDA model pruning - updated LDA data

See merge request core-developers/forge!561
 2018-05-17 08:57:08 +00:00
Michael Kamensky
eadb5aebb7 Merge branch 'assorted-fixes' into 'master' 
Fixed Volrath's Shapeshifter Oracle text.

See merge request core-developers/forge!562
 2018-05-17 06:30:05 +00:00
Agetian
ae1de32654 - Fixed Volrath's Shapeshifter Oracle text. 2018-05-17 09:28:11 +03:00
austinio7116
b3d70f1f0d Update to LDA model pruning - updated LDA data 2018-05-17 06:41:37 +01:00
Sol
7005a2fbe4 Merge branch 'removeprototypes' into 'master' 
Temporarily removed prototype files from formats to avoid invalid duplicates

See merge request core-developers/forge!559
 2018-05-16 12:13:58 +00:00
austinio7116
e9dd24e6c8 Temporarily removed prototype files 2018-05-16 06:56:09 +01:00
Michael Kamensky
ed034bdec7 Merge branch 'performancemode' into 'master' 
Bandaid temporary performance preference to disable additional static abilities…

See merge request core-developers/forge!558
 2018-05-16 04:43:30 +00:00
Sol
bbd8c0c752 Merge branch 'historicformats' into 'master' 
Formatting and preparation of historicformats

See merge request core-developers/forge!342
 2018-05-16 01:40:34 +00:00
schnautzr
1bb807e302 Merge branch 'historicformats' of https://git.cardforge.org/core-developers/forge into historicformats 
# Conflicts:
#	forge-gui/res/formats/Historic/prototypes/release-dates.txt
 2018-05-15 19:09:58 -05:00
schnautzr
114185ae1e Added formats through Ravnica: City of Guilds (10/20/05). "Type 1.5" becomes Legacy. 2018-05-15 19:05:48 -05:00
austinio7116
b91791c747 Temporarily removed prototype files - made historic formats disabled by default 2018-05-15 20:55:37 +01:00
austinio7116
e51fdd8c56 Bandaid temporary performance preference to disable additional static abilities checks when checking mayplay to support better performance on Mobile and for multiplayer 
(cherry picked from commit 3e6a2e9)
 2018-05-15 20:51:09 +01:00
austinio7116
8c695fd4d9 Added configurable option to enable/disable historic formats 2018-05-15 19:46:28 +01:00
Hans Mackowiak
7823c28540 Merge branch 'EquipRework' into 'master' 
Equip Bludgeon Brawl

See merge request core-developers/forge!553
 2018-05-15 09:15:10 +00:00
austinio7116
5e5d78e595 Merge branch 'patch-cardStateVisitor' into 'master' 
Game: FIX CardStateVisitor

See merge request core-developers/forge!556
 2018-05-14 17:51:59 +00:00
Hans Mackowiak
5bfb8aa8ac Game: FIX CardStateVisitor 2018-05-14 17:43:30 +00:00
Rob Schnautz
261da41e85 forgot to save before the commit :o 2018-05-14 01:52:16 +00:00
schnautzr
ee8c7ba84e Add prototypes folder containing more compact solution for evolving formats. 2018-05-13 16:54:01 -05:00
schnautzr
64e3718122 Add formats Mirrodin through Darksteel, along with 9/20 update, which renamed Type 1 to Vintage and replaced Type 1.5 with "Type 1.5". 2018-05-13 09:16:29 -05:00
Michael Kamensky
c0e715717b Merge branch 'oldcore' into 'master' 
Latent Derichlet Allocation based deck generation update

See merge request core-developers/forge!555
 2018-05-13 13:22:24 +00:00
austinio7116
4a4e38fdd0 Code cleanup for LDA 2018-05-13 07:09:41 +01:00
austinio7116
05bc65aba9 Removed old deckgen data 2018-05-13 07:00:18 +01:00
schnautzr
ac27e07225 cleanup 2018-05-12 22:09:26 -05:00
schnautzr
e9d8e9ba78 Merge branch 'historicformats' of https://git.cardforge.org/core-developers/forge into historicformats 2018-05-12 22:02:35 -05:00
schnautzr
53a521ecd2 Fixes to Alpha formats. Formats through 1/1/04 are done now. 2018-05-12 21:59:28 -05:00