Jeck - Added full filtering system to deck editor and shop. I've spent 24hours on pure debugging, but there are likely a couple bugs I've missed. So please, if you find something, make an issue of it! :P Also split OptionItem classes into separate files, and added support for mixed-set boosters (which I think are way, way cool).

projects/mtg/src/GameStateTransitions.cpp

@@ -7,7 +7,6 @@
 #include "../include/Translate.h"
 #include "../include/OptionItem.h"
 #include "../include/GameOptions.h"
-#include "../include/DeckDataWrapper.h"
 
 TransitionBase::TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration): GameState(parent){
   from = _from;
@@ -15,7 +14,12 @@ TransitionBase::TransitionBase(GameApp* parent, GameState* _from, GameState* _to
   mDuration = duration;
   bAnimationOnly = false;
 }
-
+TransitionBase::~TransitionBase(){
+  if(!bAnimationOnly){
+    if(from)
+      from->End();
+  }
+}
 void TransitionBase::Update(float dt){
   if(from && !Finished())
     from->Update(dt);  
@@ -36,12 +40,7 @@ void TransitionBase::Start() {
 void TransitionBase::End() {
   mElapsed = 0;
 };
-TransitionBase::~TransitionBase(){
-  if(!bAnimationOnly){
-    if(from)
-      from->End();
-  }
-}
+
 void TransitionFade::Render(){
   if(from)
     from->Render();