David Rowe
8b9319b29e
Merge branch 'master' into 20829
2016-03-12 13:09:59 +13:00
David Rowe
9da64e540d
Add shortcut keys to HMD menu
2016-03-12 12:53:16 +13:00
David Rowe
ecf67282d5
Add separators to HMD menus
2016-03-12 12:29:52 +13:00
Philip Rosedale
7e581cc831
Merge pull request #7325 from hyperlogic/tony/smooth-hands
...
Smoother hand motion when using hand controllers
2016-03-11 15:08:59 -08:00
Anthony J. Thibault
0ce004c8a7
Removed passive-aggressive comment, (it was a late night)
2016-03-11 13:36:48 -08:00
Chris Collins
ae596d79f1
Merge pull request #7317 from jherico/hmd_worn
...
Expose a property in display plugins to determine if the device is visible to the user
2016-03-11 11:46:06 -08:00
Anthony Thibault
ab390f7d2e
Merge branch 'master' into tony/smooth-hands
2016-03-11 10:06:31 -08:00
Anthony J. Thibault
5eeb4ca594
Fix one frame lag controller lag/jitter
...
Move userInputMapper->update() after inputPlugin->pluginUpdate().
2016-03-11 09:28:25 -08:00
Brad Hefta-Gaub
d1c024fb39
Merge pull request #7286 from zzmp/fix/skybox-tex
...
Clean up skybox rendering
2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
d5c8e69c48
Merge pull request #7319 from samcake/red
...
Supporting RenderItems being added Outside the RenderSpatialTree volume
2016-03-11 08:34:50 -08:00
Seth Alves
510d96af0e
Merge pull request #7316 from ZappoMan/toggleOverlay
...
Repair Toggle Overlays
2016-03-11 06:45:06 -08:00
samcake
729890342e
Fixing the linux warning for unused variable
2016-03-11 00:27:56 -08:00
Zach Pomerantz
2508b14126
Workaround for scribe not scrubbing #else
2016-03-10 22:53:21 -08:00
Zach Pomerantz
27884b26e9
Mark px shaders dirty on change
2016-03-10 22:53:07 -08:00
Zach Pomerantz
4dad797e20
Only add buffer/tex to skymap if asked for
2016-03-10 22:52:44 -08:00
Zach Pomerantz
40378920b1
Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex
2016-03-10 21:44:31 -08:00
Stephen Birarda
a9dd88d834
Merge pull request #7320 from zzmp/feat/shader-includes
...
Compile shaders into separate dir for inclusion
2016-03-10 21:07:49 -08:00
Zach Pomerantz
4eca43027a
Add texture, color to px skybox
2016-03-10 21:05:36 -08:00
Anthony J. Thibault
ab19d3e5a2
Moved animation after physics, hand poses are in world frame.
...
There are still some debug hacks enabled so I can test in the vive room.
2016-03-10 20:44:35 -08:00
Zach Pomerantz
11867aa71d
Compile shaders to their own folders
2016-03-10 20:10:54 -08:00
Anthony J. Thibault
807d31743c
Removed Hand, HandData & PalmData
...
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.
The hand controller debug drawing is slightly different, but still works.
2016-03-10 19:33:31 -08:00
samcake
24d712b7b4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-03-10 18:14:22 -08:00
samcake
58b84b67ea
Fixing the outside the octree bug
2016-03-10 18:14:11 -08:00
Brad Davis
87c9961aa8
Expose a property in display plugins to determine if the device is visble to the user
2016-03-10 17:19:32 -08:00
Brad Hefta-Gaub
92c47fdc8b
fix build buster, CR feedback
2016-03-10 16:44:59 -08:00
Brad Hefta-Gaub
387c156ce3
add failsafe for fade, so it can't endup between start and end property value
2016-03-10 16:24:30 -08:00
Howard Stearns
8a36df13df
Merge pull request #7314 from samcake/color
...
Fix a potentially bad access to RenderItem case from Overlay
2016-03-10 16:19:56 -08:00
Brad Hefta-Gaub
9842689ec0
remove noise and return early
2016-03-10 16:19:52 -08:00
Brad Hefta-Gaub
0c12c6ef90
dont be an idiot
2016-03-10 16:14:56 -08:00
Brad Hefta-Gaub
ff30611234
first cut at getting overlays to toggle again
2016-03-10 16:07:49 -08:00
samcake
a88f22fa3c
Removing white spaces
2016-03-10 15:58:04 -08:00
Brad Davis
bbc298f1e4
Merge pull request #7306 from zzmp/fix/px-rapid
...
Allow procedural shaders to be reused, and prevent crashes from rapid updates
2016-03-10 15:34:48 -08:00
Zach Pomerantz
505ae71e30
Pass px userData by const ref
2016-03-10 15:22:19 -08:00
samcake
fb68c09941
Before merging upstream
2016-03-10 15:10:34 -08:00
samcake
3944a7f297
Exposing thread safe number of allocated items for a ascene
2016-03-10 15:03:20 -08:00
samcake
f97c7b00de
Removing old modifications
2016-03-10 14:06:07 -08:00
samcake
1e96c9e2ca
Merging back with master
2016-03-10 14:03:37 -08:00
samcake
9fa1a4a478
Merging back with master
2016-03-10 14:01:58 -08:00
Zach Pomerantz
b627a17ce9
Allow px/color skybox without tex
2016-03-10 12:58:49 -08:00
Anthony J. Thibault
9351d5edca
Rig: warning fix & comments
2016-03-10 12:55:01 -08:00
Zach Pomerantz
d7d351fc63
Guard against unloaded env cubemaps
2016-03-10 12:50:52 -08:00
Zach Pomerantz
1e925d7bd8
Fetch unspecified textures on a delay
...
This fixes an abort caused by the assertion
in ResourceCache::getResource: assert(delayLoad).
2016-03-10 12:28:59 -08:00
Zach Pomerantz
d615e2e83b
Avoid redundant zone updates
2016-03-10 12:27:45 -08:00
Zach Pomerantz
64042327ec
Use version tmp var
2016-03-10 11:08:15 -08:00
Anthony J. Thibault
4a78300607
MyAvatar: Allow user to raise hands directly overhead.
...
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head. Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
2016-03-10 10:20:17 -08:00
Zach Pomerantz
9b89e46e65
Make procedural userData thread-safe
2016-03-10 10:12:55 -08:00
Zach Pomerantz
1640314076
Use one procedural for skybox (avoid copies)
2016-03-10 10:12:22 -08:00
samcake
f40d390cc9
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-03-10 09:40:43 -08:00
samcake
a26f522f33
Merge pull request #7308 from jherico/shaders
...
Fix link problem with shaders that use transparency and normal maps
2016-03-10 09:35:35 -08:00
samcake
0543bb22e2
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-03-10 09:31:30 -08:00
