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
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
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
7a48c5e087
Fix some cppcheck warnings (mostly style and postfix vs prefix iteration)
2013-11-17 19:36:24 +01:00
3ca2f1c1ed
Replace defines in Damage.h with enums.
2013-11-17 17:12:58 +01:00
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
c6dc51c7d3
Simplify Damage::resolve a bit
2013-11-17 15:37:56 +01:00
0ef92d154a
Merge pull request #555 from WagicProject/fix-cranial-plating
...
Fix cranial plating
2013-11-16 13:58:56 -08:00
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
afc903e31b
Added different names for attach and equip
...
+ moved implementation of AEquip to .cpp
2013-11-17 00:44:37 +04:00
6294bb1eed
Added Master of Waves
2013-11-16 23:54:37 +04:00
9f16b2208d
Removes the error, it was perfectly detected by Travis CI.
2013-11-09 20:15:00 +01:00
0a765b702b
Introducing an error to check if Travis reports correctly a compile
...
error with the script.
2013-11-09 20:01:57 +01:00
82de6f2840
Fixes stupid typo.
2013-11-09 19:51:47 +01:00
90652fa73d
Fixed PSP build and integrates it with Travis CI
2013-11-09 19:40:01 +01:00
e8c73aaf9d
Merge pull request #1 from WagicProject/android_cleanup
...
Android cleanup
2013-11-07 13:15:41 -08:00
f95094a429
removing commented lines I had intended to delete outright
2013-11-07 15:56:43 -05:00
7a57de6608
removed ads on Android version
2013-11-07 15:49:53 -05:00
14c2d522c2
removed Android gen dir
2013-11-07 15:04:37 -05:00
6bf2147d94
From the Vault: Twenty
...
// imported accidental commit from svn repo
2013-11-06 12:56:54 +04:00
fea5b04a77
Fixed compilation on Windows.
2013-10-31 23:48:19 +01:00
ea98b769a7
Merge branch 'develop'
...
Activates full testsuite run in Travis CI. Travis will complain as soon as at least one testcase does not pass successfully after a new commit.
2013-10-30 23:10:03 +01:00
017f6dd1ed
Deactivated part of the traces outputted by the testsuite to make Travis
...
happy.
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 :(
2013-10-30 22:28:09 +01:00
f6c47b85e3
More debug
2013-10-30 22:02:43 +01:00
dac31994b6
Adding traces for important directories.
2013-10-30 21:44:23 +01:00
74280aef1d
Added some traces in the primitives and sets loading.
2013-10-30 20:50:34 +01:00
Tobias Loose
Dmitry Panin
citiral
xawotihs
Rolzad73
xawotihs