28ec24430d
Fixed SDL build with mingw. In particular, replaced boost dependency by c++11.
2013-12-08 22:30:25 +01:00
3af4546ef7
Merge branch 'master' into wp8
2013-12-08 14:17:42 +01:00
bdd0e6c042
Reset positions and filters when reopening the editor
2013-12-07 20:47:50 +01:00
ee217e94a8
Fixed carousel pull request with Visual Studio.
2013-12-07 20:29:42 +01:00
5efa7e10bd
Remove test debug output. Fix HUD fading.
2013-12-07 13:01:14 +01:00
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
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
2b0f50bb88
Remove redundancy and make control flow a bit simpler
2013-12-07 09:04:24 +01:00
31b353c5ec
Use easing within the carousel view sliding
2013-12-06 21:04:21 +01:00
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
2002bb4e16
Fix crash that occured when opening the editor a second time
2013-12-06 20:13:30 +01:00
7e9c4ddbdd
Fix logic error in optimization introduced in last commit
2013-12-06 19:53:38 +01:00
12b71de63c
Render small cards as thumbnails
2013-12-06 19:51:42 +01:00
15011961f4
Do only prefetch cards if resource management is threaded
2013-12-06 16:43:09 +01:00
93d1a637b6
Style guide
2013-12-05 23:22:50 +01:00
cbe6c0c842
Parameterize animations in grid deck view
2013-12-05 23:06:32 +01:00
077ab10c05
Rename Button to ButtonPressed
2013-12-05 23:06:32 +01:00
1194463349
Let the deck view base class handle buttons
2013-12-05 23:06:32 +01:00
8de50532f2
Put easing code into Easing.h. Add easing to sliding
2013-12-05 23:06:31 +01:00
334454655d
Add Easing code to make scrolling in grid view more fluid
2013-12-05 23:06:31 +01:00
0c72bfd4c4
Make deck views toggleable
2013-12-05 23:06:30 +01:00
55e0366f19
Move griddeckview implementation into source file
2013-12-05 23:06:30 +01:00
667b95f2b8
Refactor gamestatedeckviewer and add a grid view suited...
...
for bigger screens.
2013-12-05 23:06:30 +01:00
e90f6fe224
Whitespaces and add button to toggle griv/scrolling view
2013-12-05 23:06:30 +01:00
0d4db9ee54
Fixed bug in alternative cost when playing lands
2013-12-02 04:33:39 +04:00
ae927576c5
Draft of new feature: canplayfromgraveyard
...
this will allow playing cards from graveyard
examples: tbd
2013-12-02 04:20:04 +04:00
f08ddac77b
Fixed formatting
2013-12-02 04:16:25 +04:00
9effa7c975
Slightly changed formatting while investigating src
2013-12-01 01:01:57 +04:00
a70259b5ba
Fixed: Assembly-Worker didn't appear as creature type
...
For artifact creatures the parent type TYPE_ARTIFACT was used
and therefore that creature's subtype wasn't added in full list.
2013-12-01 00:59:16 +04:00
f550784973
Merge branch 'master' into wp8
...
Conflicts:
JGE/src/Qtmain.cpp
2013-11-29 22:31:20 +01:00
4095676b6b
Fixed memory leak introduced in #555
2013-11-29 22:07:45 +01:00
bedd1e8da8
Merge branch 'valgrind' of https://github.com/ZobyTwo/wagic into ZobyTwo-valgrind
2013-11-29 19:41:46 +01:00
031f2dbffb
Fix Valgrind warnings appearing during the test suit.
2013-11-29 18:21:53 +01:00
69c6745f53
Make getMenuText() return string.
2013-11-29 13:33:33 +01:00
6f083389c2
Speedup MTGAllCards::countByType a bit
2013-11-29 11:51:58 +01:00
9ee44ca091
Substitute more char arrays with strings
2013-11-29 11:51:22 +01:00
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
672b0be7bd
Fix a few string bugs add StartsWith for strings
2013-11-29 11:38:49 +01:00
9d5a83d588
Replace more strcmp with std::string::compare or std::string::operator==.
...
This commit also enables TinyXML STL support.
2013-11-28 16:42:29 +01:00
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
c85d857604
Replace constness cast
2013-11-28 16:42:29 +01:00
f68568cc1e
Replace strcmp with c++ equivalent when comparing std::strings.
2013-11-28 16:42:29 +01:00
a43854420d
Fixed compilation issue on Windows
2013-11-27 20:33:59 +01:00
294c396417
Fixed compilation issues
2013-11-26 06:07:23 +01:00
ac54bf32d3
Merge branch 'master' into wp8
2013-11-26 05:09:34 +01:00
a695323bc7
Merge pull request #564 from ZobyTwo/cleanup_1
...
Add a few namespaces and fix header guards.
2013-11-25 15:42:18 -08:00
fd6bc95539
Merge pull request #562 from citiral/master
...
Updated deckmenu.cpp to properly render deck description and summary
2013-11-24 10:28:05 -08:00
0bb211a581
Remove unused global variables from DeckStats.cpp and add proper...
...
member variable initialization.
2013-11-24 09:18:34 +01:00
e0428ac7b0
Avoid more conflicts. We could now do unit builds...
...
and make the linker put every data element and function into its own section.
On linktime, we can output every discarded section and get a list of dead
code (for that build).
2013-11-23 17:04:24 +01:00
9f0b70d1c9
Put constans into extra namespace as kBackToMainMenuID...
...
collides with itself. GameStateAwards::kBackToMainMenuID and
GameStateOptions::kBackToMainMenuID define those with different
values.
2013-11-23 16:18:45 +01:00
xawotihs
Tobias Loose
Dmitry Panin
xawotihs