diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 02:11:33 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 02:11:33 +0200 |
| commit | 547115476f363096483197863e8bbc24064a99ef (patch) | |
| tree | 847450158d5fd445326d41115f551d7bb15e356d /dep | |
| parent | 4a29c73403c4dc713a8a31cb96289adff2b910c1 (diff) | |
| parent | 2a36d2bf5b7f14284a499a14f476c4633b1fc0eb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/ArenaTeam.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Spells/spell_warrior.cpp
Diffstat (limited to 'dep')
| -rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix2.diff | 32 | ||||
| -rw-r--r-- | dep/g3dlite/Readme.txt | 1 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/Color3.h | 2 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/Matrix3.h | 4 |
4 files changed, 36 insertions, 3 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix2.diff b/dep/g3dlite/G3D-v9.0 hotfix2.diff new file mode 100644 index 00000000000..6d176e235b3 --- /dev/null +++ b/dep/g3dlite/G3D-v9.0 hotfix2.diff @@ -0,0 +1,32 @@ + dep/g3dlite/include/G3D/Color3.h | 2 +- + dep/g3dlite/include/G3D/Matrix3.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dep/g3dlite/include/G3D/Color3.h b/dep/g3dlite/include/G3D/Color3.h +index 6eedf25..e5c0abc 100644 +--- a/dep/g3dlite/include/G3D/Color3.h ++++ b/dep/g3dlite/include/G3D/Color3.h +@@ -187,7 +187,7 @@ public: + Color3 direction() const; + float squaredLength () const; + float dot (const Color3& rkVector) const; +- float unitize (float fTolerance = 1e-06); ++ float unitize (float fTolerance = 1e-06f); + Color3 cross (const Color3& rkVector) const; + Color3 unitCross (const Color3& rkVector) const; + +diff --git a/dep/g3dlite/include/G3D/Matrix3.h b/dep/g3dlite/include/G3D/Matrix3.h +index 8cfcfe9..13cd410 100644 +--- a/dep/g3dlite/include/G3D/Matrix3.h ++++ b/dep/g3dlite/include/G3D/Matrix3.h +@@ -242,8 +242,8 @@ public: + bool isOrthonormal() const; + + Matrix3 transpose () const; +- bool inverse (Matrix3& rkInverse, float fTolerance = 1e-06) const; +- Matrix3 inverse (float fTolerance = 1e-06) const; ++ bool inverse (Matrix3& rkInverse, float fTolerance = 1e-06f) const; ++ Matrix3 inverse (float fTolerance = 1e-06f) const; + float determinant () const; + + /** singular value decomposition */ diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt index c250c77c71b..7fab7f83e8d 100644 --- a/dep/g3dlite/Readme.txt +++ b/dep/g3dlite/Readme.txt @@ -11,3 +11,4 @@ G3D-v8.0_hotfix7.diff - 2013-08-31 - fix typo in Matrix4 == operator G3D-v8.0_hotfix8.diff - 2013-09-01 - fix typo in Vector3int32 += operator G3D-v8.0_hotfix9.diff - 2014-06-01 - only VS < 10 don't ship inttypes.h G3D-v9.0 hotfix1.diff - 2014-08-22 - updated to G3D9, reapplied previous patches and removed unneeded changes +G3D-v9.0 hotfix2.diff - 2014-08-23 - fix some -Wconversion warnings
\ No newline at end of file diff --git a/dep/g3dlite/include/G3D/Color3.h b/dep/g3dlite/include/G3D/Color3.h index 6eedf252233..e5c0abcb223 100644 --- a/dep/g3dlite/include/G3D/Color3.h +++ b/dep/g3dlite/include/G3D/Color3.h @@ -187,7 +187,7 @@ public: Color3 direction() const; float squaredLength () const; float dot (const Color3& rkVector) const; - float unitize (float fTolerance = 1e-06); + float unitize (float fTolerance = 1e-06f); Color3 cross (const Color3& rkVector) const; Color3 unitCross (const Color3& rkVector) const; diff --git a/dep/g3dlite/include/G3D/Matrix3.h b/dep/g3dlite/include/G3D/Matrix3.h index 8cfcfe9599f..13cd41040ff 100644 --- a/dep/g3dlite/include/G3D/Matrix3.h +++ b/dep/g3dlite/include/G3D/Matrix3.h @@ -242,8 +242,8 @@ public: bool isOrthonormal() const; Matrix3 transpose () const; - bool inverse (Matrix3& rkInverse, float fTolerance = 1e-06) const; - Matrix3 inverse (float fTolerance = 1e-06) const; + bool inverse (Matrix3& rkInverse, float fTolerance = 1e-06f) const; + Matrix3 inverse (float fTolerance = 1e-06f) const; float determinant () const; /** singular value decomposition */ |