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
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
Andrew Meadows
b26f4b0c8d
fix for underdamped avatar rotation momentum
2015-07-23 14:49:15 -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
David Rowe
ad7167c67a
Merge branch 'master' into 20602
2015-07-23 11:22:05 -07:00
ZappoMan
720f6ec529
completely remove six sense lasers
2015-07-23 11:17:22 -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
David Rowe
7c4f6b665b
Use a default eye diameter for models without eyes, e.g., the masks
2015-07-23 11:04:58 -07:00
ZappoMan
f4ec09a48b
move renderLaserPointers() into a draw item
2015-07-23 10:42:22 -07:00
Niraj Venkat
9ccf316513
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-23 10:36:46 -07:00
Seth Alves
57eb798d63
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-07-23 09:46:41 -07:00
David Rowe
68254c1ff0
Merge branch 'master' into 20630
2015-07-23 09:46:20 -07:00
ZappoMan
3350d638dd
always use the _viewFrustum for caluclating the pick ray, not the _displayViewFrustum which can be the mirror
2015-07-23 09:29:27 -07:00
Andrew Meadows
6657026a12
remove cruft: legacy shapes for skeleton bones
2015-07-23 08:34:44 -07:00
Brad Hefta-Gaub
e729a87328
Merge pull request #5393 from ctrlaltdavid/20632
...
WL#20632 - Remove unused postLighting variable from code
2015-07-23 08:24:09 -07:00
Brad Hefta-Gaub
a27a2f601b
Merge pull request #5395 from huffman/fix-ray-picking
...
Fix ray picking working intermittently
2015-07-23 08:15:15 -07:00
ZappoMan
c2113ea96b
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 07:42:58 -07:00
Ryan Huffman
198b6cfa88
Fix ray picking working intermittently
...
Ray picking relies on the Application's viewFrustum which was being set
to both the main camera and mirror camera for their respective pass
while rendering. This makes sure the viewFrustum only ever holds the
main camera. Application::_displayViewFrustum still gets updated to
the current camera while rendering.
2015-07-23 06:17:08 -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
Stephen Birarda
7cee5f3ce5
don't reset the idleTimer if the interval hasn't changed
2015-07-22 18:05:04 -07:00
Stephen Birarda
db5e8c72ee
force event processing up to a certain max time
2015-07-22 17:59:07 -07:00
David Rowe
11078d0d02
Get Developer > Avatar > Show Collision Bounding Shapes working again
...
Note: Currently doesn't display well because alpha isn't working.
2015-07-22 17:50:56 -07:00
David Rowe
3362358dcd
Remove unused postLighting variable from Avatar and MyAvatar
...
Fixes Leap and Hydra laser pointers not displaying.
Enables:
- Avatar billboard display
- Avatar collision bounding shape display
- Hand information display
2015-07-22 17:50:55 -07:00
David Rowe
b515b163fb
Remove dead code from Head
2015-07-22 17:50:54 -07:00
Stephen Birarda
785ae190ca
add back send posted touch events
2015-07-22 17:49:27 -07:00
ZappoMan
71eeecc7f6
Revert "Instrument the inter-idle time and tweaking the timeout setting"
...
This reverts commit 0c88972f09
2015-07-22 16:53:56 -07:00
Ryan Huffman
9e2eb7fdbd
Fix face-camera functionality for BillboardOverlay
2015-07-22 14:49:20 -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
Bradley Austin Davis
68cf3776f0
Make stars a little smaller
2015-07-22 13:44:37 -04:00
Sam Gateau
7ac2030862
Preparing for first pr
2015-07-22 10:43:50 -07:00
Niraj Venkat
adf7a1098d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-22 10:27:39 -07:00
David Rowe
9d33cfa965
Allow for look-at positions being not quite up to date as avatars move
...
So that looking-at-me indicators don't flicker on when they shouldn't.
2015-07-22 09:53:37 -07:00
David Rowe
e44cba500d
Guard against head model not being available yet
2015-07-22 09:52:49 -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
c0048afbec
Merge branch 'bart' into marge
2015-07-22 09:07:45 -04:00
Bradley Austin Davis
190984657e
Merge branch 'homer' into marge
2015-07-22 09:07:33 -04:00
Bradley Austin Davis
a93e17d622
Fix domain connection status border
2015-07-22 08:27:51 -04:00
Bradley Austin Davis
9596452c32
Trying to fix oculus rendering
2015-07-22 08:07:44 -04:00
Bradley Austin Davis
ae539afafb
Fix deadlock when using textoverlay from main thread
2015-07-22 07:23:12 -04:00
David Rowe
87dbbdb2e8
Set an initial alpha in anticipation of sphere alpha working
2015-07-21 18:25:35 -07:00
David Rowe
55683e0cd5
Size looking-at-me eye spheres per avatar model dimensions
2015-07-21 18:24:47 -07:00
David Rowe
bed266dfe9
Fade looking-at-me eye spheres over half a second
2015-07-21 18:23:50 -07:00
David Rowe
9ac4e2f687
Render spheres over avatar eyes if they're looking at me
2015-07-21 18:22:27 -07:00
Bradley Austin Davis
bd5da87551
Merge remote-tracking branch 'upstream/master' into marge
2015-07-21 19:23:38 -04:00
Bradley Austin Davis
d6994c6dfd
Restoring star size and color variation
2015-07-21 19:22:10 -04:00
Brad Hefta-Gaub
6dbe6bc375
Merge pull request #5332 from ctrlaltdavid/20612
...
Fix full-screen mirror not mirroring correctly with Faceshift or DDE
2015-07-21 13:32:56 -07:00
Niraj Venkat
e0634de403
Turn on/off debug AO from menu item
2015-07-21 12:14:09 -07:00
Sam Gateau
7b35048e52
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-21 11:18:15 -07:00
Sam Gateau
93afdf79a3
Removing the gl driver version report intiialization code out of applciation
2015-07-21 11:17:41 -07:00
Seth Alves
fecdc08720
merge from upstream
2015-07-21 09:53:51 -07:00
Seth Alves
cdc26526b4
merge from upstream
2015-07-21 09:51:16 -07:00
Philip Rosedale
cf88bce082
Merge pull request #5367 from ctrlaltdavid/fix-speech-bubble-not-rendering
...
Fix Avatar > Blue Sphere While Speaking not rendering
2015-07-21 09:11:36 -07:00
Bradley Austin Davis
fda1cb6f7b
Merge remote-tracking branch 'upstream/master' into marge
2015-07-21 08:59:29 -07:00
Brad Davis
9016f437a8
Merge pull request #5371 from Atlante45/smart_pointers
...
Smart pointers fixes
2015-07-21 08:52:29 -07:00
Brad Davis
5b63863dca
Merge pull request #5378 from ZappoMan/warningFixes
...
coding standard fix
2015-07-21 08:52:17 -07:00
David Rowe
716211c6b7
Merge branch 'master' into fix-speech-bubble-not-rendering
2015-07-21 08:45:13 -07:00
ZappoMan
558f10640b
coding standard fix
2015-07-21 08:30:33 -07:00
Brad Davis
6d4c7cd4f2
Merge pull request #5374 from ZappoMan/warningFixes
...
Warning fixes and removing dead code
2015-07-21 07:23:40 -07:00
Seth Alves
abfe60aa20
whenever Model class uses _jointState, use the Rig version if there is a Rig.
2015-07-20 18:31:42 -07:00
Brad Davis
51973674f5
Merge remote-tracking branch 'upstream/master' into marge
2015-07-20 17:26:36 -07:00
Brad Davis
c3a2b72c13
Breaking framebuffer ops out of texture cache
2015-07-20 17:26:26 -07:00
David Rowe
ac4b64c853
Merge branch 'master' into 20602
2015-07-20 17:14:52 -07:00
Sam Gateau
5bf85961d2
removing dead code
2015-07-20 17:13:02 -07:00
Sam Gateau
ad1771c738
removing dead code
2015-07-20 17:09:11 -07:00
Brad Davis
94d57a2e43
fixing missing glew init
2015-07-20 16:51:01 -07:00
Sam Gateau
9d9142c274
cleaning commented code supposedly dead now
2015-07-20 16:50:24 -07:00
Sam Gateau
6a0ca6e113
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-20 16:22:12 -07:00
Stephen Birarda
9fb8b55359
repairs to early return for sendNackPackets
2015-07-20 16:10:11 -07:00
ZappoMan
65a79cfefb
fix a bunch of warnings
2015-07-20 15:58:25 -07:00
Sam Gateau
b5090883a0
merge with latest network pr
2015-07-20 15:49:10 -07:00
David Rowe
a488a12151
Merge branch 'master' into 20602
2015-07-20 15:37:43 -07:00
Sam Gateau
59666f664a
merging my changes to remove cruff from application to AUstin;s latest
2015-07-20 15:37:17 -07:00
ZappoMan
648d0f6d43
fix a bunch of warnings
2015-07-20 15:12:27 -07:00
Niraj Venkat
eaf75c01b9
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
...
Conflicts:
libraries/render-utils/src/AmbientOcclusionEffect.cpp
libraries/render-utils/src/AmbientOcclusionEffect.h
2015-07-20 14:55:27 -07:00
Niraj Venkat
85c9ee0feb
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
...
Conflicts:
libraries/render-utils/src/AmbientOcclusionEffect.cpp
2015-07-20 14:53:19 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Brad Davis
c0859ffd4c
Removing some dead forward declarations
2015-07-20 14:33:10 -07:00
Andrew Meadows
7578a70c4c
Merge pull request #5359 from birarda/protocol
...
Network Protocol Refactor
2015-07-20 14:30:58 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Brad Davis
488a449cb1
Merge branch 'master' into homer
2015-07-20 13:34:21 -07:00
Stephen Birarda
462ff97722
remove FlowLayout.cpp that was accidentally kept
2015-07-20 13:06:31 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -07:00
Sam Gateau
1a9f6e12a5
something not compiling but just before merge with upstream
2015-07-20 12:20:04 -07:00
Brad Hefta-Gaub
c41e20b90f
Merge pull request #5366 from jherico/marge
...
Naked GL removal work
2015-07-20 12:12:22 -07:00
Brad Davis
3d09e772f9
Merge branch 'marge' into homer
2015-07-20 12:09:51 -07:00
Brad Davis
23b058e4eb
Removing starfield tilt and reducing grid alpha
2015-07-20 11:40:12 -07:00
Seth Alves
2814ad78fe
Merge branch 'rig' of github.com:howard-stearns/hifi into rig
2015-07-20 11:16:11 -07:00
Howard Stearns
9623ccf792
Change instantiation of Rig.
2015-07-20 11:07:25 -07:00
Brad Davis
dcaaeec593
Removing AO effect (temporarily) and wireframe mode
2015-07-20 10:55:11 -07:00
Atlante45
fc2956342e
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 10:39:16 -07:00
David Rowe
73ffe5d9f6
Fix Avatar > Blue Sphere While Speaking not rendering
2015-07-20 10:25:59 -07:00
Brad Davis
de92e66635
Removing shadows code
2015-07-20 09:59:22 -07:00
Seth Alves
9af104f745
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-07-20 09:47:23 -07:00
