Commit Graph

Select branches

Hide Pull Requests

AndroidRelease

SDL_build

VS2019

alphas

auto_releases

cmake

feature/adjust-font-size-for-ios

gh-pages

master

minmax

qt_resources

releasing-master

travis_mac_osx

wp8

#1

#1000

#1001

#1002

#1003

#1004

#1005

#1006

#1008

#1009

#1010

#1011

#1012

#1013

#1014

#1015

#1016

#1017

#1018

#1019

#1020

#1021

#1022

#1024

#1025

#1026

#1027

#1055

#1070

#1072

#1074

#1077

#1078

#1082

#1082

#1088

#1092

#1098

#1100

#1101

#1102

#1103

#1104

#1105

#1106

#1107

#1108

#1110

#1112

#1115

#1117

#1118

#1119

#1121

#1123

#1143

#1147

#1147

#555

#556

#556

#557

#559

#559

#560

#561

#562

#563

#563

#564

#565

#565

#568

#568

#569

#569

#570

#571

#571

#572

#572

#573

#573

#574

#575

#576

#577

#577

#578

#583

#585

#586

#586

#588

#588

#596

#598

#599

#600

#601

#602

#604

#605

#606

#607

#609

#612

#614

#616

#616

#617

#618

#619

#620

#620

#621

#622

#622

#623

#624

#626

#627

#628

#629

#630

#631

#632

#633

#634

#635

#636

#637

#638

#639

#640

#641

#642

#643

#644

#645

#646

#647

#648

#649

#650

#651

#652

#653

#654

#655

#656

#657

#658

#659

#660

#661

#671

#672

#673

#674

#676

#677

#678

#679

#680

#681

#683

#684

#685

#686

#687

#688

#690

#692

#693

#694

#695

#696

#697

#698

#699

#701

#702

#703

#704

#705

#707

#708

#709

#710

#711

#712

#713

#714

#715

#716

#716

#717

#719

#720

#721

#722

#723

#724

#725

#726

#727

#729

#730

#731

#732

#736

#737

#738

#739

#740

#741

#742

#743

#744

#745

#747

#748

#749

#750

#751

#752

#753

#754

#755

#756

#757

#758

#759

#760

#761

#762

#763

#765

#766

#767

#768

#769

#770

#771

#772

#773

#774

#775

#776

#777

#778

#779

#780

#782

#783

#784

#785

#785

#786

#787

#788

#789

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#800

#801

#802

#803

#804

#805

#805

#806

#807

#808

#809

#810

#811

#812

#813

#814

#815

#816

#817

#818

#819

#820

#821

#822

#823

#824

#825

#826

#827

#828

#830

#831

#834

#835

#836

#837

#838

#839

#840

#841

#842

#843

#844

#845

#846

#847

#848

#849

#850

#851

#852

#853

#854

#855

#856

#857

#858

#859

#860

#861

#862

#863

#864

#865

#866

#867

#869

#870

#871

#871

#872

#873

#874

#875

#876

#877

#878

#880

#881

#882

#883

#885

#886

#887

#888

#889

#889

#890

#893

#894

#895

#896

#896

#897

#900

#900

#902

#903

#904

#905

#906

#907

#908

#908

#910

#911

#913

#915

#916

#917

#918

#919

#922

#923

#924

#926

#927

#928

#929

#930

#931

#932

#933

#934

#935

#936

#937

#938

#939

#940

#941

#942

#943

#944

#945

#946

#947

#948

#949

#950

#951

#952

#953

#954

#955

#956

#957

#958

#959

#960

#961

#962

#963

#964

#965

#966

#968

#973

#974

#975

#978

#985

#986

#988

#989

#990

#991

#992

#994

#995

#996

#997

#998

#999

alpha-195

latest-cmake

latest-master

travis-ci

wagic-v0.18.5

wagic-v0.18.6

wagic-v0.19.2

wagic-v0.20.1

wagic-v0.21.1

wagic-v0.23.1

