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
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
Tobias Loose
3e94de985f
Add more include guards
2013-11-23 16:25:14 +01:00
Tobias Loose
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
Tobias Loose
1e8fc81aa3
Add/fix broken include guards
2013-11-23 16:09:11 +01:00
Tobias Loose
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
Dmitry Panin
678a4734bb
Merge pull request #560 from ZobyTwo/dead_code
...
Remove some dead code
2013-11-22 00:09:40 -08:00
Dmitry Panin
052e3abdb8
Small fix in match_and ( [-color1; -color2] was handled incorrectly )
2013-11-22 01:03:07 +04:00
citiral
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
Dmitry Panin
ffbb228d2d
Fixed wrong activation cost in dragon hatchling
2013-11-21 14:25:01 +04:00
Dmitry Panin
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
Tobias Loose
3cee80e3bc
Delete another unused file (GuiMessageBox.cpp)
2013-11-20 14:01:59 +01:00
Tobias Loose
8209716fc9
Remove unused file
2013-11-20 13:53:15 +01:00
Tobias Loose
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
Tobias Loose
9c282aeb56
Remove CardEffect.o from Makefile
2013-11-20 12:02:33 +01:00
Tobias Loose
bbc310dec7
Remove some dead code
2013-11-20 11:43:27 +01:00
Dmitry Panin
a37af1776a
Merge pull request #557 from ZobyTwo/defines
...
Defines/Typos
2013-11-20 02:34:32 -08:00
Tobias Loose
35697a65b4
Use style guide
2013-11-20 11:13:35 +01:00
Tobias Loose
6bed1666be
Merge branch 'master' into defines
2013-11-20 11:06:41 +01:00
Tobias Loose
f021866368
Merge remote-tracking branch 'wp/master'
2013-11-20 11:06:28 +01:00
xawotihs
d7e527166c
Merge branch 'show-output-only-for-failing-tests'
2013-11-19 11:14:41 +01:00
Dmitry Panin
071a487100
Fixed compilation error
2013-11-19 11:06:31 +04:00
Dmitry Panin
f370899a8a
Thread-safe version of OutputCapturer
2013-11-19 03:58:43 +04:00
Dmitry Panin
331e126787
Added info about total number of tests
2013-11-19 02:57:42 +04:00
Dmitry Panin
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
Tobias Loose
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
Tobias Loose
f2314ca673
Use proposed coding style
2013-11-17 21:05:07 +01:00
Tobias Loose
94c3ac9ad9
Fix FTBFS
2013-11-17 21:02:08 +01:00
Tobias Loose
5419d87e4e
Get rid of two more define groups.
2013-11-17 20:22:03 +01:00
Tobias Loose
e1213d1c1f
Remove variables flagged for removal (via conditional TODO comment)
...
x and y is provided by PlayGuiObject::Pos.
2013-11-17 19:50:17 +01:00
Tobias Loose
446ed20758
Fix typo ActionLayer::receiveEventPlus(...)
...
This method is rarely used, however it returned 0 after adding stuff.
It now returns the sum.
2013-11-17 19:39:46 +01:00
Tobias Loose
7a48c5e087
Fix some cppcheck warnings (mostly style and postfix vs prefix iteration)
2013-11-17 19:36:24 +01:00
Tobias Loose
3ca2f1c1ed
Replace defines in Damage.h with enums.
2013-11-17 17:12:58 +01:00
Tobias Loose
146872797b
ActionElement.h: Replace defines, remove superfluous ";"
...
Defines do not follow scope rules, but enums do. Enum classes
even utilize strong type checking (but i am not sure about compiler
support for c++11 on all target platforms).
2013-11-17 16:08:29 +01:00
Tobias Loose
c6dc51c7d3
Simplify Damage::resolve a bit
2013-11-17 15:37:56 +01:00
Dmitry Panin
0ef92d154a
Merge pull request #555 from WagicProject/fix-cranial-plating
...
Fix cranial plating
2013-11-16 13:58:56 -08:00
Dmitry Panin
2835bdf767
Fixed issue with Cranial Plating.
...
Issue
attach then equip: plating will give bonus to both creatures
Fix
Changed "attach" to "retarget target(creature|mybattlefield)"
as this doesnot admit this bug
Attach should become deprecated in future
2013-11-17 01:49:51 +04:00
Dmitry Panin
afc903e31b
Added different names for attach and equip
...
+ moved implementation of AEquip to .cpp
2013-11-17 00:44:37 +04:00
Dmitry Panin
6294bb1eed
Added Master of Waves
2013-11-16 23:54:37 +04:00
xawotihs
9f16b2208d
Removes the error, it was perfectly detected by Travis CI.
2013-11-09 20:15:00 +01:00
