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

• 90ea36d0fe Update CHANGELOG.md Anthony Calosa 2016-06-30 15:15:50 +08:00
• c3467f7204 Merge pull request #709 from kevlahnota/master Anthony Calosa 2016-06-30 15:10:06 +08:00
• e6aafbc8a6 lastController defined when creating copies of itself Anthony Calosa 2016-06-30 14:06:21 +08:00
• 76bb777f4d Fix crash when lastController is null Anthony Calosa 2016-06-30 12:19:58 +08:00
• 39f6867ab0 Fix Cascade Anthony Calosa 2016-06-30 09:26:00 +08:00
• fbaef2f103 some corrections Anthony Calosa 2016-06-30 09:21:13 +08:00
• af0861877a Merge branch 'master' into cmake xawotihs 2016-06-29 21:36:47 +02:00
• db19fa507e Merge pull request #708 from kevlahnota/master Anthony Calosa 2016-06-29 15:11:14 +08:00
• 27fd1942d0 Try to Fix IOS Build Anthony Calosa 2016-06-29 15:03:36 +08:00
• 975df3625d Corrections Anthony Calosa 2016-06-29 15:03:24 +08:00
• 92a37e1e44 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-06-29 13:09:46 +08:00
• cd33754a3c Merge pull request #707 from kevlahnota/master Anthony Calosa 2016-06-29 12:17:43 +08:00
• 69d92bc0ea Unused Variable Anthony Calosa 2016-06-29 11:38:51 +08:00
• 6d09c12f93 Try to fix compilation Anthony Calosa 2016-06-29 11:08:55 +08:00
• ba0f4dbcf5 Update changes Anthony Calosa 2016-06-29 10:54:44 +08:00
• e1bf3b4b82 Updated Primitives Anthony Calosa 2016-06-29 10:45:35 +08:00
• d647309587 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-06-29 09:57:00 +08:00
• 140ee7b183 Hide Highlight Border Anthony Calosa 2016-06-29 08:59:58 +08:00
• 745eaf8a17 the following adds 965 cards primitives, I did not alphabetically sort these and can not justify alphabetical sorting as it has no effect on the game engine. zethfoxster 2016-06-28 20:58:52 -04:00
• b16e70c363 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-06-29 08:26:31 +08:00
• 6ee00c138c Pretty huge patch here(sorry old habits never die :( ) lots of changes, many bug fixes, first added auto=count(targetchooser) and countedamount wparsed int they work together for cards where it is difficult to get working without knowing in advance how many we had ie: exile blah creatures, for each creature you exiled do effect. auto=count(creature|mybattlefield) auto=moveto(exile) auto=draw:countedamount it takes into account token creatures, which our old methods did not. zethfoxster 2016-06-28 18:40:55 -04:00
• 0a4da47492 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-06-27 15:34:49 +08:00
• 9439b347c9 Merge pull request #705 from kevlahnota/master Anthony Calosa 2016-06-27 09:04:16 +08:00
• e24eb30c98 Update Changelog Anthony Calosa 2016-06-27 09:02:43 +08:00
• f53573261e missing tokens Anthony Calosa 2016-06-27 08:44:13 +08:00
• 5ea24bf2cc First version of emscripten wagic gh-pages xawotihs 2016-06-26 20:31:06 +02:00
• d5b8337121 support importing forge decks Anthony Calosa 2016-06-26 19:26:52 +08:00
• a23b96ba75 Merge branch 'master' into cmake xawotihs 2016-06-26 11:25:23 +02:00
• 47704f7591 Changed git add cmd Xawotihs 2016-06-26 10:28:50 +02:00
• b816facf44 Merge branch 'master' of https://github.com/kevlahnota/wagic Anthony Calosa 2016-06-26 07:57:52 +08:00
• a6a5cf8755 Card Id Indicator Anthony Calosa 2016-06-26 07:56:07 +08:00
• 83f7ed56fa Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-06-26 06:00:07 +08:00
• 755f90f38b Updated repo cleanup Xawotihs 2016-06-25 22:53:18 +02:00
• 8a56406c19 Added missing REPO variable Xawotihs 2016-06-25 21:03:43 +02:00
• 887ea94a4d Add execution right to the new script xawotihs 2016-06-25 20:11:24 +02:00
• 499b3ddf3e Added a script to upload emscripten build automatically to gh_pages xawotihs 2016-06-25 16:54:35 +02:00
• e88edd11af Merge pull request #4 from WagicProject/master Anthony Calosa 2016-06-25 21:20:24 +08:00
• 0b1be02c38 Update CHANGELOG.md Anthony Calosa 2016-06-25 20:52:17 +08:00
• b98b8b6f2e Update CHANGELOG.md Anthony Calosa 2016-06-25 20:32:42 +08:00
• 83e55b1074 Merge branch 'cmake' of https://github.com/WagicProject/wagic into cmake xawotihs 2016-06-25 11:50:54 +02:00
• 1f87ed77e4 Fixed windows package and but in SDL frontend xawotihs 2016-06-25 11:50:07 +02:00
• 93b7d210dc Should fix indentation issue Xawotihs 2016-06-24 19:32:32 +02:00
• 10d9d84f84 Fixed emscripten memory and updated python upload script to include cmake branch xawotihs 2016-06-23 23:32:57 +02:00
• fc9a4d5431 Removed redudant builds and removed -j4 to try to compile emscripten xawotihs 2016-06-23 21:20:12 +02:00
• 154358efd4 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-06-23 21:14:09 +08:00
• 63c710047b Merge pull request #704 from kevlahnota/master Anthony Calosa 2016-06-23 18:22:57 +08:00
• d0f4eeff1f Merge branch 'master' of https://github.com/kevlahnota/wagic Anthony Calosa 2016-06-23 17:44:58 +08:00
• 4d3277f41b fix produce color Anthony Calosa 2016-06-23 17:44:50 +08:00
• 7c9d52abbf Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-06-23 15:50:58 +08:00
• 4b3a2531a6 Switched to debug emscripten build Xawotihs 2016-06-23 08:20:24 +02:00
• ed4871548e Decreased optimisation level to avoid crashes Xawotihs 2016-06-23 07:48:11 +02:00
• cf6eccf565 Update _cards.dat Anthony Calosa 2016-06-23 05:30:40 +08:00
• 1284b8da8b Should fix emscripten build in Travis xawotihs 2016-06-22 22:19:09 +02:00
• 1499baf8d9 Merge pull request #703 from kevlahnota/master Anthony Calosa 2016-06-22 20:56:46 +08:00
• 37a0e95675 Rarity for Basic Lands Anthony Calosa 2016-06-22 20:39:00 +08:00
• fd62705fd7 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-06-22 17:36:39 +08:00
• dc5fc2b544 add "files" path Anthony Calosa 2016-06-22 17:00:30 +08:00
• 70165a8c62 Merge pull request #702 from kevlahnota/master Anthony Calosa 2016-06-22 09:14:32 +08:00
• 68f888baf0 Update _cards.dat Anthony Calosa 2016-06-22 08:52:12 +08:00
• 3a8bc599ee Update _cards.dat Anthony Calosa 2016-06-22 08:51:26 +08:00
• 9d79021678 Update _cards.dat Anthony Calosa 2016-06-22 08:28:42 +08:00
• 7d339ccc23 add soi tokens Anthony Calosa 2016-06-22 07:04:06 +08:00
• 95455603a1 Tries to build emscripten on linux as macosx fails Xawotihs 2016-06-21 23:45:37 +02:00
• 3dd839c8bf add plant token Anthony Calosa 2016-06-21 21:31:51 +08:00
• 7db5b6fbda added bfz tokens Anthony Calosa 2016-06-21 21:27:22 +08:00
• 1b7d199744 Create _cards.dat Anthony Calosa 2016-06-21 18:37:29 +08:00
• 6bac099369 Create _cards.dat Anthony Calosa 2016-06-21 18:34:54 +08:00
• d5cc1b970f Create _cards.dat Anthony Calosa 2016-06-21 18:29:02 +08:00
• 06f8fb0406 Merge pull request #3 from WagicProject/master Anthony Calosa 2016-06-21 18:25:02 +08:00
• 7b6de7bbd8 Update StorageOptions.java Anthony Calosa 2016-06-20 03:03:35 +08:00
• 503159ff6f adding hints that seemed to have disappeared zethfoxster 2016-06-19 09:25:41 -04:00
• 813c54a166 Removed GL_CLAMP usage, update of the Android cmake package file xawotihs 2016-06-19 12:46:17 +02:00
• fa2a2d51a5 Fixed Downloader. xawotihs 2016-06-19 12:08:45 +02:00
• 4b68b636ce Merge branch 'master' into cmake xawotihs 2016-06-19 11:39:56 +02:00
• 0a01b0af69 Tries to fix SDL and Qt builds, introduces Emscripten in Travis. xawotihs 2016-06-19 10:25:22 +02:00
• e4e809f3fe Emscripten seems to work, should also fix PSP and Qt builds xawotihs 2016-06-19 00:41:35 +02:00
• 1667b79fa8 Improved Emscripten port... still not there yet. xawotihs 2016-06-18 17:24:51 +02:00
• c22c674de1 Merge pull request #701 from kevlahnota/master Anthony Calosa 2016-06-18 22:36:52 +08:00
• de3ce6f676 add description Anthony Calosa 2016-06-18 21:58:24 +08:00
• cd34c4ebdf Modified test Anthony Calosa 2016-06-18 21:55:14 +08:00
• ba0cab3743 Revert test Anthony Calosa 2016-06-18 21:21:08 +08:00
• a73030ac9b Overlooked this Anthony Calosa 2016-06-18 21:20:30 +08:00
• f57bba22cc Merge branch 'master' of https://github.com/kevlahnota/wagic Anthony Calosa 2016-06-18 20:22:55 +08:00
• e315cad0f5 Revert to previous Anthony Calosa 2016-06-18 20:22:50 +08:00
• 3f40a6db4b Update Replenish.txt Anthony Calosa 2016-06-18 20:06:36 +08:00
• eb99680986 Modified Anthony Calosa 2016-06-18 19:55:58 +08:00
• 2aa4f2da2d Merge branch 'master' of https://github.com/kevlahnota/wagic Anthony Calosa 2016-06-18 12:41:29 +08:00
• a48568526b Update _tests.txt Anthony Calosa 2016-06-18 12:39:20 +08:00
• 7247abd5f1 Create Show_and_Tell.txt Anthony Calosa 2016-06-18 12:38:30 +08:00
• bae2502d8f Create Replenish.txt Anthony Calosa 2016-06-18 12:37:52 +08:00
• cd645b33b2 Fix for Aura's that are put into play Anthony Calosa 2016-06-18 12:31:23 +08:00
• 07ad69c08f Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-06-18 09:12:02 +08:00
• 6bc7de3370 Minor Fix Anthony Calosa 2016-06-18 09:11:57 +08:00
• f3ca247865 Merge pull request #699 from kevlahnota/master Anthony Calosa 2016-06-17 17:47:43 +08:00
• 0167cf052d Merge branch 'master' of https://github.com/kevlahnota/wagic Anthony Calosa 2016-06-17 17:03:52 +08:00
• 9a3b3013a3 Update SDLActivity.java Anthony Calosa 2016-06-17 17:03:37 +08:00
• 0f9bbc1561 Update DeckImporter.java Anthony Calosa 2016-06-17 17:00:44 +08:00
• 3ef6b3a76a Force Mounting 2 Anthony Calosa 2016-06-17 16:58:15 +08:00
• 3c7ccddfcc Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-06-17 07:48:15 +08:00
• 42019917ce Merge pull request #698 from kevlahnota/master Anthony Calosa 2016-06-16 19:17:29 +08:00