Tim Moore
|
e0d02be0f5
|
Merge branch 'zan/cubemap' into next
|
2010-04-03 22:49:07 +02:00 |
|
Tim Moore
|
461e6d1b5b
|
Zan's cubemap patch
|
2010-04-03 22:48:58 +02:00 |
|
Tim Moore
|
d767e6d7eb
|
Merge branch 'fredb/geom-shader' into next
|
2010-03-30 12:07:50 +02:00 |
|
fredb
|
bff1584012
|
Geometry shader support
|
2010-03-30 12:07:38 +02:00 |
|
Tim Moore
|
3d91a11b95
|
Merge branch 'zan/generate'
|
2010-03-30 12:04:09 +02:00 |
|
Tim Moore
|
1349b46a8c
|
Merge branch 'jmt/waypt'
|
2010-03-30 11:53:13 +02:00 |
|
Tim Moore
|
74330ba1dd
|
Merge branch 'timoore/clipgroup'
|
2010-03-30 11:46:01 +02:00 |
|
Tim Moore
|
64ab227f62
|
Merge branch 'timoore/effects-anim-rebase'
|
2010-03-30 11:41:37 +02:00 |
|
Tim Moore
|
1c51fbd1b4
|
Merge branch 'zan/cloudsort'
|
2010-03-30 11:40:45 +02:00 |
|
Tim Moore
|
4c2dd553f2
|
Merge branch 'ehofman/particles' into next
|
2010-03-27 13:39:55 +01:00 |
|
Tim Moore
|
2fb985afa4
|
Merge branch 'ehofman/dlerror' into next
|
2010-03-27 13:39:48 +01:00 |
|
ehofman
|
44c93d5074
|
Csaba Halasz: fix a compilation error for non-bsd systems that happen to return
const char* from dlerror().
|
2010-03-27 13:39:37 +01:00 |
|
ehofman
|
dcf07a46aa
|
Allow particles to be frozen on pause.
|
2010-03-27 13:38:59 +01:00 |
|
Tim Moore
|
284a9e0612
|
Merge branch 'ehofman/sound' into next
|
2010-03-16 17:15:34 +01:00 |
|
Tim Moore
|
60349a8690
|
Merge branch 'ehofman/propfix' into next
|
2010-03-16 17:15:29 +01:00 |
|
ehofman
|
64072be83c
|
iprovide a slightly more helpfull exception message
|
2010-03-16 17:15:12 +01:00 |
|
ehofman
|
229abb8412
|
updated vendor test
|
2010-03-16 17:14:19 +01:00 |
|
Tim Moore
|
7b1d1fd288
|
Merge branch 'timoore/clipgroup' into next
|
2010-03-16 15:44:56 +01:00 |
|
Tim Moore
|
1ca1f6ad22
|
Remove reference to osgUtil::RegisterRenderBinProxy
This has gone away in recent OSG sources.
|
2010-03-16 15:42:54 +01:00 |
|
Tim Moore
|
0ad66f4bc4
|
Merge branch 'zan/generate' into next
|
2010-03-16 14:27:56 +01:00 |
|
fredb
|
d5757c4fb8
|
Lauri Peltonen : add the ability to generate tangent vectors for model, terrain or ocean geometry inside the effect file
|
2010-03-16 14:27:21 +01:00 |
|
Tim Moore
|
7fe40bce86
|
Merge branch 'jmt/magvar' into next
|
2010-03-16 14:22:53 +01:00 |
|
jmt
|
5da3d64ede
|
Overload the SGMagVar::update method to take an SGGeod.
|
2010-03-16 14:22:45 +01:00 |
|
Tim Moore
|
2e93b06ac0
|
Merge branch 'fred/precip' into next
|
2010-03-16 14:21:57 +01:00 |
|
fredb
|
1e6aa4b40f
|
Precipitation inside cockpit temporary fix.
Needs a clip distance settable to take account of views and different cockpit size.
|
2010-03-16 14:21:45 +01:00 |
|
Tim Moore
|
262383395d
|
Merge branch 'timoore/aptsign' into next
|
2010-03-12 14:32:11 +01:00 |
|
Tim Moore
|
127226c421
|
Assign texcoords and a color (black) to the backs of airport signs
|
2010-03-12 14:31:39 +01:00 |
|
Tim Moore
|
fabcb021cb
|
Merge branch 'timoore/effects-anim-rebase' into next
|
2010-03-11 08:46:22 +01:00 |
|
Tim Moore
|
60ab1ab83e
|
bug fix to animated effect parameters
Some confusion in getting the right property node.
|
2010-03-11 08:45:58 +01:00 |
|
Tim Moore
|
1f37095087
|
Merge branch 'timoore/effects-anim-rebase' into next
|
2010-03-09 11:03:25 +01:00 |
|
Tim Moore
|
93c2f70b64
|
animate uniform parameters in effects
|
2010-03-09 11:02:57 +01:00 |
|
Tim Moore
|
b0562df6bb
|
Cleanup of effects parameter animation
|
2010-03-09 11:02:56 +01:00 |
|
Tim Moore
|
65d6a5c774
|
Prepare effects animation code to use general functor setters
|
2010-03-09 11:02:56 +01:00 |
|
Tim Moore
|
650af0f7b0
|
generalize support for initializing effect parameters from several properties
|
2010-03-09 11:02:56 +01:00 |
|
Tim Moore
|
cf9de25c25
|
pass SGReaderWriterXMLOptions object to getGlobalProperty
This supports pathnames relative to a model in effect definitions.
|
2010-03-09 11:02:56 +01:00 |
|
Tim Moore
|
fc4009aa50
|
change return value of SGPropertyNode::getPath to std::string
Also get rid of the cached value.
|
2010-03-09 11:02:56 +01:00 |
|
Tim Moore
|
d04cf4d897
|
pass SGReaderWriterXMLOptions to effects
This will allow parameters to refer to properties in models, though
that doesn't work yet.
|
2010-03-09 11:02:56 +01:00 |
|
Tim Moore
|
2e45c67ef2
|
Merge branch 'zan/stencil'
|
2010-03-09 10:59:09 +01:00 |
|
Tim Moore
|
b6d8e1f842
|
Merge branch 'zan/cloudsort' into next
|
2010-03-03 23:12:49 +01:00 |
|
ehofman
|
284bc364fe
|
Lauri Peltonen: turn on clouds depth sorting
|
2010-03-03 23:11:01 +01:00 |
|
Tim Moore
|
a050654b4c
|
Merge branch 'jmt/waypt' into next
|
2010-02-22 09:42:36 +01:00 |
|
jmt
|
7311dae483
|
Allow a waypoint's target altitude to be modified in-place.
|
2010-02-22 09:42:28 +01:00 |
|
Tim Moore
|
c57c3cd1d3
|
Merge branch 'curt/makefile'
|
2010-02-17 18:01:29 +01:00 |
|
Tim Moore
|
3ec5e85485
|
Merge branch 'curt/makefile' into next
|
2010-02-17 07:20:38 +01:00 |
|
curt
|
ff95af0367
|
Add a missing source file so it will be included with "make dist".
|
2010-02-17 07:20:21 +01:00 |
|
curt
|
aa9c7d5435
|
Add a missing .hxx file for "make dist"
|
2010-02-17 07:20:19 +01:00 |
|
Tim Moore
|
dcc9f33357
|
Merge branch 'ehofman/sound' into next
|
2010-02-17 07:19:20 +01:00 |
|
ehofman
|
1ace645505
|
small fix for when sound is disabled
|
2010-02-17 07:19:02 +01:00 |
|
Tim Moore
|
dc2b87dce1
|
Merge branch 'ehofman/config' into next
|
2010-02-17 07:18:30 +01:00 |
|
ehofman
|
8e47f5d494
|
John Denker: Fix sneaky bug: 'mylibdir' variable getting trampled.
|
2010-02-17 07:18:20 +01:00 |
|