Version 1.1.3

Maintenance version
Kanma · May 8, 2014 · 8fcb76a · 8fcb76a
2 parents 18f1912 + 0a9931b
commit 8fcb76a
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,14 @@
+language: cpp
+
+compiler:
+  - clang
+  - gcc
+
+env:
+  - CMAKE_BUILD_TYPE=Debug
+  - CMAKE_BUILD_TYPE=Release
+
+script:
+  - mkdir build
+  - cd build
+  - cmake -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} .. && make
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ endif()
 
 set(ATHENA_PHYSICS_VERSION_MAJOR 1)
 set(ATHENA_PHYSICS_VERSION_MINOR 1)
-set(ATHENA_PHYSICS_VERSION_PATCH 2)
+set(ATHENA_PHYSICS_VERSION_PATCH 3)
 set(ATHENA_PHYSICS_VERSION_SUFFIX "")
 
 

diff --git a/README b/README
@@ -1,7 +1,7 @@
 ********************************************************************************
 *                                                                              *
 *                               Athena-Physics                                 *
-*                               Version 1.1.2                                  *
+*                               Version 1.1.3                                  *
 *                    http://github.com/Kanma/Athena-Physics                    *
 *                                                                              *
 ********************************************************************************

diff --git a/dependencies/Athena-Core b/dependencies/Athena-Core
diff --git a/dependencies/Athena-Entities b/dependencies/Athena-Entities
diff --git a/dependencies/Athena-Math b/dependencies/Athena-Math
diff --git a/dependencies/XMake b/dependencies/XMake
diff --git a/src/PrimitiveShape.cpp b/src/PrimitiveShape.cpp
@@ -236,6 +236,10 @@ Math::Real PrimitiveShape::getRadius() const
 
         case SHAPE_SPHERE:
             return dynamic_cast<btSphereShape*>(m_pCollisionShape)->getRadius();
+
+        case SHAPE_BOX:
+            // Nothing to do, but the compiler complains if not present
+            break;
     }
 
     return 0.0f;
@@ -268,6 +272,11 @@ Math::Real PrimitiveShape::getHeight() const
                 case AXIS_Z:
                     return dynamic_cast<btCylinderShape*>(m_pCollisionShape)->getHalfExtentsWithMargin().getZ();
             }
+
+        case SHAPE_BOX:
+        case SHAPE_SPHERE:
+            // Nothing to do, but the compiler complains if not present
+            break;
     }
 
     return 0.0f;
+14 −0		.travis.yml
+1 −1		CMakeLists.txt
+1 −1		LICENSE
+1 −1		README
+1 −1		dependencies/Athena-Math
+1 −1		dependencies/XMake
+3 −16		include/Athena-Core/Log/LogManager.h
+3 −2		src/Data/DataStream.cpp
+5 −1		src/Data/LocationManager.cpp
+8 −0		src/Data/Serialization.cpp
+1 −0		src/Log/ConsoleLogListener.cpp
+24 −1		src/Log/LogManager.cpp
+4 −0		src/Scripting.cpp
+7 −6		src/Utils/PropertiesList.cpp
+198 −92		src/Utils/Variant.cpp
+1 −1		unittests/Athena-Core/tests/test_Variant.cpp
+16 −0		.travis.yml
+1 −1		CMakeLists.txt
+1 −1		README
+1 −1		dependencies/XMake
+1 −1		include/Athena-Math/Prerequisites.h