diff --git a/JGE/Dependencies/lib/libjpeg-static-mt-debug.pdb b/JGE/Dependencies/lib/libjpeg-static-mt-debug.pdb
deleted file mode 100644
index 5e7dbba29..000000000
Binary files a/JGE/Dependencies/lib/libjpeg-static-mt-debug.pdb and /dev/null differ
diff --git a/JGE/Dependencies/lib/libjpeg-static-mt.pdb b/JGE/Dependencies/lib/libjpeg-static-mt.pdb
deleted file mode 100644
index 0c108332a..000000000
Binary files a/JGE/Dependencies/lib/libjpeg-static-mt.pdb and /dev/null differ
diff --git a/projects/mtg/include/Easing.h b/projects/mtg/include/Easing.h
index 507b0a26a..ccacd4a78 100644
--- a/projects/mtg/include/Easing.h
+++ b/projects/mtg/include/Easing.h
@@ -187,12 +187,12 @@ public:
float time_tmp = (time_acc * 2) / duration;
if (time_tmp < 1)
{
- value = delta_value * 0.5 * time_tmp * time_tmp + start_value;
+ value = (float)(delta_value * 0.5 * time_tmp * time_tmp + start_value);
}
else
{
time_tmp -= 1;
- value = - delta_value * 0.5 * (time_tmp * (time_tmp - 2) - 1) + start_value;
+ value = (float)(- delta_value * 0.5 * (time_tmp * (time_tmp - 2) - 1) + start_value);
}
}
};
diff --git a/projects/mtg/src/CarouselDeckView.cpp b/projects/mtg/src/CarouselDeckView.cpp
index bf2ec4ea0..0499f7aff 100644
--- a/projects/mtg/src/CarouselDeckView.cpp
+++ b/projects/mtg/src/CarouselDeckView.cpp
@@ -141,7 +141,7 @@ MTGCard * CarouselDeckView::Click(int x, int y)
void CarouselDeckView::changePosition(int offset)
{
- mScrollEasing.start(offset, 0.3f*abs(offset));
+ mScrollEasing.start((float)offset, (float)(0.3f*abs(offset)));
last_user_activity = 0;
}
diff --git a/projects/mtg/template.vcxproj b/projects/mtg/template.vcxproj
index 9fe22b571..912ece289 100644
--- a/projects/mtg/template.vcxproj
+++ b/projects/mtg/template.vcxproj
@@ -318,6 +318,12 @@
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
@@ -329,6 +335,12 @@
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
@@ -362,6 +374,12 @@
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
@@ -459,6 +477,7 @@
+
@@ -471,7 +490,9 @@
+
+
@@ -486,6 +507,7 @@
+
diff --git a/projects/mtg/template.vcxproj.filters b/projects/mtg/template.vcxproj.filters
index 0d874bf5b..0e2cdef9e 100644
--- a/projects/mtg/template.vcxproj.filters
+++ b/projects/mtg/template.vcxproj.filters
@@ -331,6 +331,15 @@
src
+
+ src
+
+
+ src
+
+
+ src
+
@@ -681,6 +690,18 @@
inc
+
+ inc
+
+
+ inc
+
+
+ inc
+
+
+ inc
+