9ee44ca091
Substitute more char arrays with strings
2013-11-29 11:51:22 +01:00
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
672b0be7bd
Fix a few string bugs add StartsWith for strings
2013-11-29 11:38:49 +01:00
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
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
c85d857604
Replace constness cast
2013-11-28 16:42:29 +01:00
f68568cc1e
Replace strcmp with c++ equivalent when comparing std::strings.
2013-11-28 16:42:29 +01:00
89206b3a6b
Added testing that QT GUI build is successfull
2013-11-28 16:44:12 +04:00
a8cff5ed8e
Merge branch 'master' into develop
2013-11-28 02:19:41 -08:00
dc118c64b8
Fixed compilation on Mac
2013-11-27 23:04:46 +01:00
a43854420d
Fixed compilation issue on Windows
2013-11-27 20:33:59 +01:00
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
02a65ecd82
Merge branch 'cleanup_1' of https://github.com/ZobyTwo/wagic into ZobyTwo-cleanup_1
2013-11-26 00:17:48 +01:00
9ff087ecde
Merge pull request #570 from WagicProject/android-travis-ci
...
Android travis ci
2013-11-25 14:31:15 -08:00
47685f4892
Added installation of 32 bits libs to make Android SDK work.
2013-11-25 22:42:09 +01:00
7aaebdc661
Merge branch 'android_build_fix' into android-travis-ci
2013-11-25 21:23:58 +01:00
8aa0b8cea0
reverting sdk.buildtools change
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
2013-11-25 11:54:19 -05:00
9889186eab
Added missing "echo" statement
2013-11-25 13:41:29 +04:00
73f9319b92
Activates Android build from Travis
2013-11-25 05:27:31 +01:00
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
0bb211a581
Remove unused global variables from DeckStats.cpp and add proper...
...
member variable initialization.
2013-11-24 09:18:34 +01:00
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
3e94de985f
Add more include guards
2013-11-23 16:25:14 +01:00
9f0b70d1c9
Put constans into extra namespace as kBackToMainMenuID...
...
collides with itself. GameStateAwards::kBackToMainMenuID and
GameStateOptions::kBackToMainMenuID define those with different
values.
2013-11-23 16:18:45 +01:00
1e8fc81aa3
Add/fix broken include guards
2013-11-23 16:09:11 +01:00
352e3c2daa
Remove makros and add undefs to avoid clashing names
...
FRAND and Clamp were not used and Clamp collided when doing unit builds.
SQUARE(x) is longer than x*x and if x is an expression it gets evaluated
twice.
2013-11-23 16:03:04 +01:00
678a4734bb
Merge pull request #560 from ZobyTwo/dead_code
...
Remove some dead code
2013-11-22 00:09:40 -08:00
052e3abdb8
Small fix in match_and ( [-color1; -color2] was handled incorrectly )
2013-11-22 01:03:07 +04:00
73c2d17080
Updated deckmenu.cpp to properly render deck description and summary
...
Deck description and statistics were being drawn as black text, this made it invisible as it was rendered over a black background. I made it change the color to white before drawing, so its shown as its suposed to be.(Did the default text color change?)
2013-11-21 20:38:41 +01:00
ffbb228d2d
Fixed wrong activation cost in dragon hatchling
2013-11-21 14:25:01 +04:00
306765c6b6
Merge pull request #561 from ZobyTwo/valgrind
...
Fix some valgrind memcheck warnings. However there remains one...
... within the threaded texture cache. Once it is resized, some textures
in GetQuad(...) (WCachedResource.cpp:102/103) have uninitialized widths/heights.
2013-11-21 01:58:49 -08:00
3cee80e3bc
Delete another unused file (GuiMessageBox.cpp)
2013-11-20 14:01:59 +01:00
8209716fc9
Remove unused file
2013-11-20 13:53:15 +01:00
e76c57d747
Fix some valgrind memcheck warnings. However there remains one...
...
... within the threaded texture cache. Once it is resized, some textures
in GetQuad(...) (WCachedResource.cpp:102/103) have uninitialized widths/heights.
2013-11-20 12:56:33 +01:00
9c282aeb56
Remove CardEffect.o from Makefile
2013-11-20 12:02:33 +01:00
bbc310dec7
Remove some dead code
2013-11-20 11:43:27 +01:00
a37af1776a
Merge pull request #557 from ZobyTwo/defines
...
Defines/Typos
2013-11-20 02:34:32 -08:00
35697a65b4
Use style guide
2013-11-20 11:13:35 +01:00
6bed1666be
Merge branch 'master' into defines
2013-11-20 11:06:41 +01:00
f021866368
Merge remote-tracking branch 'wp/master'
2013-11-20 11:06:28 +01:00
d7e527166c
Merge branch 'show-output-only-for-failing-tests'
2013-11-19 11:14:41 +01:00
071a487100
Fixed compilation error
2013-11-19 11:06:31 +04:00
f370899a8a
Thread-safe version of OutputCapturer
2013-11-19 03:58:43 +04:00
331e126787
Added info about total number of tests
2013-11-19 02:57:42 +04:00
6c41e5c92c
Added option (#define CAPTURE_STDERR)
...
if set then the DebugTrace calls only for failing tests are shown
2013-11-19 02:41:30 +04:00
82e3ab3977
Merge branch 'cleanup' into defines
...
Merge cleanup codings style commit as i accidentally used that branch as
the base.
2013-11-17 21:06:56 +01:00
f2314ca673
Use proposed coding style
2013-11-17 21:05:07 +01:00
94c3ac9ad9
Fix FTBFS
2013-11-17 21:02:08 +01:00
5419d87e4e
Get rid of two more define groups.
2013-11-17 20:22:03 +01:00
Tobias Loose
Dmitry Panin
Michael Nguyen
xawotihs
xawotihs
Rolzad73
citiral