wagic-v0.23.2

wagic-v0.24.0

wagic-v0.25.3

wagic-v0.25.5

Mono Color

• 45d8413d59 Revert Stormtide Leviathan code Anthony Calosa 2016-07-31 07:58:26 +08:00
• 5c400457a9 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-31 07:32:08 +08:00
• 3e9ee5890f Merge pull request #816 from zethfoxster/master zethfoxster 2016-07-30 10:51:26 -04:00
• 1acdb40498 add some handling of reveal to avoid a crash in demo for AI. zethfoxster 2016-07-30 10:50:31 -04:00
• 1dc0b00133 Merge pull request #815 from zethfoxster/master zethfoxster 2016-07-30 10:20:48 -04:00
• f2208389bd same applies for scry zethfoxster 2016-07-30 10:20:19 -04:00
• ab92c3e15b Merge pull request #814 from zethfoxster/master zethfoxster 2016-07-30 10:14:54 -04:00
• 018e35295a fixed a crash in revealing, not sure why I thought it was a good idea to test testdestroy something that I just removed from the game. if anyone can find another crash with it, let me know which card causes it. zethfoxster 2016-07-30 10:13:58 -04:00
• 2c9e90eee0 Merge pull request #38 from WagicProject/master zethfoxster 2016-07-30 08:29:45 -04:00
• 847f21f7dc Merge pull request #813 from kevlahnota/master Anthony Calosa 2016-07-30 15:05:57 +08:00
• b90dfbe3b0 Centered P/T inside P/T box Anthony Calosa 2016-07-30 15:04:34 +08:00
• c230794c82 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-30 15:03:08 +08:00
• 7f83aa7253 Merge pull request #812 from kevlahnota/master Anthony Calosa 2016-07-30 12:14:24 +08:00
• 1039815017 small adjustment Anthony Calosa 2016-07-30 10:21:39 +08:00
• 2c43eac80d Merge pull request #811 from kevlahnota/master Anthony Calosa 2016-07-30 09:18:44 +08:00
• 4aa6ad3203 small scale Anthony Calosa 2016-07-30 08:13:30 +08:00
• 730b05ad1b change enstack attackers Anthony Calosa 2016-07-30 07:07:35 +08:00
• 5a7b2c5029 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-30 07:02:49 +08:00
• 7ae551de9d Merge pull request #37 from WagicProject/master zethfoxster 2016-07-29 17:44:56 -04:00
• 96dd3faef0 Merge pull request #810 from kevlahnota/master Anthony Calosa 2016-07-30 03:49:06 +08:00
• ffdc8cd9ff meld card size Anthony Calosa 2016-07-30 03:05:24 +08:00
• 8256ac3bee Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-30 01:41:43 +08:00
• 037ab83519 Merge pull request #809 from kevlahnota/master Anthony Calosa 2016-07-30 00:10:28 +08:00
• a56e77310d Border Corrections Anthony Calosa 2016-07-29 23:10:01 +08:00
• 5350fb7f5d Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-29 18:47:51 +08:00
• 9161f89057 Merge pull request #808 from kevlahnota/master Anthony Calosa 2016-07-29 18:40:38 +08:00
• 1d2abeb20b Minor Border changes Anthony Calosa 2016-07-29 18:37:03 +08:00
• 833c21192a Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-29 18:30:20 +08:00
• 86168e454f Merge pull request #807 from kevlahnota/master Anthony Calosa 2016-07-29 08:11:05 +08:00
• a20c2ce29a Unused variable Anthony Calosa 2016-07-29 07:30:20 +08:00
• 874b27c56d Merge branch 'master' of https://github.com/kevlahnota/wagic Anthony Calosa 2016-07-29 07:00:46 +08:00
• a7dc44e4e1 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-29 07:00:07 +08:00
• 047d08882e Merge pull request #806 from zethfoxster/master zethfoxster 2016-07-28 18:55:03 -04:00
• 52df1ad963 the fix for the sacrifice trigger was a ton easier than expected. treat it like a spell. the card after contains all the info we need to determine if it should trigger. zethfoxster 2016-07-28 18:48:47 -04:00
• c2cec37928 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-29 06:36:51 +08:00
• 239a186b36 Update _tests.txt Anthony Calosa 2016-07-28 21:36:21 +08:00
• 5aeb2ebc05 Create TirelessGraf.txt Anthony Calosa 2016-07-28 21:35:43 +08:00
• a7e87aaae5 Merge pull request #36 from WagicProject/master zethfoxster 2016-07-28 09:11:55 -04:00
• eb545eca57 Merge pull request #804 from zethfoxster/master zethfoxster 2016-07-28 08:02:00 -04:00
• 44ab1827bf Merge pull request #803 from kevlahnota/master Anthony Calosa 2016-07-28 19:39:05 +08:00
• 96b4f024b4 Update test and Corrected Graf Mole Anthony Calosa 2016-07-28 19:34:50 +08:00
• b070035770 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-28 19:28:05 +08:00
• 1b0c3d8c00 Merge pull request #802 from kevlahnota/master Anthony Calosa 2016-07-28 19:25:42 +08:00
• 2e71cb08d0 I hope this is correct Anthony Calosa 2016-07-28 19:24:01 +08:00
• 3da5d12bee Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-28 17:31:51 +08:00
• e8019bbb92 Merge pull request #801 from kevlahnota/master Anthony Calosa 2016-07-28 17:09:34 +08:00
• 30dab27202 Fix Compilation Anthony Calosa 2016-07-28 16:38:16 +08:00
• cc7077d783 Fix compilation and add Tireless Tracker test Anthony Calosa 2016-07-28 16:37:38 +08:00
• fda7e9f39d Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-28 11:20:40 +08:00
• e178533493 Merge pull request #35 from WagicProject/master zethfoxster 2016-07-27 23:04:19 -04:00
• e3ad9296bc Merge pull request #800 from zethfoxster/master zethfoxster 2016-07-27 23:03:37 -04:00
• 01042a62ae Merge pull request #799 from kevlahnota/master Anthony Calosa 2016-07-28 10:30:49 +08:00
• 7bd940ddb3 Revert "revised legendary" Anthony Calosa 2016-07-28 10:28:54 +08:00
• f168702aad Revert "moved sac event" Anthony Calosa 2016-07-28 10:28:27 +08:00
• 2a33c0c375 moved sac event Anthony Calosa 2016-07-28 10:26:25 +08:00
• eea240d7f2 changing some of the logic to the previous fixes, we want to avoid using code that looks for specific card names. currently we have kamiflip as the only defined flip type as it is treated differently from the others. but we have room for more if needed now doublefaced=kamiflip sets the flip type of a card to the kamiflip style cards. since this is defined on cardprimitive level now, we might be able to do something different from the flipping animation. who knows. zethfoxster 2016-07-27 20:03:25 -04:00
• afb98a374c updated codes for changes zethfoxster 2016-07-27 19:58:32 -04:00
• ed0d28eaf6 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-28 07:02:36 +08:00
• 50345101e5 Merge pull request #798 from kevlahnota/master Anthony Calosa 2016-07-28 06:44:14 +08:00
• c0e4010c88 Merge pull request #34 from WagicProject/master zethfoxster 2016-07-27 18:42:54 -04:00
• 193d7accb4 revised legendary Anthony Calosa 2016-07-28 06:42:47 +08:00
• a9be34c627 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-28 06:33:30 +08:00
• 0e14226968 Merge pull request #797 from kevlahnota/master Anthony Calosa 2016-07-27 18:13:11 +08:00
• 068b03a0bb Alpha-Beta small inner border Anthony Calosa 2016-07-27 17:12:05 +08:00
• b99f9ae752 alpha beta small border Anthony Calosa 2016-07-27 17:10:26 +08:00
• 3519871f80 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-27 17:07:24 +08:00
• e9db853f28 Merge pull request #796 from kevlahnota/master Anthony Calosa 2016-07-27 16:07:05 +08:00
• a6fdd89e1d Fix Copier Anthony Calosa 2016-07-27 15:19:11 +08:00
• b8bfe7acc1 Fix Flip/Transform Cards Anthony Calosa 2016-07-27 14:39:39 +08:00
• dd5d5589ff Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-27 12:41:38 +08:00
• 7d460e093c Merge pull request #795 from zethfoxster/master zethfoxster 2016-07-26 22:47:07 -04:00
• 54e86915b0 Merge pull request #33 from WagicProject/master zethfoxster 2016-07-26 22:46:06 -04:00
• ab2effd776 Merge pull request #794 from kevlahnota/master Anthony Calosa 2016-07-27 09:19:16 +08:00
• 4f0da67a83 fixed a condition where scry core wasnt triggering its after effect zethfoxster 2016-07-26 19:35:10 -04:00
• 014ca36a4a force event for token sacrifice Anthony Calosa 2016-07-27 07:11:30 +08:00
• 2971e64182 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-27 07:11:10 +08:00
• d7737c13ff Merge pull request #793 from kevlahnota/master Anthony Calosa 2016-07-27 07:07:47 +08:00
• eebcc9c925 Fix CDAACTIVE & transformed card colors Anthony Calosa 2016-07-27 06:31:03 +08:00
• 0c90b39a96 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-27 02:57:42 +08:00
• 4f3f96337f Merge pull request #792 from kevlahnota/master Anthony Calosa 2016-07-27 02:34:56 +08:00
• e855ca72aa Fix Mirror Gallery & enters "tapped" cards Anthony Calosa 2016-07-27 01:44:18 +08:00
• 8ff47bf8e2 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-26 23:18:35 +08:00
• 9d75f69a79 Merge pull request #791 from kevlahnota/master Anthony Calosa 2016-07-26 11:21:28 +08:00
• ae33977e10 Add Snapcaster Mage Ability Anthony Calosa 2016-07-26 09:56:13 +08:00
• 07b5f35b98 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-26 09:39:47 +08:00
• c4acf006dd Merge pull request #790 from kevlahnota/master Anthony Calosa 2016-07-26 09:27:24 +08:00
• 12b80307a7 Update Living_Death.txt Anthony Calosa 2016-07-26 08:51:46 +08:00
• 43fd399d10 Update _tests.txt Anthony Calosa 2016-07-26 07:46:18 +08:00
• cc5d8940bf Clue tokens Anthony Calosa 2016-07-26 07:43:13 +08:00
• 09ed1ab683 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-25 10:42:49 +08:00
• 26c85fd18a added Eldritch Moon Anthony Calosa 2016-07-25 06:32:49 +08:00
• 894615bee6 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-25 05:15:38 +08:00
• aeed094be0 Merge pull request #789 from zethfoxster/master zethfoxster 2016-07-24 11:12:45 -04:00
• 61068ee166 big whoops here, this would be a disastrous change. zethfoxster 2016-07-24 11:12:13 -04:00
• bdce25cb8c Merge pull request #788 from zethfoxster/master zethfoxster 2016-07-24 11:09:18 -04:00
• 6a71bf5653 Merge pull request #32 from WagicProject/master zethfoxster 2016-07-24 11:08:51 -04:00
• 3007ddc093 added oplifetotal...or readded, i swear this was already in a long time ago when I added lifetotal as a variable. either way. zethfoxster 2016-07-24 11:08:08 -04:00
• 4495e1649f Merge pull request #787 from kevlahnota/master Anthony Calosa 2016-07-24 21:19:57 +08:00
• f960cdea9b A little border adjustment Anthony Calosa 2016-07-24 20:25:20 +08:00
• b70b2a65bc Merge branch 'master' of https://github.com/kevlahnota/wagic Anthony Calosa 2016-07-24 20:20:31 +08:00