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
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
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
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
90652fa73d
Fixed PSP build and integrates it with Travis CI
2013-11-09 19:40:01 +01: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
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
74280aef1d
Added some traces in the primitives and sets loading.
2013-10-30 20:50:34 +01:00
6bbe290762
Fixed bug with syncopate to consume all the mana available
...
Now pay[[{x}]] is not supported because of this.
use "pay[[{value:storedx}]]" instead
2013-10-30 12:39:08 +04:00
db1c552321
Tries to work around crash of the testsuite in Travis.
2013-10-30 00:20:58 +01:00
f08f0ad3b9
Merge branch 'master' of https://github.com/WagicProject/wagic
...
Conflicts:
JGE/include/JTypes.h
2013-10-29 23:36:07 +01:00
a3a1bc2b79
Created a dedicate console Qt based wagic application and run it in the
...
travis file.
2013-10-29 22:38:37 +01:00
9037699281
Added missing test for syncopate + 2 tests for spell_rupture
2013-10-29 19:49:31 +04:00
eeb4a4e755
updated version number to 0.19.2, changed min target to API 10 vs API 9 as recommended by Android
2013-10-28 16:19:01 -07:00
ed474d6b5d
Merge commit '224c94e89089317fac33aacb9319ab250301c98e' into develop
2013-10-28 15:37:24 -07:00
89472eeccd
tidied up gitignore file for XCode
2013-10-28 15:29:51 -07:00
84ca7457b5
updaed for iOS6
2013-10-28 15:20:35 -07:00
4eb1fd35e0
changed the default location for the sdcard. Instead of using a fixed value of "/sdcard/Wagic/Res" it now uses Environment.getExternalStorageDirectory().getPath() + "/Wagic/Res"
2013-10-28 15:20:11 -07:00
362cc1b4c2
updated project to rotate and display correctly in iOS6+
...
removed all references to adwhirl for iOS.
2013-10-28 15:14:17 -07:00
224c94e890
Included some testsuite into qtmain and updated travis file to try to use it.
2013-10-27 23:06:29 +01:00
cf50b7d403
Fizzle unless pay x (thanks to excessum)
...
- saves source card in storedSourceCard for ATransform
- adds support for WParsedInt in pay as "pay[[{value:WParsedInt}]]":
name=Spell Rupture
target=*|stack
auto=if cantargetcard(*|opponentstack) then transforms((,newability[pay[[{value:power:highest:creature:opponentbattlefield}]] name(pay {value} mana) donothing?fizzle])) forever
text=Counter target spell unless its controller pays {X}, where X is the greatest power among creatures you control.
mana={1}{U}
type=Instant
- adds support for {x} in *some* “pay” abilities (Syncopate):
name=Syncopate
target=*|stack
auto=transforms((,newability[pay[[{x}]] name(pay {value} mana) donothing?fizzleto(exile)])) forever
text=Counter target spell unless its controller pays {X}. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
mana={X}{U}
type=Instant
- support of "name(pay {value} mana)" in pay abilities to show actual number to pay (see example above)
2013-10-27 13:47:00 +04:00
b8b6153cc5
Reworked AVanishing (fixed bugs + more fair implementation)
2013-10-27 13:42:48 +04:00
461eedd626
Fixed bug with preventing Melira from putting +1/+1 counters on creatures you control
2013-10-27 13:42:48 +04:00
4ac376b5f2
Ignored non-source extensions
2013-10-24 21:53:46 +02:00
1f0485ff8e
Support for running the testsuite in command line programs for continuous integration.
...
Here is a small example inspired from SDLmain.c:
g_launcher = new JGameLauncher();
InitGame();
MTGCollection()->loadFolder("sets/primitives/");
MTGCollection()->loadFolder("sets/", "_cards.dat");
options.reloadProfile();
TestSuite testSuite("test/_tests.txt");
int result = testSuite.run();
DestroyGame();
delete g_launcher;
return result;
2013-10-23 22:08:30 +00:00
98861dd916
Fixed memory leaks and refactored a bit the ManaCost class while I was at it.
2013-10-19 14:29:17 +00:00
b5794ad328
Small fixes (misstype, formatting, target p2)
2013-10-18 06:38:15 +00:00
Tobias Loose
xawotihs
Dmitry Panin
Rolzad73
xawotihs
Michael Nguyen
Unknown
Xawotihs@gmail.com
pankdm