Tobias Loose
2b0f50bb88
Remove redundancy and make control flow a bit simpler
2013-12-07 09:04:24 +01:00
Tobias Loose
31b353c5ec
Use easing within the carousel view sliding
2013-12-06 21:04:21 +01:00
Tobias Loose
0d350af1b6
Use easing within the carousel views scrolling
...
It is visible if you scroll more than one card
2013-12-06 20:51:18 +01:00
Tobias Loose
2002bb4e16
Fix crash that occured when opening the editor a second time
2013-12-06 20:13:30 +01:00
Tobias Loose
12b71de63c
Render small cards as thumbnails
2013-12-06 19:51:42 +01:00
Tobias Loose
96aeaffa1b
Style and logic error.
2013-12-05 23:33:43 +01:00
Tobias Loose
8bb58ca3b1
Put boilerplate code into easing base class
2013-12-05 23:27:28 +01:00
Tobias Loose
93d1a637b6
Style guide
2013-12-05 23:22:50 +01:00
Tobias Loose
cbe6c0c842
Parameterize animations in grid deck view
2013-12-05 23:06:32 +01:00
Tobias Loose
77eb7f2777
Add missing header
2013-12-05 23:06:32 +01:00
Tobias Loose
077ab10c05
Rename Button to ButtonPressed
2013-12-05 23:06:32 +01:00
Tobias Loose
1194463349
Let the deck view base class handle buttons
2013-12-05 23:06:32 +01:00
Tobias Loose
8de50532f2
Put easing code into Easing.h. Add easing to sliding
2013-12-05 23:06:31 +01:00
Tobias Loose
334454655d
Add Easing code to make scrolling in grid view more fluid
2013-12-05 23:06:31 +01:00
Tobias Loose
d8d52e185d
Add another missing include
2013-12-05 23:06:31 +01:00
Tobias Loose
0c72bfd4c4
Make deck views toggleable
2013-12-05 23:06:30 +01:00
Tobias Loose
55e0366f19
Move griddeckview implementation into source file
2013-12-05 23:06:30 +01:00
Tobias Loose
667b95f2b8
Refactor gamestatedeckviewer and add a grid view suited...
...
for bigger screens.
2013-12-05 23:06:30 +01:00
Tobias Loose
e90f6fe224
Whitespaces and add button to toggle griv/scrolling view
2013-12-05 23:06:30 +01:00
Dmitry Panin
ae927576c5
Draft of new feature: canplayfromgraveyard
...
this will allow playing cards from graveyard
examples: tbd
2013-12-02 04:20:04 +04:00
Dmitry Panin
f08ddac77b
Fixed formatting
2013-12-02 04:16:25 +04:00
Dmitry Panin
9effa7c975
Slightly changed formatting while investigating src
2013-12-01 01:01:57 +04:00
xawotihs
bedd1e8da8
Merge branch 'valgrind' of https://github.com/ZobyTwo/wagic into ZobyTwo-valgrind
2013-11-29 19:41:46 +01:00
Tobias Loose
031f2dbffb
Fix Valgrind warnings appearing during the test suit.
2013-11-29 18:21:53 +01:00
Tobias Loose
69c6745f53
Make getMenuText() return string.
2013-11-29 13:33:33 +01:00
Tobias Loose
9ee44ca091
Substitute more char arrays with strings
2013-11-29 11:51:22 +01:00
Tobias Loose
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
Tobias Loose
672b0be7bd
Fix a few string bugs add StartsWith for strings
2013-11-29 11:38:49 +01:00
Tobias Loose
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
Tobias Loose
3e94de985f
Add more include guards
2013-11-23 16:25:14 +01:00
Tobias Loose
1e8fc81aa3
Add/fix broken include guards
2013-11-23 16:09:11 +01:00
Tobias Loose
bbc310dec7
Remove some dead code
2013-11-20 11:43:27 +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
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
Dmitry Panin
afc903e31b
Added different names for attach and equip
...
+ moved implementation of AEquip to .cpp
2013-11-17 00:44:37 +04:00
xawotihs
fea5b04a77
Fixed compilation on Windows.
2013-10-31 23:48:19 +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
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
ed474d6b5d
Merge commit '224c94e89089317fac33aacb9319ab250301c98e' into develop
2013-10-28 15:37:24 -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
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
461eedd626
Fixed bug with preventing Melira from putting +1/+1 counters on creatures you control
2013-10-27 13:42:48 +04:00
Xawotihs@gmail.com
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
Xawotihs@gmail.com
98861dd916
Fixed memory leaks and refactored a bit the ManaCost class while I was at it.
2013-10-19 14:29:17 +00:00
pankdm
b5794ad328
Small fixes (misstype, formatting, target p2)
2013-10-18 06:38:15 +00:00
pankdm
38b4213f9c
Refactored formatting for easier reading of the code
2013-10-18 06:38:03 +00:00
pankdm
5c3eb2c405
Changed the owner of ManaCost in LifeorManaCost to itself
2013-10-18 06:37:31 +00:00
