Commit Graph

14425 Commits

Author SHA1 Message Date
René Molenaar
48dbd61632 Fixed VisualStudio build 2016-10-05 16:31:23 +01:00
Robert Osfield
0fab759c1b Removed the unused debug header as it was causing building compile problems with the Debug build under Windows 2016-10-05 14:00:46 +01:00
OpenSceneGraph git repository
70e931fda2 Merge pull request #145 from LaurensVoerman/Submissions_A
added vc14 (Visual Studio 2015) and boost 1.58 support in FindCOLLADA.cmake
2016-10-03 08:45:23 +01:00
Laurens Voerman
c03414ac57 added vc14 (Visual Studio 2015) and boost 1.58 support in FindCOLLADA.cmake 2016-09-30 14:33:28 +02:00
OpenSceneGraph git repository
f705e39eb9 Merge pull request #142 from LaurensVoerman/Submissions12
fix a few minor warnings from Visual Studio 2015
2016-09-27 09:48:38 +01:00
Laurens Voerman
0619fe1cfa src\osgplugins\osgjs\Animation(9): warning C4099: 'WriteVisitor': type name first seen using 'class' now seen using 'struct' 2016-09-26 13:56:38 +02:00
Laurens Voerman
0ee744f7a0 fix Visual studio warning C4138: '*/' found outside of comment 2016-09-26 13:43:51 +02:00
Robert Osfield
1bdd2aceab Removed __sgi blocks as IRIX is no longer available 2016-09-26 10:03:32 +01:00
Robert Osfield
56a7208891 Removed Qt dependency examples, osgQt NodeKit and qfont plugin as these are now provided by the separate osgQt project 2016-09-26 09:31:22 +01:00
Robert Osfield
13fa75fc12 Removed qt threads 2016-09-26 09:22:10 +01:00
Robert Osfield
05f37bec53 Removed IRIX Sproc thead support as IRIX is load dead 2016-09-26 09:08:56 +01:00
Robert Osfield
2c39fa52b8 Removed IRIX Sproc threading support form OpenThreads as IRIX is long dead. 2016-09-26 09:06:28 +01:00
OpenSceneGraph git repository
3a4a7ef5fd Merge pull request #139 from aluaces/signedchar
Explicit signed char declarations for portability.
2016-09-24 16:16:23 +01:00
Alberto Luaces
01c712e851 Explicit signed char declarations for portability.
Some platforms (ARM, PowerPC, s390x) have "unsigned char" as the default
char type, and thus the build fails for certain parts of the code where
negative values are assigned to those kind of variables.
2016-09-24 12:33:37 +02:00
Robert Osfield
3f91c5d970 Changed the min CMake version to 2.8.0 2016-09-22 18:33:35 +01:00
OpenSceneGraph git repository
db10e80b7f Merge pull request #137 from LaurensVoerman/Submissions10
fix error in CmakeLists: CMAKE_CXX_COMPILER_VERSIO
2016-09-22 17:48:19 +01:00
Robert Osfield
c6813cf8e2 Replaced local static usage to avoid threading and mulit-context issues 2016-09-22 14:33:03 +01:00
Laurens Voerman
ba3ab1a7c1 fix error in CmakeLists: CMAKE_CXX_COMPILER_VERSIO -> CMAKE_CXX_COMPILER_VERSION 2016-09-22 09:09:46 +02:00
Robert Osfield
c31af086eb Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2016-09-20 17:25:35 +01:00
Robert Osfield
7e0c30b884 Refactored texture sharing code so that it modifies the RefAttributePair directly thus honouring the override flags and fixing a bug of loosing these override flags when sharing 2016-09-20 17:23:37 +01:00
Robert Osfield
b0df75e674 Cleaned up the spacing and const of various method parameters.
Added non const versions of StateSet::getAttributePair() and getTextureAttributePair()
2016-09-20 17:01:26 +01:00
OpenSceneGraph git repository
c0fc66d6a0 Merge pull request #134 from LaurensVoerman/Submissions10
Specialize -Wmaybe-uninitialized -Wextra and -Wno-misleading-indentation gcc warning flags to 4.6, 4.9 and 6.0 respectively
2016-09-20 14:40:28 +01:00
Laurens Voerman
3b029f5d3e short version with gcc warning flags depending on compiler version. 2016-09-20 10:23:15 +02:00
Laurens Voerman
65567fdeac Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph into Submissions10 2016-09-20 10:20:47 +02:00
OpenSceneGraph git repository
57f9257f32 Merge pull request #136 from LaurensVoerman/Submissions11
disable warning C4589 for MSVC
2016-09-19 19:39:01 +01:00
Laurens Voerman
37bd1c6b93 disable warning C4589 for MSVC 2016-09-19 16:40:59 +02:00
Laurens Voerman
c757fdb779 enable some more aggressive warning flags for gcc 4.7 and cmake version below 3 2016-09-16 17:12:41 +02:00
OpenSceneGraph git repository
dd0cd8f2db Merge pull request #130 from LaurensVoerman/Submissions7
VS2015 dae plugin fix a few declaration of 'X' hides previous
2016-09-15 07:53:10 +01:00
OpenSceneGraph git repository
b75546acaf Merge pull request #131 from filnet/master
StandardManipulator: use proper bit mask when clearing a relative flag
2016-09-15 07:50:51 +01:00
Philippe Renon
e367792f6d StandardManipulator: use proper bit mask when clearing a relative flag 2016-09-14 14:32:35 +02:00
Laurens Voerman
cf3c2b18e3 VS2015 fix a few warning C4456: declaration of 'X' hides previous local declaration 2016-09-13 17:07:28 +02:00
OpenSceneGraph git repository
3b1212fed5 Merge pull request #128 from LaurensVoerman/Submissions5
wrong Meta_Shape tag in ConvexHull
2016-09-12 16:22:54 +01:00
OpenSceneGraph git repository
22f96935fb Merge pull request #127 from LaurensVoerman/Submissions4
remove last Performer reference
2016-09-12 16:22:18 +01:00
Laurens Voerman
55b8c380d8 wrong Meta_Shape tag in ConvexHull 2016-09-12 16:49:35 +02:00
Laurens Voerman
743ecf3706 remove last Performer reference 2016-09-09 10:58:19 +02:00
Robert Osfield
489860fb87 Updated version number to 3.5.5 2016-09-06 09:31:16 +01:00
Robert Osfield
aae78b8a8b Updated ChangeLog formatting 2016-09-05 19:12:54 +01:00
Robert Osfield
beb617ad90 Updated ChangeLog, AUTHORS and README for 3.5.4 dev release 2016-09-05 17:57:27 +01:00
Robert Osfield
cb6e6ff2be Fixed warnings, deprecated another out of date method 2016-09-05 15:35:54 +01:00
Robert Osfield
ec344a85b4 Fixed warnings 2016-09-05 13:44:59 +01:00
Stuart Mentzer
2c4a5319bf Final version of FindFreetype.cmake that is based on the now-accepted CMake patches. This supports the new freetype include path structure and fixes the failure to find the debug library on Windows due to its name having a 'd' suffix. 2016-09-05 12:18:46 +01:00
Robert Osfield
a494cd71e8 Fixed typo 2016-09-05 07:59:15 +01:00
Robert Osfield
4a6fb5a49a Fixed warnings 2016-09-04 19:50:28 +01:00
Robert Osfield
fb4f7a025b Added local deprecated_osg::Geometry implementation from OpenSceneGraph-3.4 to keep build working now that deprecated_osg::Geometry has been removed from the core OSG. 2016-09-04 18:31:13 +01:00
Robert Osfield
19270d0833 Fixed warning 2016-09-02 19:09:13 +01:00
Robert Osfield
f4fbe6625a Merge branch 'LaurensVoerman-Submissions2e' 2016-09-02 18:26:37 +01:00
Robert Osfield
79ff8ba273 Merge branch 'Submissions2e' of https://github.com/LaurensVoerman/OpenSceneGraph into LaurensVoerman-Submissions2e 2016-09-02 18:26:11 +01:00
OpenSceneGraph git repository
c19b271586 Merge pull request #119 from LaurensVoerman/Submissions2c
Fixed clone osgVolume::Scalarproperty and osg::TextureBuffer crash
2016-09-02 17:47:37 +01:00
OpenSceneGraph git repository
14bdadaf86 Merge pull request #123 from LaurensVoerman/Submissions2f
Submissions2f
2016-09-02 17:44:57 +01:00
OpenSceneGraph git repository
8d827ced1b Merge pull request #117 from LaurensVoerman/Submissions2a
bugfix: wrong class name in META_Object macro for osg::Enablei /disable
2016-09-02 17:35:47 +01:00