Paul MARTZ
|
9f2030cbcd
|
2.8 branch: Set SO version in CMakeLists.txt so it gets baked into the binary file names.
|
2011-05-12 20:43:03 +00:00 |
|
Paul MARTZ
|
7ab3207732
|
2.8 branch: This is Ryan Pavlik's introduction of a new output Option (OutputRelativeTextures) for the dot OSG plugin to write texture files into a subfolder.
|
2011-05-12 00:52:58 +00:00 |
|
Paul MARTZ
|
baa210b4a9
|
Typo fix.
|
2011-05-11 23:15:46 +00:00 |
|
Paul MARTZ
|
27c359a69a
|
2.8 branch: Fix from Ryan Pavlik for wrappers.
|
2011-05-11 01:04:21 +00:00 |
|
Paul MARTZ
|
85281a6d1b
|
2.8 branch: This is a wholesale update of all OpenFlight plugin source files from trunk. The 2.8.x FLT plugin is now in sync with trunk r12297 (April 19 2011). This commit includes the osgSim MultiSwitch changes in r11971.
|
2011-05-05 01:59:10 +00:00 |
|
Paul MARTZ
|
b6ef8c9b6c
|
2.8 branch: This change adds improved support for RTT (child) Camera nodes to the OcclusionQueryNode. Prior to this change, OQN used the top-level camera to index into a map of results, which was unsatisfactory in the RTT case. This change has not been made to svn trunk at this time, and will need to be merged.
|
2011-05-03 19:54:28 +00:00 |
|
Paul MARTZ
|
19d6e20cc7
|
2.8 branch: Merging r11760 from trunk. This change enables apps to derive from OcclusionQueryNode.
|
2011-05-03 17:03:49 +00:00 |
|
Paul MARTZ
|
578f54beba
|
Fix typo "noitfy"->"notify".
|
2011-05-03 16:49:01 +00:00 |
|
Paul MARTZ
|
2f7167d011
|
2.8 branch: Uniform lookup by cached name ID. Trunk revisions r11952, r11998, and r12074.
|
2011-05-02 22:13:01 +00:00 |
|
Paul MARTZ
|
288fb20eb6
|
2.8 branch: Bump version# to 2.8.5 and SO# to 74. Backport the Notify macro modifications and CMake variable to compile out notification.
|
2011-05-02 17:59:02 +00:00 |
|
Paul MARTZ
|
18d9206a5e
|
2.8 branch, from Sukender: Fixes output file names for VS2010 builds so that Windows DLLs contain the SO version number.
|
2011-04-07 01:58:09 +00:00 |
|
Robert Osfield
|
eddbbe28fa
|
Fixed build against latest ffmpeg versions
|
2011-03-28 18:15:53 +00:00 |
|
Paul MARTZ
|
71eb974c1b
|
Bump version# to 2.8.4.
|
2011-03-28 15:41:25 +00:00 |
|
Paul MARTZ
|
f4be375ab8
|
2.8 branch: Merging r11354 from trunk to fix OpenThreads CMake INSTALL target issues in VS2010.
|
2011-03-28 02:38:46 +00:00 |
|
Paul MARTZ
|
38b454f824
|
2.8 branch: Enabling VS2010 builds.
|
2011-03-28 02:32:58 +00:00 |
|
Paul MARTZ
|
fb91677fce
|
2.8 branch: Removing non-existant Qt examples.
|
2010-04-03 16:01:09 +00:00 |
|
Paul MARTZ
|
dab855f141
|
2.8 branch: Improvements for building COLLADA. CMake only, does not change the actual COLLADA plugin (it's same as 2.8.2). Merged in this commit: r9759, r9952, r10336, r10626, and r10637.
|
2010-04-01 21:29:09 +00:00 |
|
Paul MARTZ
|
01b510865f
|
2.8 branch: This change brings the PNG plugin up to sync with trunk head. It adds the OSG_CPP_EXCEPTIONS_AVAILABLE CMake option and adds PNG plugin compatibility with multiple versions of libPNG. Merged from trunk: 10763 and 11121.
|
2010-04-01 17:41:08 +00:00 |
|
Paul MARTZ
|
6c08cc5937
|
2.8 branch: Updated XCode project file.
|
2010-03-31 23:27:59 +00:00 |
|
Paul MARTZ
|
7f3fe7baed
|
2.8 branch: Fix multiply defined symbols in static link by qualifying FBX and 3DS plugin symbols with namespaces.
|
2010-03-31 20:22:17 +00:00 |
|
Paul MARTZ
|
ae233b9392
|
2.8 branch: Fixes for mingw build. Merges 10963 and 10965 from trunk.
|
2010-03-30 15:23:18 +00:00 |
|
Paul MARTZ
|
1712176900
|
2.8 branch: Merging 11286 from trunk. "Added a compile test for pthread_setaffinity_np to workaround problem with the FreeBSD pthread lib containing the function but the pthread.h header not containing it."
|
2010-03-25 20:02:30 +00:00 |
|
Paul MARTZ
|
967e2b7926
|
2.8 branch: (2nd attempt. Previous commit appears to have been a no-op.) Merging 11289 from trunk to add pixel format getter to GraphicsWindowCocoa.
|
2010-03-25 19:56:50 +00:00 |
|
Paul MARTZ
|
64d4e6a913
|
2.8 branch: Merging 11289 from trunk to add pixel format getter to GraphicsWindowCocoa.
|
2010-03-25 19:46:38 +00:00 |
|
Paul MARTZ
|
ae33aeed8a
|
2.8 branch: Updated XCode project file from Stephan, includes ply plugin.
|
2010-03-25 19:37:22 +00:00 |
|
Paul MARTZ
|
49bf375b68
|
2.8 branch: Fix for 64bit OS X compiles. Merged r10006 from trunk.
|
2010-03-23 15:00:24 +00:00 |
|
Paul MARTZ
|
40a0c1cde2
|
2.8 branch: From Stephan Huber: Adding updated XCode project file.
|
2010-03-23 14:49:51 +00:00 |
|
Paul MARTZ
|
bfd9ec30ca
|
2.8 branch: Removing outdated OpenThreads folder, per Stephan Huber's request.
|
2010-03-23 14:46:14 +00:00 |
|
Paul MARTZ
|
599715e1d1
|
2.8 branch: Fix animations. This is a merge of r10362.
|
2010-03-23 02:07:10 +00:00 |
|
Paul MARTZ
|
3fc3fc060f
|
2.8 branch: OpenThreads fix for OSX. Merged 10927 from trunk.
|
2010-03-22 22:24:42 +00:00 |
|
Paul MARTZ
|
29199a9a68
|
2.8 branch. Merge r9904 from trunk (req'd for OS X).
|
2010-03-22 15:24:18 +00:00 |
|
Paul MARTZ
|
b8a76a0ce0
|
2.8 branch. 2nd attempt: The main point of this commit is to eliminate static initializers for OS X. Merges: 9894, 11207, 11263, and 11273.
|
2010-03-22 15:09:17 +00:00 |
|
Paul MARTZ
|
a927748a73
|
2.8 branch: Hm, mysteriously, the ply plugin seems to be missing changes that were previously merged. This commit brings them up to date with svn trunk as of r11237.
|
2010-03-22 14:55:52 +00:00 |
|
Paul MARTZ
|
5d53cb13d5
|
2.8 branch: Change "Matrices" to "Materials" in StatsHandler. This change was made on trunk in 10601, but 10601 was too extensive to merge onto the 2.8 branch.
|
2010-03-21 22:15:45 +00:00 |
|
Paul MARTZ
|
aa3766ca70
|
2.8 branch: Back out r11267. This is a reverse merge of r9894, r11207, and r11263.
|
2010-03-21 21:21:59 +00:00 |
|
Paul MARTZ
|
b5743c1c9f
|
2.8 branch. The main point of this commit is to eliminate static initializers for OS X. Merges: 9894, 11207, and 11263.
|
2010-03-21 20:45:30 +00:00 |
|
Paul MARTZ
|
894800115c
|
2.8 branch: Added convenience macros to Version header. This is a merge of r10173 from trunk.
|
2010-03-21 20:28:17 +00:00 |
|
Paul MARTZ
|
0574e17eaa
|
2.8 branch: Updating wrappers.
|
2010-03-21 00:35:14 +00:00 |
|
Paul MARTZ
|
9e1362445c
|
2.8 branch: Mergine recent changes to FBX. Revisions in this commit: r11251, r11252, r11262.
|
2010-03-20 23:19:35 +00:00 |
|
Paul MARTZ
|
a1af64be80
|
2.8 branch: Fix for FBX plugin on OS X.
|
2010-03-19 18:21:22 +00:00 |
|
Paul MARTZ
|
f02caa5371
|
2.8 branch: This is a simple copy from trunk, no fancy merges, just to get the osgmovie example up to date. Effectively, this is osgmovie as of trunk rev up to and including r10963.
|
2010-03-19 16:57:12 +00:00 |
|
Paul MARTZ
|
6d1a94c785
|
2.8 branch: Merge r11182 from trunk to update the FindQuickTime.cmake script.
|
2010-03-19 16:03:47 +00:00 |
|
Paul MARTZ
|
1163ebb25b
|
2.8 branch: Add up-to-date ffmpeg plugin. This commint merges the following revisions from trunk: 9910, 9912, 9933, 9948, 9960, 9965, 9968-9969, 9990, 10030, 10053, 10082, 10161, 10391-10392, 10408, 10414, 10422, 10538, 10809, 10851, 10892, 10925, 10961, 11165, and 11177.
|
2010-03-19 15:56:12 +00:00 |
|
Paul MARTZ
|
4563195a18
|
2.8 branch: Updated FindInventor.cmake from trunk revision 11033.
|
2010-03-18 16:18:46 +00:00 |
|
Paul MARTZ
|
00ca996576
|
2.8 branch: This is a merge of 9855 to remove the reference to the src/osgPlugins/OpenAL directory.
|
2010-03-17 20:55:30 +00:00 |
|
Paul MARTZ
|
7ab4faeae1
|
2.8 branch: Merge revision 10520 from trunk to fix memory leaks.
|
2010-03-17 20:47:50 +00:00 |
|
Paul MARTZ
|
4e90ccb13a
|
2.8 branch: This is part II of the backport of the 3ds plugin to the 2.8 branch. It includes these revisions from trunk: 10128, 10805, 10853, 10914, 10932, 10938, 10941-10942, 10945, 11056, 11123, 11173, 11180, 11194, and 11203. After merging these revisions, the 3ds code was modified to use the old-style osg::notify (instead of the new OSG_NOTIFY).
|
2010-03-17 19:47:56 +00:00 |
|
Paul MARTZ
|
5c70f4828f
|
2.8 branch: This is part II of the new ply plugin. This commit merges the following trunk revisions: 10088, 10149, and 11237
|
2010-03-17 19:02:38 +00:00 |
|
Paul MARTZ
|
bdcba7220c
|
2.8 branch: This adds the new ffmpeh plugin, up to a point. Further changes look messy, but will try to merge them. Revisions merged in this commit: 9816-9818, 9826-9827, 9837-9843, 9847, 9850, 9854, 9856-9857, 9860-9861, 9865, 9869, and 9885.
|
2010-03-17 17:41:14 +00:00 |
|
Paul MARTZ
|
cfa9c3682f
|
2.8 branch: This is part I of an attempt to add the new ply plugin and also bring the 3ds plugin up to date (writer capability, etc). Revisions merged from trunk in this commit: 10012, 10013, 10014, 10040, 10041, 10079, 10080, 9906, 10057, and 10076.
|
2010-03-17 16:59:50 +00:00 |
|