Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 19:14:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28934 commits 76 branches 59 tags 1.2 GiB
Commit graph

938 commits

Author SHA1 Message Date
Seth Alves
6e5aca6da4 merge from upstream 2015-07-27 16:52:36 -07:00
Seth Alves
5ae15d46b4 add some javascript callable stuff back to MyAvatar 2015-07-27 16:42:54 -07:00
Howard Stearns
1bb734aec0 Kill warnings. 2015-07-27 15:26:03 -07:00
Howard Stearns
ef52c0703f Merge pull request #8 from AndrewMeadows/cadmium 
remove unused legacy Shapes from Model and friends
 2015-07-27 13:20:41 -07:00
Howard Stearns
990f0d6d07 Pass correct position/velocity/orientation to Rig simulation. 2015-07-27 12:57:39 -07:00
Andrew Meadows
73ac941230 remove unused legacy Shapes from Model and friends 2015-07-27 11:15:33 -07:00
Howard Stearns
dac6667ee6 Start of state. 2015-07-27 09:21:24 -07:00
Howard Stearns
1ec0518d05 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-27 09:20:30 -07:00
Bradley Austin Davis
7be33dcb58 Limit the amount of time consumed by rendering QML 2015-07-25 11:40:58 -04:00
Howard Stearns
1663d095a1 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-24 14:08:51 -07:00
Howard Stearns
f9f8b0ffc1 Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig 2015-07-24 10:40:19 -07:00
Andrew Meadows
1bf49d72f1 Merge branch 'rig' of github.com:howard-stearns/hifi into bromine 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-07-24 10:06:02 -07:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Sam Gateau
66cd17ec66 REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
Sam Gateau
a002560003 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-23 16:32:00 -07:00
Howard Stearns
05fae0e977 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-23 16:12:42 -07:00
ZappoMan
8007fba909 add type to shader include 2015-07-23 15:37:56 -07:00
Andrew Meadows
f40feba36d Merge remote-tracking branch 'andrew/boron' into bromine 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
 2015-07-23 15:29:53 -07:00
Seth Alves
1e19e46aa6 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-23 15:14:19 -07:00
Seth Alves
33c97a1833 get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshes 2015-07-23 15:14:10 -07:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
ZappoMan
e6262de864 CR feedback 2015-07-23 14:56:52 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
ZappoMan
1177ffd439 more hacking 2015-07-23 14:12:52 -07:00
ZappoMan
96e83e3ed4 remove gl_FrontMaterial 2015-07-23 14:11:28 -07:00
ZappoMan
9496b6c024 more hacking 2015-07-23 13:56:59 -07:00
ZappoMan
5774af0856 more hacking 2015-07-23 13:38:08 -07:00
ZappoMan
a0666d5e99 testing windows render bug 2015-07-23 13:17:12 -07:00
Seth Alves
4566d16402 move Model's AnimationHandles to Rig. Move a bunch of Model methods from public to protected 2015-07-23 13:03:38 -07:00
ZappoMan
91d317f964 testing windows render bug 2015-07-23 12:42:55 -07:00
samcake
fecb0e3675 Merge pull request #5398 from ZappoMan/removeTextureRescale 
remove rescaling of textures
 2015-07-23 11:22:38 -07:00
samcake
805e7326e0 Merge pull request #5396 from ZappoMan/deadCodeRemoval 
remove non-batch versions of GeometryCache renderXYZ() methods
 2015-07-23 11:11:35 -07:00
Bradley Austin Davis
f19800f0de Don't overwrite the normals buffer when copying the resolved lighting back to the primary FBO 2015-07-23 12:37:58 -04:00
ZappoMan
06b6c49b9a remove rescaling of textures 2015-07-23 08:56:59 -07:00
Andrew Meadows
6657026a12 remove cruft: legacy shapes for skeleton bones 2015-07-23 08:34:44 -07:00
ZappoMan
c2113ea96b remove non-batch versions of GeometryCache renderXYZ() methods 2015-07-23 07:42:58 -07:00
Seth Alves
ee334ff826 JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates. 2015-07-22 18:43:10 -07:00
Seth Alves
47965bc39c merge from upstream 2015-07-22 13:48:19 -07:00
Seth Alves
7c8d52cbd1 back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer 2015-07-22 13:41:31 -07:00
Howard Stearns
a6395a2351 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-22 12:29:27 -07:00
Howard Stearns
dbb4a8b767 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-22 11:40:25 -07:00
Sam Gateau
f70553ec95 Fixing merge 2015-07-22 11:31:46 -07:00
Sam Gateau
837ff45763 Removing code aroung the selfie fremebuffer 2015-07-22 10:57:08 -07:00
Sam Gateau
7ac2030862 Preparing for first pr 2015-07-22 10:43:50 -07:00
Bradley Austin Davis
2f13488f11 Fixing FBO bug on resizing windows 2015-07-22 11:28:36 -04:00
Bradley Austin Davis
65732d874c Merge branch 'maggie' into marge 2015-07-22 09:07:50 -04:00
Bradley Austin Davis
9596452c32 Trying to fix oculus rendering 2015-07-22 08:07:44 -04:00
Bradley Austin Davis
d6994c6dfd Restoring star size and color variation 2015-07-21 19:22:10 -04:00
Seth Alves
fecdc08720 merge from upstream 2015-07-21 09:53:51 -07:00