xawotihs
28ec24430d
Fixed SDL build with mingw. In particular, replaced boost dependency by c++11.
2013-12-08 22:30:25 +01:00
xawotihs
3af4546ef7
Merge branch 'master' into wp8
2013-12-08 14:17:42 +01:00
xawotihs
ee217e94a8
Fixed carousel pull request with Visual Studio.
2013-12-07 20:29:42 +01:00
Tobias Loose
aaceb3c038
Remove unused declaration
2013-12-07 13:33:16 +01:00
Tobias Loose
14c164364e
Cleanups and state reduction.
...
This mainly moves datamembers around and tries to avoid caching of
results of calculations when the calculations are cheap.
2013-12-07 12:58:20 +01:00
Tobias Loose
4514725aba
Make the eased value a reference and add source code doc to Easing.h
...
This allows to apply multiple easings to the same variable.
2013-12-07 10:05:26 +01:00
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
f550784973
Merge branch 'master' into wp8
...
Conflicts:
JGE/src/Qtmain.cpp
2013-11-29 22:31:20 +01: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
xawotihs
ac54bf32d3
Merge branch 'master' into wp8
2013-11-26 05:09:34 +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
xawotihs
ca3084221c
Merged Master branch into wp8
2013-11-22 17:21:25 +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
xawotihs
2c2edad8e5
Merge branch 'master' of https://github.com/WagicProject/wagic into wp8
...
Fixe timer in Qt frontend
Fixe ExtraCost compilation (uses boost when not on WP8).
2013-11-17 18:33:52 +01:00
Tobias Loose
3ca2f1c1ed
Replace defines in Damage.h with enums.
2013-11-17 17:12:58 +01:00
xawotihs
a6ba983650
Added WRL frontend for Win8 and WP8
...
Merged Qt, SDL and WRL frontend on the same corewrapper
Moved OpenGL code out of SDL and Qt frontends to OpenGl backend
(JGfx.cpp)
Updated file system and network code to be compatible with WRL
2013-11-17 16:46:44 +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
