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
xawotihs
0a765b702b
Introducing an error to check if Travis reports correctly a compile
...
error with the script.
2013-11-09 20:01:57 +01:00
xawotihs
82de6f2840
Fixes stupid typo.
2013-11-09 19:51:47 +01:00
xawotihs
90652fa73d
Fixed PSP build and integrates it with Travis CI
2013-11-09 19:40:01 +01:00
Rolzad73
e8c73aaf9d
Merge pull request #1 from WagicProject/android_cleanup
...
Android cleanup
2013-11-07 13:15:41 -08:00
Rolzad73
f95094a429
removing commented lines I had intended to delete outright
2013-11-07 15:56:43 -05:00
Rolzad73
7a57de6608
removed ads on Android version
2013-11-07 15:49:53 -05:00
Rolzad73
14c2d522c2
removed Android gen dir
2013-11-07 15:04:37 -05:00
Dmitry Panin
6bf2147d94
From the Vault: Twenty
...
// imported accidental commit from svn repo
2013-11-06 12:56:54 +04:00
xawotihs
fea5b04a77
Fixed compilation on Windows.
2013-10-31 23:48:19 +01:00
xawotihs
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
xawotihs
017f6dd1ed
Deactivated part of the traces outputted by the testsuite to make Travis
...
happy.
2013-10-30 22:58:04 +01:00
xawotihs
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
xawotihs
f6c47b85e3
More debug
2013-10-30 22:02:43 +01:00
xawotihs
dac31994b6
Adding traces for important directories.
2013-10-30 21:44:23 +01:00
xawotihs
74280aef1d
Added some traces in the primitives and sets loading.
2013-10-30 20:50:34 +01:00
xawotihs
8013d09e4f
Reactivated wagic console in travis CI
2013-10-30 20:30:33 +01:00
Dmitry Panin
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
xawotihs
57c9940244
Deactivated testsuite from travis, resources are not loaded correctly.
2013-10-30 00:38:34 +01:00
xawotihs
db1c552321
Tries to work around crash of the testsuite in Travis.
2013-10-30 00:20:58 +01:00
xawotihs
f08f0ad3b9
Merge branch 'master' of https://github.com/WagicProject/wagic
...
Conflicts:
JGE/include/JTypes.h
2013-10-29 23:36:07 +01:00
xawotihs
a3a1bc2b79
Created a dedicate console Qt based wagic application and run it in the
...
travis file.
2013-10-29 22:38:37 +01:00
Dmitry Panin
9037699281
Added missing test for syncopate + 2 tests for spell_rupture
2013-10-29 19:49:31 +04:00
Michael Nguyen
8d66f82179
Merge branch 'release/wagic-v0.19.2'
2013-10-28 16:19:28 -07:00
Michael Nguyen
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
Michael Nguyen
38725aaeac
Merge commit '82171773fe89cd582e62a52fdadb152040fc0fd5' into develop
2013-10-28 15:37:35 -07:00
Michael Nguyen
ed474d6b5d
Merge commit '224c94e89089317fac33aacb9319ab250301c98e' into develop
2013-10-28 15:37:24 -07:00
Michael Nguyen
b17d9d3f85
Merge branch 'master' of github.com:WagicProject/wagic
2013-10-28 15:35:45 -07:00
Michael Nguyen
c5190a62cd
Merge branch 'develop'
2013-10-28 15:35:18 -07:00
Michael Nguyen
89472eeccd
tidied up gitignore file for XCode
2013-10-28 15:29:51 -07:00
Michael Nguyen
2b4404f352
Merge branch 'feature/update-for-iOS6' into develop
2013-10-28 15:21:33 -07:00
Michael Nguyen
84ca7457b5
updaed for iOS6
2013-10-28 15:20:35 -07:00
Michael Nguyen
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
Michael Nguyen
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
xawotihs
82171773fe
revert travis config file while the X dependency is not sorted.
2013-10-28 00:07:55 +01:00
Unknown
224c94e890
Included some testsuite into qtmain and updated travis file to try to use it.
2013-10-27 23:06:29 +01:00
Dmitry Panin
7a7bc70773
Update README.md
2013-10-27 13:36:23 +03:00
Dmitry Panin
1401fef37e
Simple support for CI at travis
...
- now compilataion on Linux (using qmake and make) is checked
2013-10-27 14:30:34 +04:00
