Paul MARTZ
|
43792651f0
|
Tagging 2.8.3.
OpenSceneGraph-2.8.3
|
2010-04-05 19:03:57 +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 |
|
Paul MARTZ
|
8f8f217ee7
|
2.8 branch: Updates for dds and OpenFlight plugins. Revisions merged from trunk in this commit: 9959, 10084, 10264, 10283, 10440, 10491, 10761, and 11159.
|
2010-03-17 14:59:25 +00:00 |
|
Paul MARTZ
|
ec0faff644
|
2.8 branch: Minor bug fixes for ac and 3dc plugins. Merges these revisions from trunk: 10010, 10758, and 11175.
|
2010-03-17 14:33:47 +00:00 |
|
Paul MARTZ
|
201e73c3c1
|
2.8 branch: Fix issue with osgDB::concatPaths. This commit merges svn trunk revision 10818 to the 2.8 branch.
|
2010-03-16 21:07:33 +00:00 |
|
Paul MARTZ
|
cb3868872e
|
2.8 branch: Latest Inventor plugin. Revisions from trunk included in this commit: 11032 and 11034.
|
2010-03-15 20:06:25 +00:00 |
|
Paul MARTZ
|
9f45b89722
|
|
2010-03-15 19:45:02 +00:00 |
|
Paul MARTZ
|
18b8d05d1f
|
2.8 branch: Enhancement and bug fixes for OcclusionQueryNode. Revisions merged from trunk include: 10933 and 11127.
|
2010-03-15 19:34:42 +00:00 |
|
Paul MARTZ
|
ae10c4ef89
|
2.8 branch: THis change brings the quicktime plugin up to date with current svn head trunk. Revisions merged from trunk in the commit include: 9769, 9932, 10788, 10891, 11019, and 11035.
|
2010-03-15 19:06:05 +00:00 |
|
Paul MARTZ
|
6222373479
|
2.8 branch: Backport latest ImageIO plugin from trunk. This commit includes the following svn trunk revisions: 9880, 10623, 10854, and 10855.
|
2010-03-15 17:48:28 +00:00 |
|
Paul MARTZ
|
5be809ab04
|
2.8 branch: Support for OS X 10.6. Several changes to GraphicsWIndowCocoa and DarwinUtils. The following trunk revisions were merged in this commit: 9879, 9895, 10208, 10340, 10417, 10456, 10622, 10858, and 10887.
|
2010-03-15 17:20:43 +00:00 |
|
Paul MARTZ
|
da79cd85e4
|
Merge 11009 to 2.8 branch (just examples directory).
|
2010-03-13 23:08:16 +00:00 |
|
Paul MARTZ
|
211764ca2d
|
2.8 branch: Updates to osgAnimation examples.
|
2010-03-13 23:01:27 +00:00 |
|
Paul MARTZ
|
8041a24a4f
|
2.8 branch: Additional fix for FBX usage of 2.8-style osgDB::ReaderWriter::Options.
|
2010-03-13 22:26:17 +00:00 |
|
Paul MARTZ
|
b011470dfe
|
Backport FBX plugin to 2.8 branch. Modified FBX to use the old osgDB::ReaderWriter::Options namespace. This commit includes a merge of r11111 (osgDB UTF mods).
|
2010-03-13 22:20:15 +00:00 |
|
Paul MARTZ
|
3155b1722c
|
Merge 11009 to 2.8 branch, but only the parts applicable to the bvh plugin to get it to build with current osgAnimation.
|
2010-03-13 21:43:43 +00:00 |
|