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

• 4a73e90da8 remove test Anthony Calosa 2016-07-24 20:19:58 +08:00
• fc59bef156 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-24 19:41:58 +08:00
• 512f4ca4e4 Merge pull request #786 from zethfoxster/master zethfoxster 2016-07-24 07:33:17 -04:00
• f254ca57c6 Merge pull request #31 from WagicProject/master zethfoxster 2016-07-24 07:32:06 -04:00
• 5e35dac1da Update Living_Death.txt Anthony Calosa 2016-07-24 17:51:26 +08:00
• 44cbd408ce Update _tests.txt Anthony Calosa 2016-07-24 14:25:08 +08:00
• 6fbe9de1a8 Create Living_Death.txt Anthony Calosa 2016-07-24 14:24:11 +08:00
• 3b1410f913 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-24 14:21:15 +08:00
• f9265923a9 Merge pull request #784 from kevlahnota/master Anthony Calosa 2016-07-24 13:29:26 +08:00
• 3282848631 Normalized Big Quad Border Anthony Calosa 2016-07-24 13:12:40 +08:00
• f142363bfa smaller scaled big quad and forced border Anthony Calosa 2016-07-24 12:40:41 +08:00
• c0e9800179 added scalpelexis, sphinx's tutelage, grindstone, primal surge Anthony Calosa 2016-07-24 12:31:16 +08:00
• 97308ca31c Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-24 11:24:02 +08:00
• 02992954c2 Merge pull request #30 from WagicProject/master zethfoxster 2016-07-23 09:19:12 -04:00
• 78d4f178a3 Merge pull request #783 from kevlahnota/master Anthony Calosa 2016-07-23 10:16:47 +08:00
• fe577d9dd0 fix flying and multiple moat in play Anthony Calosa 2016-07-23 09:45:12 +08:00
• 007010067b Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-23 09:06:56 +08:00
• bc2d8dab31 corrected my logic for emerge, originally I thought the cost was the same as the original cost, while coding i noticed it can have a completely different cost than the real manacost. zethfoxster 2016-07-22 19:10:06 -04:00
• 296f8645fb Merge pull request #782 from zethfoxster/master zethfoxster 2016-07-22 18:05:35 -04:00
• 2d76c8ff0d Merge pull request #29 from WagicProject/master zethfoxster 2016-07-22 18:05:16 -04:00
• 0a3d9f9876 flipped the logic of the 2 deck editor menu buttons left and right, it was a nightmare making an ai deck with the tiny buttons to navigate. having my finger slip slightly off the button made it travel the opposite direction from the button, which was confusing and felt very buggy. zethfoxster 2016-07-22 17:46:52 -04:00
• 2a1d0b19ce Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-22 21:35:23 +08:00
• a99c57ab1a Merge pull request #780 from kevlahnota/master Anthony Calosa 2016-07-22 16:34:15 +08:00
• 6832049ccc reserve size Anthony Calosa 2016-07-22 16:00:29 +08:00
• 6d72753216 OK quad and COMBATTOUGHNESS for attackers/blockers Anthony Calosa 2016-07-22 15:38:38 +08:00
• b6b3898536 Merge pull request #10 from WagicProject/master Anthony Calosa 2016-07-22 14:20:39 +08:00
• 99922d38e2 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-22 14:15:50 +08:00
• 161623a8d2 Merge pull request #779 from zethfoxster/master zethfoxster 2016-07-21 22:31:17 -04:00
• 155a7a6582 Merge pull request #28 from WagicProject/master zethfoxster 2016-07-21 22:29:58 -04:00
• 6aafe9dee0 added lifegain and oplifegain variable used the same as lifelost, but stores the value of life gained this turn. zethfoxster 2016-07-21 21:11:15 -04:00
• 680c9d64cb Merge pull request #778 from zethfoxster/master zethfoxster 2016-07-21 20:47:28 -04:00
• ca395492d5 added meld(cardname) added meldfrom(cardname|cardname) helper class. zethfoxster 2016-07-21 20:46:53 -04:00
• ea920d352f Merge pull request #777 from kevlahnota/master Anthony Calosa 2016-07-21 15:50:58 -05:00
• 0c0031455b Add files via upload Anthony Calosa 2016-07-21 15:49:32 -05:00
• a8a9893ce4 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-22 04:22:34 +08:00
• 5143743661 unlocked images Anthony Calosa 2016-07-21 22:58:27 +08:00
• 88a42b25cc Add files via upload Anthony Calosa 2016-07-21 02:39:51 -05:00
• b371bf6efa Merge pull request #776 from kevlahnota/master Anthony Calosa 2016-07-21 02:37:47 -05:00
• 3bc7ed6f8c Merge branch 'master' of https://github.com/kevlahnota/wagic Anthony Calosa 2016-07-21 15:36:22 +08:00
• f996510969 psp fix 3 Anthony Calosa 2016-07-21 15:36:16 +08:00
• 58fd119636 Add files via upload Anthony Calosa 2016-07-21 02:36:16 -05:00
• f275792604 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-21 15:23:17 +08:00
• 9f8ead5e4e added other={cost} other={emerge} zethfoxster 2016-07-20 20:06:18 -04:00
• a35ccbbe5b Merge pull request #775 from zethfoxster/master zethfoxster 2016-07-20 19:01:10 -04:00
• 9a60a8838f Merge pull request #27 from WagicProject/master zethfoxster 2016-07-20 19:00:08 -04:00
• bb9e02da6b fixed a debug assert i introduced. zethfoxster 2016-07-20 18:58:29 -04:00
• 0fd0c5ecc1 Merge pull request #774 from kevlahnota/master Anthony Calosa 2016-07-20 17:36:02 -05:00
• c89961ebf0 Add files via upload Anthony Calosa 2016-07-20 17:35:03 -05:00
• 0f81e82206 psp fix 2 Anthony Calosa 2016-07-21 06:34:14 +08:00
• 7c7c8c4f34 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-21 06:02:56 +08:00
• 3d7362aa9d Merge branch 'master' of https://github.com/WagicProject/wagic xawotihs 2016-07-20 22:16:23 +01:00
• f3061a2526 Merge pull request #773 from kevlahnota/master Anthony Calosa 2016-07-20 11:40:24 -05:00
• 2657af1aef semicolon Anthony Calosa 2016-07-21 00:38:01 +08:00
• dd03ed4b30 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-21 00:37:50 +08:00
• 64c6b05963 Merge pull request #772 from kevlahnota/master Anthony Calosa 2016-07-20 19:19:56 +08:00
• 05017b0236 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-20 19:17:36 +08:00
• efd9cce4ef try to fix psp platform Anthony Calosa 2016-07-20 19:16:48 +08:00
• 144c78fa4b Add files via upload Anthony Calosa 2016-07-20 19:12:06 +08:00
• 3147aa539c Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-20 09:42:16 +08:00
• ad4532932b Merge pull request #771 from zethfoxster/master zethfoxster 2016-07-19 20:44:40 -04:00
• ffac3462af Merge pull request #26 from WagicProject/master zethfoxster 2016-07-19 20:44:06 -04:00
• 7c163592b5 removed the changes I made to selectAbility and created a new function which handles sending an ability and card to have AI do the ability of that card. zethfoxster 2016-07-19 20:16:22 -04:00
• a6211e371e Revert usage of ant release and remove the DEBUG define in the NDK makefile to remove the testsuite AndroidRelease xawotihs 2016-07-19 22:24:26 +01:00
• 775085eca1 Uses now *ant release* to build the APK Xawotihs 2016-07-19 21:30:08 +01:00
• b3d580cada Changed Android app manifest to be not debuggable. xawotihs 2016-07-19 21:03:24 +01:00
• 37987ddb57 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-19 10:47:53 +08:00
• a56ab4f561 Merge pull request #770 from zethfoxster/master zethfoxster 2016-07-18 22:30:53 -04:00
• 6f649bd680 Merge pull request #25 from WagicProject/master zethfoxster 2016-07-18 22:30:30 -04:00
• 6316577ec7 taught AI basic attack and block cost. added functionality to send specific abilities to AI "selectAbility" to have it find mana, targets, and use a selected ability at our command. zethfoxster 2016-07-18 22:03:16 -04:00
• 61cd74fcd0 revert psp cache Anthony Calosa 2016-07-19 09:52:18 +08:00
• 37fd0ebbd2 readded the "fakebar" size adjustments based on string lengths. in debug there is a strange line drawn sometimes on screen, like the buttons on main screen, this is not present in release builds, I'm guessing its some kind of debug related thing with JGE and quads. zethfoxster 2016-07-18 19:02:03 -04:00
• 8e987a6718 Merge pull request #769 from zethfoxster/master zethfoxster 2016-07-18 17:24:15 -04:00
• 520be9dbe8 Merge pull request #24 from WagicProject/master zethfoxster 2016-07-18 17:23:54 -04:00
• 322e6f7edf Merge pull request #768 from kevlahnota/master zethfoxster 2016-07-18 17:22:16 -04:00
• b6eea6fe2e Some Changes to Deck Editor and Others Anthony Calosa 2016-07-19 04:33:09 +08:00
• dc84c50ea8 add deck editor graphics Anthony Calosa 2016-07-19 03:32:22 +08:00
• 07d7df7271 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-18 23:33:26 +08:00
• 5b9f3c70dc Merge pull request #767 from kevlahnota/master Anthony Calosa 2016-07-18 14:26:31 +08:00
• bd36590084 offquad for offset bg Anthony Calosa 2016-07-18 13:52:28 +08:00
• 4e64ff4ff9 center menu title Anthony Calosa 2016-07-18 13:51:49 +08:00
• 2dd882a7a5 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-18 13:51:19 +08:00
• fe4c102c7d Merge pull request #766 from kevlahnota/master Anthony Calosa 2016-07-18 12:47:01 +08:00
• 1380bc9940 psp cache Anthony Calosa 2016-07-18 12:44:19 +08:00
• 5cc549ad3a Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-18 11:11:51 +08:00
• 75395f6622 Merge pull request #765 from kevlahnota/master Anthony Calosa 2016-07-18 11:04:51 +08:00
• c9576e260e fix blinking menu item Anthony Calosa 2016-07-18 11:04:14 +08:00
• 362d692879 cleanup Anthony Calosa 2016-07-18 10:53:07 +08:00
• acbaa69305 use previous "phaseinfo" as fakebar Anthony Calosa 2016-07-18 10:38:40 +08:00
• 592a48c725 add fakebar Anthony Calosa 2016-07-18 10:19:01 +08:00
• bfaaf7d893 travis int order zethfoxster 2016-07-17 22:37:32 -04:00
• 9e73dc9c00 add support for repeater deplete cards. Scalpelexis Sphinx's Tutelage Grindstone normally I aim for much bigger card groups, but this was requested by one of the only 2 active members we have on the forum. I'll have the card code for these cards ready when I code eldrich moon set. zethfoxster 2016-07-17 22:24:53 -04:00
• d37aac0c71 added fakebar.png Anthony Calosa 2016-07-18 10:15:22 +08:00
• 8314d4c9ae update GameStateMenu Anthony Calosa 2016-07-18 09:24:28 +08:00
• d860954c32 fix crash with cdaactive and token Anthony Calosa 2016-07-18 07:32:02 +08:00
• 0b4b085095 fix layer order Anthony Calosa 2016-07-18 07:28:31 +08:00
• c0334d0c94 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-18 06:07:38 +08:00
• 6acd897e16 Merge pull request #23 from WagicProject/master zethfoxster 2016-07-17 10:39:10 -04:00
• 2adfc55339 Merge pull request #763 from kevlahnota/master Anthony Calosa 2016-07-17 20:07:28 +08:00
• 208b4f68b5 added statsholder Anthony Calosa 2016-07-17 19:05:00 +08:00
• 33fd704a00 move stats to the right in deck menu Anthony Calosa 2016-07-17 19:03:55 +08:00