Torsten Dreyer
6a2773c3ac
ignore generated files
2010-05-23 10:54:23 +02:00
Torsten Dreyer
1eea917121
ignore generated files
2010-05-23 10:45:01 +02:00
Torsten Dreyer
ea1bbbabfa
ignore generated test apps
2010-05-23 10:44:29 +02:00
Torsten Dreyer
399d2bc73c
Fix a gcc warning
2010-05-22 23:40:07 +02:00
Torsten Dreyer
0759dbcdc9
Merge branch 'next' of gitorious.org:fg/simgear into next
2010-05-22 23:36:39 +02:00
Torsten Dreyer
1ae0f9c19d
New pick animation capability from Alex Perry
...
Alex Perry: Adds a new pick animation capability which parallels the existing
"action" for a named object. Specifying "vncaction" and a transform
from model space will enable all mouse clicks on that object to be
delivered directly to the OSG image. Currently, the readers for VNC
and PDF files yield interactive images; more are likely to be added
over time.
2010-05-22 23:35:01 +02:00
James Turner
e8364a03bc
Merge branch 'topics/condexp' into next
2010-05-20 23:57:54 +01:00
James Turner
046d88ab2d
Support <expression> children in comparison conditions. Also makes ordering of child nodes match XML consistently.
2010-05-20 23:56:04 +01:00
Mathias Froehlich
f161f78a33
Add a tight and cheap method to represent a rotation.
...
Adapt tests for that new method.
2010-05-17 23:13:59 +02:00
Erik Hofman
1912444886
revert previous commit, this was a mistake
2010-05-11 11:32:58 +02:00
Erik Hofman
b6ef5a0a3d
Before
2010-05-08 11:19:01 +02:00
Frederic Bouvier
401c88adbb
Test git commit with a simple change
2010-05-08 00:19:43 +02:00
James Turner
42984d1bfb
Make ALUT 1.0 builds again, hopefully in the short term - MinGW needs this.
2010-05-07 00:12:21 +01:00
James Turner
6997082b03
Add .gitignore files, ignore automake/configure artefacts.
2010-05-06 11:25:53 +01:00
James Turner
139217dc79
Configure.as updates for ALUT changes, make --with-alut-framework= work.
2010-05-06 10:27:38 +01:00
Tim Moore
2cc2a857a2
Merge branch 'jmt/ref_ptr-conv'
2010-05-06 10:43:53 +02:00
Tim Moore
7dfb463ba9
Merge branch 'ehofman/framebuffer'
2010-05-06 10:43:45 +02:00
Tim Moore
da07871bc6
Merge branch 'mathias/intersect'
2010-05-06 10:43:27 +02:00
Tim Moore
530d2309e7
Merge branch 'ehofman/sound'
2010-05-06 10:43:12 +02:00
Tim Moore
7e7a5d38f8
Merge branch 'fredb/msvc-cleanup'
2010-05-06 10:42:59 +02:00
Tim Moore
ecf949dee0
Merge branch 'ehofman/model'
2010-05-06 10:42:44 +02:00
Tim Moore
9b0ba10b0b
Merge branch 'jmt/ref_ptr-conv' into next
2010-05-05 10:42:41 +02:00
jmt
9f9c4cf32c
Compile even if OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION is not set.
2010-05-05 10:42:29 +02:00
Tim Moore
536ebf604f
Merge branch 'ehofman/framebuffer' into next
2010-05-05 10:39:32 +02:00
ehofman
03a616b737
Add support for EXT_framebuffer_object for Atlas
2010-05-05 10:39:18 +02:00
Tim Moore
0b05f67114
Merge branch 'master' into next
2010-05-05 10:38:26 +02:00
Tim Moore
0ede690580
Merge branch 'maint'
2010-05-05 10:38:18 +02:00
frohlich
d81545a871
Add -ldl for newer ld defaults from fedora 13
...
Modified Files:
simgear/screen/Makefile.am
2010-05-05 10:38:09 +02:00
Tim Moore
1cda1fc201
Merge branch 'mathias/intersect' into next
2010-05-05 09:43:40 +02:00
frohlich
490dad7838
Provide a more exact sphere/box test.
...
Modified Files:
simgear/math/SGIntersect.hxx simgear/math/SGBox.hxx
2010-05-05 09:43:32 +02:00
Tim Moore
13ecbb8bce
Merge branch 'master' into next
2010-05-05 09:40:31 +02:00
Tim Moore
3346bfc9a8
Merge branch 'maint'
2010-05-05 09:40:23 +02:00
frohlich
c5de65f115
Make the bounding volume debug visitor compile again.
...
Modified Files:
simgear/scene/bvh/BVHDebugCollectVisitor.hxx
2010-05-05 09:40:06 +02:00
Tim Moore
4fffcf9975
Merge branch 'ehofman/sound' into next
2010-05-05 09:05:35 +02:00
jmt
8962d9b293
Following discussion with Tat and Erik, update how we handle ALUT on Mac; specifically, switch to using an ALUT.framework built from FreeALUT. The ALUT framework is available (initially) from:
...
http://files.goneabitbursar.com/fg/alut-osx-universal.zip
for testing purposes; autoconf integration and an official home for the
framework will follow once this approach has been tested and confirmed as
sane by other Mac developers!
2010-05-05 09:05:23 +02:00
Tim Moore
050c1560e8
Merge branch 'fredb/msvc-cleanup' into next
2010-05-05 09:03:20 +02:00
fredb
68b3041f50
Remove obsolete file
2010-05-05 09:03:10 +02:00
fredb
1ddd153399
Cleanup MSVC projects
2010-05-05 09:02:58 +02:00
Tim Moore
df0a60caae
Merge branch 'ehofman/model' into next
2010-05-05 08:44:32 +02:00
fredb
675c86582d
Stuart Buchanan: Fix a bug in the random object placement where the model selected in the case of multiple object definitions in material.xml was random, rather than seeded.
2010-05-05 08:44:18 +02:00
Tim Moore
e6d01ed1a3
Merge branch 'fredb/effect-stuff'
2010-04-25 22:52:35 +02:00
Tim Moore
d8d1064e05
Merge branch 'zan/cubemap'
2010-04-25 22:52:10 +02:00
Tim Moore
5d04cb81ba
Merge branch 'fredb/geom-shader'
2010-04-25 22:52:02 +02:00
Tim Moore
5d5906e980
Merge branch 'ehofman/particles'
2010-04-25 22:36:06 +02:00
Tim Moore
2e7b862ad3
Merge branch 'timoore/aptsign'
2010-04-25 22:33:34 +02:00
Tim Moore
ad86e22824
Merge branch 'jmt/magvar'
2010-04-25 22:33:18 +02:00
Tim Moore
536b8a213b
Merge branch 'fred/precip'
2010-04-25 22:33:02 +02:00
Tim Moore
2e13877926
Merge branches 'ehofman/propfix' and 'ehofman/sound'
2010-04-25 22:32:44 +02:00
Tim Moore
967d63dec4
Merge branches 'ehofman/config' and 'ehofman/dlerror'
2010-04-25 22:32:14 +02:00
Tim Moore
573c4268b6
Merge branch 'fredb/effect-stuff' into next
2010-04-12 07:25:24 +02:00
