Tobias Loose
2289fffb8d
Do not ftbfs when in release mode (-weror, -wunused-.. combination)
2013-12-05 23:06:30 +01:00
Xawotihs
a8391112b0
Merge pull request #576 from ZobyTwo/directories_1
...
Do not specify the system directory in JGE
2013-12-04 13:07:05 -08:00
Rolzad73
4257592568
Updated output of info about Android APIs
2013-12-04 12:58:22 -05:00
Tobias Loose
657479e0e4
Do not specify the system directory in JGE
2013-12-04 11:58:36 +01:00
Dmitry Panin
9e969881fd
Added output of info about Android APIs
2013-12-04 12:04:54 +04:00
Dmitry Panin
2b434a7182
Merge pull request #575 from WagicProject/android_travis_sdk_downgrade
...
Changed Travis build file to use Android API 10 and Android build tools 18.1.1
2013-12-04 00:02:49 -08:00
Rolz73
d2e41f98c3
Changed Travis build file to use Android API 10 and Android build tools 18.1.1
2013-12-03 02:36:11 -05:00
Xawotihs
318fc98a39
Merge pull request #574 from WagicProject/feature/play-from-grave
...
Feature/play from grave
2013-12-02 12:34:52 -08:00
Dmitry Panin
b7a4b7f6b9
Fixing Yawgmoth's will
2013-12-02 21:26:55 +04:00
Dmitry Panin
ed03fb744d
Added [Yawgmoth's Will]
2013-12-02 13:42:31 +04:00
Dmitry Panin
02be213d1e
Test for keyword "CanPlayFromGraveyard"
...
Also added card [Crucible of Worlds] as example of it.
2013-12-02 04:36:58 +04:00
Dmitry Panin
0d4db9ee54
Fixed bug in alternative cost when playing lands
2013-12-02 04:33:39 +04:00
Dmitry Panin
ae927576c5
Draft of new feature: canplayfromgraveyard
...
this will allow playing cards from graveyard
examples: tbd
2013-12-02 04:20:04 +04:00
Dmitry Panin
f08ddac77b
Fixed formatting
2013-12-02 04:16:25 +04:00
Dmitry Panin
9effa7c975
Slightly changed formatting while investigating src
2013-12-01 01:01:57 +04:00
Dmitry Panin
a70259b5ba
Fixed: Assembly-Worker didn't appear as creature type
...
For artifact creatures the parent type TYPE_ARTIFACT was used
and therefore that creature's subtype wasn't added in full list.
2013-12-01 00:59:16 +04:00
xawotihs
bf0a0a1580
Build the graphics version in release instead of debug.
2013-11-30 19:32:55 +01:00
xawotihs
eb8b22b2d5
Merge branch 'master' of https://github.com/WagicProject/wagic
2013-11-30 12:21:43 +01:00
xawotihs
4095676b6b
Fixed memory leak introduced in #555
2013-11-29 22:07:45 +01:00
xawotihs
bedd1e8da8
Merge branch 'valgrind' of https://github.com/ZobyTwo/wagic into ZobyTwo-valgrind
2013-11-29 19:41:46 +01:00
xawotihs
965d4f6d45
Fixes Windows project
2013-11-29 19:31:23 +01:00
Tobias Loose
0db2925e7a
Fix initialization orders
2013-11-29 18:44:30 +01:00
Tobias Loose
031f2dbffb
Fix Valgrind warnings appearing during the test suit.
2013-11-29 18:21:53 +01:00
Tobias Loose
dbece750f8
Use tabs instead of spaces if the file uses tabs
2013-11-29 13:51:13 +01:00
Tobias Loose
6699902c24
Add TIXML_USE_STL to android builds
2013-11-29 13:34:44 +01:00
Tobias Loose
e8407caa2a
Add TIXML_USE_STL compiler flag to psp makefile to make headers compatible
2013-11-29 13:34:35 +01:00
Tobias Loose
69c6745f53
Make getMenuText() return string.
2013-11-29 13:33:33 +01:00
Tobias Loose
6f083389c2
Speedup MTGAllCards::countByType a bit
2013-11-29 11:51:58 +01:00
Tobias Loose
9ee44ca091
Substitute more char arrays with strings
2013-11-29 11:51:22 +01:00
Tobias Loose
3f0dd987f0
Remove bool CardInstance::hasSubtype(const char * _subtype)
...
There exists bool CardInstance::hasSubtype(const string& _subtype) and the
const char* version converts _subtype into string deeper in the call
hierarchy anyway. So both methods did the same.
2013-11-29 11:43:59 +01:00
Tobias Loose
672b0be7bd
Fix a few string bugs add StartsWith for strings
2013-11-29 11:38:49 +01:00
Tobias Loose
9d5a83d588
Replace more strcmp with std::string::compare or std::string::operator==.
...
This commit also enables TinyXML STL support.
2013-11-28 16:42:29 +01:00
Tobias Loose
5d0d130587
Make MTGGameZone::countByType use string instead of char*
...
and replace strcmp with std::string operator== calls.
2013-11-28 16:42:29 +01:00
Tobias Loose
c85d857604
Replace constness cast
2013-11-28 16:42:29 +01:00
Tobias Loose
f68568cc1e
Replace strcmp with c++ equivalent when comparing std::strings.
2013-11-28 16:42:29 +01:00
Dmitry Panin
89206b3a6b
Added testing that QT GUI build is successfull
2013-11-28 16:44:12 +04:00
xawotihs
dc118c64b8
Fixed compilation on Mac
2013-11-27 23:04:46 +01:00
xawotihs
a43854420d
Fixed compilation issue on Windows
2013-11-27 20:33:59 +01:00
xawotihs
a695323bc7
Merge pull request #564 from ZobyTwo/cleanup_1
...
Add a few namespaces and fix header guards.
2013-11-25 15:42:18 -08:00
xawotihs
02a65ecd82
Merge branch 'cleanup_1' of https://github.com/ZobyTwo/wagic into ZobyTwo-cleanup_1
2013-11-26 00:17:48 +01:00
xawotihs
9ff087ecde
Merge pull request #570 from WagicProject/android-travis-ci
...
Android travis ci
2013-11-25 14:31:15 -08:00
xawotihs
47685f4892
Added installation of 32 bits libs to make Android SDK work.
2013-11-25 22:42:09 +01:00
xawotihs
7aaebdc661
Merge branch 'android_build_fix' into android-travis-ci
2013-11-25 21:23:58 +01:00
Rolzad73
8aa0b8cea0
reverting sdk.buildtools change
2013-11-25 13:41:07 -05:00
Rolzad73
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
2013-11-25 11:54:19 -05:00
Dmitry Panin
9889186eab
Added missing "echo" statement
2013-11-25 13:41:29 +04:00
xawotihs
73f9319b92
Activates Android build from Travis
2013-11-25 05:27:31 +01:00
xawotihs
fd6bc95539
Merge pull request #562 from citiral/master
...
Updated deckmenu.cpp to properly render deck description and summary
2013-11-24 10:28:05 -08:00
Tobias Loose
0bb211a581
Remove unused global variables from DeckStats.cpp and add proper...
...
member variable initialization.
2013-11-24 09:18:34 +01:00
Tobias Loose
e0428ac7b0
Avoid more conflicts. We could now do unit builds...
...
and make the linker put every data element and function into its own section.
On linktime, we can output every discarded section and get a list of dead
code (for that build).
2013-11-23 17:04:24 +01:00
