Tim Moore
1c51fbd1b4
Merge branch 'zan/cloudsort'
2010-03-30 11:40:45 +02:00
Tim Moore
2e45c67ef2
Merge branch 'zan/stencil'
2010-03-09 10:59:09 +01:00
Tim Moore
c57c3cd1d3
Merge branch 'curt/makefile'
2010-02-17 18:01:29 +01:00
Tim Moore
ad667be0d7
Merge branch 'fredb/winfix'
2010-02-05 00:23:51 +01:00
Tim Moore
acf19cebf8
Stencil operations for effects
...
From Lauri Peltonen
2010-01-29 19:07:53 +01:00
Tim Moore
5dfa4c0840
Merge branch 'timoore/mat-effect'
2010-01-28 10:31:52 +01:00
Tim Moore
f918602f58
Merge branch 'freb/mingw'
2010-01-28 10:31:40 +01:00
Tim Moore
2cf2dd24a4
Merge branch 'fredb/winfix'
2010-01-28 10:31:11 +01:00
Tim Moore
eefb069d08
Create a different default effect for objects that have material animations
2010-01-27 18:42:48 +01:00
Tim Moore
e7f151ad02
Merge branch 'ehofman/sound'
2010-01-25 14:02:02 +01:00
Tim Moore
0710b781d3
Merge branch 'torsten/geoequal'
2010-01-25 14:01:52 +01:00
Tim Moore
7c01ad6917
Merge branch 'durk/version'
2010-01-25 14:00:42 +01:00
Tim Moore
11479cd8c3
Merge branch 'ehofman/sound'
2010-01-16 23:49:36 +01:00
Tim Moore
430c60ed1a
Merge branch 'ehofman/sound'
2010-01-13 07:57:35 +01:00
Tim Moore
dfea3623f6
Merge branch 'tat/framework'
2010-01-13 07:57:30 +01:00
Tim Moore
b38783e4cb
Merge branch 'ehofman/subsys'
2010-01-11 07:15:11 +01:00
Tim Moore
9382a4c21b
Merge branch 'jester/aptsign'
2010-01-11 07:14:51 +01:00
Tim Moore
3cd4c5566f
Merge branch 'timoore/effects'
2010-01-11 07:14:23 +01:00
Tim Moore
601c0977df
Merge branch 'jmt/geodistance'
2010-01-11 07:10:46 +01:00
Tim Moore
d6c0bf69b6
fix up some merge weirdness
2010-01-01 13:32:03 +01:00
Tim Moore
dca07c5634
Merge branch 'timoore/effects'
...
Conflicts:
simgear/scene/model/model.cxx
simgear/scene/sky/newcloud.cxx
2009-12-20 16:07:00 +01:00
Tim Moore
fd42294faf
Merge branch 'ehofman/sound'
...
Changed include of SGQuat.hxx to SGMath.hxx in
sound/sample_openal.cxx; somehow this happened in a merge commit when
the sound branch was merged to next.
2009-12-20 11:46:28 +01:00
Tim Moore