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

• 031f2dbffb Fix Valgrind warnings appearing during the test suit. Tobias Loose 2013-11-29 18:20:41 +01:00
• dbece750f8 Use tabs instead of spaces if the file uses tabs Tobias Loose 2013-11-29 13:51:13 +01:00
• 6699902c24 Add TIXML_USE_STL to android builds Tobias Loose 2013-11-28 17:36:03 +01:00
• e8407caa2a Add TIXML_USE_STL compiler flag to psp makefile to make headers compatible Tobias Loose 2013-11-28 17:23:16 +01:00
• 69c6745f53 Make getMenuText() return string. Tobias Loose 2013-11-29 13:33:33 +01:00
• 6f083389c2 Speedup MTGAllCards::countByType a bit Tobias Loose 2013-11-23 13:00:03 +01:00
• 9ee44ca091 Substitute more char arrays with strings Tobias Loose 2013-11-23 12:57:31 +01:00
• 3f0dd987f0 Remove bool CardInstance::hasSubtype(const char * _subtype) Tobias Loose 2013-11-23 11:26:10 +01:00
• 672b0be7bd Fix a few string bugs add StartsWith for strings Tobias Loose 2013-11-29 10:56:33 +01:00
• 9a493e4af4 Merge branch 'master' into wp8 xawotihs 2013-11-28 22:22:42 +01:00
• 9d5a83d588 Replace more strcmp with std::string::compare or std::string::operator==. Tobias Loose 2013-11-23 11:10:41 +01:00
• 5d0d130587 Make MTGGameZone::countByType use string instead of char* Tobias Loose 2013-11-22 18:33:07 +01:00
• c85d857604 Replace constness cast Tobias Loose 2013-11-22 18:31:00 +01:00
• f68568cc1e Replace strcmp with c++ equivalent when comparing std::strings. Tobias Loose 2013-11-18 09:52:20 +01:00
• 89206b3a6b Added testing that QT GUI build is successfull Dmitry Panin 2013-11-28 16:43:03 +04:00
• a8cff5ed8e Merge branch 'master' into develop Michael Nguyen 2013-11-28 02:19:41 -08:00
• 9cc2c6cc4d updated iOS UI issues: * fixed status bar issue on iOS7, where status bar information was invisible on iOS7 devices * fixed some font issues on the Shop screens to make them more legible for iOS users. ( changed font size for Interactive Buttons and card list) * added new gesture for opening up the menu screen for iOS. Since there are no external buttons on iOS devices, we need either on-screen buttons or gestures to compensate. Using the pinch or zoom gesture will simulate pressing the "MENU" button on the PSP on all screens now. Not ideal, but something for now until we can work in a new button or way to open up the menu. feature/adjust-font-size-for-ios Michael Nguyen 2013-11-27 22:25:22 -08:00
• dc118c64b8 Fixed compilation on Mac xawotihs 2013-11-27 23:04:46 +01:00
• a43854420d Fixed compilation issue on Windows xawotihs 2013-11-27 20:33:59 +01:00
• d6c7dc22df Fixed abs in corewrapper on Android xawotihs 2013-11-26 23:19:36 +01:00
• 94deb63d22 Fixed corewrapper Android files. xawotihs 2013-11-26 23:03:30 +01:00
• 978171d775 Adds unified corewrapper in android makefile xawotihs 2013-11-26 06:23:49 +01:00
• 294c396417 Fixed compilation issues xawotihs 2013-11-26 06:07:23 +01:00
• ac54bf32d3 Merge branch 'master' into wp8 xawotihs 2013-11-26 05:09:34 +01:00
• a695323bc7 Merge pull request #564 from ZobyTwo/cleanup_1 xawotihs 2013-11-25 15:42:18 -08:00
• 02a65ecd82 Merge branch 'cleanup_1' of https://github.com/ZobyTwo/wagic into ZobyTwo-cleanup_1 xawotihs 2013-11-26 00:17:48 +01:00
• 9ff087ecde Merge pull request #570 from WagicProject/android-travis-ci xawotihs 2013-11-25 14:31:15 -08:00
• 47685f4892 Added installation of 32 bits libs to make Android SDK work. xawotihs 2013-11-25 22:42:09 +01:00
• 7aaebdc661 Merge branch 'android_build_fix' into android-travis-ci xawotihs 2013-11-25 21:23:58 +01:00
• 8aa0b8cea0 reverting sdk.buildtools change Rolzad73 2013-11-25 13:41:07 -05:00
• fac44c4b48 - updated AndroidManifest.xml to match desired API values. - removed CardEffect.cpp reference from Android.mk build file. - added sdk.buildtools=18.1.1 line to default.properties and project.properties - updated .gitignore Rolzad73 2013-11-25 11:53:34 -05:00
• 9889186eab Added missing "echo" statement Dmitry Panin 2013-11-25 13:41:29 +04:00
• 73f9319b92 Activates Android build from Travis xawotihs 2013-11-25 05:27:31 +01:00
• fd6bc95539 Merge pull request #562 from citiral/master xawotihs 2013-11-24 10:28:05 -08:00
• 0bb211a581 Remove unused global variables from DeckStats.cpp and add proper... Tobias Loose 2013-11-24 09:18:34 +01:00
• e0428ac7b0 Avoid more conflicts. We could now do unit builds... Tobias Loose 2013-11-23 17:04:24 +01:00
• 3e94de985f Add more include guards Tobias Loose 2013-11-23 16:25:14 +01:00
• 9f0b70d1c9 Put constans into extra namespace as kBackToMainMenuID... Tobias Loose 2013-11-23 16:18:45 +01:00
• 1e8fc81aa3 Add/fix broken include guards Tobias Loose 2013-11-23 16:09:11 +01:00
• 352e3c2daa Remove makros and add undefs to avoid clashing names Tobias Loose 2013-11-23 16:03:04 +01:00
• ca3084221c Merged Master branch into wp8 xawotihs 2013-11-22 17:21:25 +01:00
• 678a4734bb Merge pull request #560 from ZobyTwo/dead_code Dmitry Panin 2013-11-22 00:09:40 -08:00
• 052e3abdb8 Small fix in match_and ( [-color1; -color2] was handled incorrectly ) Dmitry Panin 2013-11-22 01:03:07 +04:00
• 73c2d17080 Updated deckmenu.cpp to properly render deck description and summary citiral 2013-11-21 20:38:41 +01:00
• ffbb228d2d Fixed wrong activation cost in dragon hatchling Dmitry Panin 2013-11-21 14:25:01 +04:00
• 306765c6b6 Merge pull request #561 from ZobyTwo/valgrind Dmitry Panin 2013-11-21 01:58:49 -08:00
• 3cee80e3bc Delete another unused file (GuiMessageBox.cpp) Tobias Loose 2013-11-20 14:01:59 +01:00
• 8209716fc9 Remove unused file Tobias Loose 2013-11-20 13:53:15 +01:00
• e76c57d747 Fix some valgrind memcheck warnings. However there remains one... Tobias Loose 2013-11-20 12:56:33 +01:00
• 9c282aeb56 Remove CardEffect.o from Makefile Tobias Loose 2013-11-20 12:02:33 +01:00
• bbc310dec7 Remove some dead code Tobias Loose 2013-11-17 21:55:16 +01:00
• a37af1776a Merge pull request #557 from ZobyTwo/defines Dmitry Panin 2013-11-20 02:34:32 -08:00
• 35697a65b4 Use style guide Tobias Loose 2013-11-20 11:13:35 +01:00
• 6bed1666be Merge branch 'master' into defines Tobias Loose 2013-11-20 11:06:41 +01:00
• f021866368 Merge remote-tracking branch 'wp/master' Tobias Loose 2013-11-20 11:06:28 +01:00
• d7e527166c Merge branch 'show-output-only-for-failing-tests' xawotihs 2013-11-19 11:14:41 +01:00
• a683f5a2b7 Some preliminary work for minmax xawotihs 2013-11-19 11:09:39 +01:00
• 071a487100 Fixed compilation error Dmitry Panin 2013-11-19 11:06:31 +04:00
• f370899a8a Thread-safe version of OutputCapturer Dmitry Panin 2013-11-19 03:58:43 +04:00
• 331e126787 Added info about total number of tests Dmitry Panin 2013-11-19 02:57:42 +04:00
• 6c41e5c92c Added option (#define CAPTURE_STDERR) Dmitry Panin 2013-11-19 02:41:30 +04:00
• 82e3ab3977 Merge branch 'cleanup' into defines Tobias Loose 2013-11-17 21:06:56 +01:00
• f2314ca673 Use proposed coding style Tobias Loose 2013-11-17 21:05:07 +01:00
• 94c3ac9ad9 Fix FTBFS Tobias Loose 2013-11-17 21:02:08 +01:00
• 5d453c6716 Fixes compilation on Linux. xawotihs 2013-11-17 20:22:30 +01:00
• 5419d87e4e Get rid of two more define groups. Tobias Loose 2013-11-17 20:22:03 +01:00
• e1213d1c1f Remove variables flagged for removal (via conditional TODO comment) Tobias Loose 2013-11-17 19:50:17 +01:00
• 446ed20758 Fix typo ActionLayer::receiveEventPlus(...) Tobias Loose 2013-11-17 19:38:14 +01:00
• 7a48c5e087 Fix some cppcheck warnings (mostly style and postfix vs prefix iteration) Tobias Loose 2013-11-17 19:36:24 +01:00
• b177a5ff22 Fixes Renderer creator. xawotihs 2013-11-17 19:27:27 +01:00
• 958440d909 More PSP compilation fixes xawotihs 2013-11-17 19:07:22 +01:00
• 422bb430d4 More compilation fixes for PSP xawotihs 2013-11-17 18:55:52 +01:00
• d052ae1667 Tries to fix the PSP build xawotihs 2013-11-17 18:47:06 +01:00
• 2c2edad8e5 Merge branch 'master' of https://github.com/WagicProject/wagic into wp8 Fixe timer in Qt frontend Fixe ExtraCost compilation (uses boost when not on WP8). xawotihs 2013-11-17 18:33:52 +01:00
• 3ca2f1c1ed Replace defines in Damage.h with enums. Tobias Loose 2013-11-17 17:12:58 +01:00
• a6ba983650 Added WRL frontend for Win8 and WP8 Merged Qt, SDL and WRL frontend on the same corewrapper Moved OpenGL code out of SDL and Qt frontends to OpenGl backend (JGfx.cpp) Updated file system and network code to be compatible with WRL xawotihs 2013-11-17 16:46:44 +01:00
• 146872797b ActionElement.h: Replace defines, remove superfluous ";" Tobias Loose 2013-11-17 16:08:29 +01:00
• c6dc51c7d3 Simplify Damage::resolve a bit Tobias Loose 2013-11-17 15:34:23 +01:00
• 0ef92d154a Merge pull request #555 from WagicProject/fix-cranial-plating Dmitry Panin 2013-11-16 13:58:56 -08:00
• 2835bdf767 Fixed issue with Cranial Plating. Dmitry Panin 2013-11-17 01:49:51 +04:00
• afc903e31b Added different names for attach and equip Dmitry Panin 2013-11-17 00:42:34 +04:00
• 6294bb1eed Added Master of Waves Dmitry Panin 2013-11-16 23:54:37 +04:00
• 9f16b2208d Removes the error, it was perfectly detected by Travis CI. xawotihs 2013-11-09 20:15:00 +01:00
• 0a765b702b Introducing an error to check if Travis reports correctly a compile error with the script. xawotihs 2013-11-09 20:01:57 +01:00
• 82de6f2840 Fixes stupid typo. xawotihs 2013-11-09 19:51:47 +01:00
• 90652fa73d Fixed PSP build and integrates it with Travis CI xawotihs 2013-11-09 19:40:01 +01:00
• 9ac28d35a2 Adds missing zlib header, VS project files for JPEG and PNG libs xawotihs 2013-11-09 01:25:03 +01:00
• 45a3d4b835 Adds the zlib sources for wp8 support xawotihs 2013-11-09 01:20:39 +01:00
• e8c73aaf9d Merge pull request #1 from WagicProject/android_cleanup Rolzad73 2013-11-07 13:15:41 -08:00
• f95094a429 removing commented lines I had intended to delete outright Rolzad73 2013-11-07 15:56:43 -05:00
• 7a57de6608 removed ads on Android version Rolzad73 2013-11-07 15:49:53 -05:00
• 14c2d522c2 removed Android gen dir Rolzad73 2013-11-07 15:04:37 -05:00
• 6bf2147d94 From the Vault: Twenty Dmitry Panin 2013-11-06 12:55:31 +04:00
• fea5b04a77 Fixed compilation on Windows. xawotihs 2013-10-31 23:48:19 +01:00
• ea98b769a7 Merge branch 'develop' xawotihs 2013-10-30 23:10:03 +01:00
• 017f6dd1ed Deactivated part of the traces outputted by the testsuite to make Travis happy. xawotihs 2013-10-30 22:58:04 +01:00
• 784d127a6e I think I got it ... messy / not appearing at the end of folders in the travis linux where it appears fine on mine :( xawotihs 2013-10-30 22:28:09 +01:00
• f6c47b85e3 More debug xawotihs 2013-10-30 22:02:43 +01:00
• dac31994b6 Adding traces for important directories. xawotihs 2013-10-30 21:44:23 +01:00
• 74280aef1d Added some traces in the primitives and sets loading. xawotihs 2013-10-30 20:50:34 +01:00