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 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
Anthony J. Thibault
9351d5edca
Rig: warning fix & comments
2016-03-10 12:55:01 -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
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
Brad Hefta-Gaub
99d26e0ef5
Merge pull request #7310 from jherico/crashes
...
Addressing thread safety issues
2016-03-10 09:26:49 -08:00
Philip Rosedale
ee1e4b898e
Merge pull request #7278 from AndrewMeadows/simulation-priority
...
adjust simulation priorities
2016-03-10 08:52:18 -08:00
Brad Davis
ee017cf0a5
Make script cache thread safe
2016-03-10 08:47:11 -08:00
Brad Davis
f97e61e305
Make scripting interface members thread safe
2016-03-10 08:46:09 -08:00
Brad Davis
f04d1b4998
Handle fake mouse events properly when triggered from a script
2016-03-09 22:11:40 -08:00
Brad Davis
aad2aaa764
Fix link problem with shaders that use transparency and normal maps
2016-03-09 20:01:18 -08:00
Zach Pomerantz
74e1d32221
Reuse procedural on skybox
2016-03-09 19:40:27 -08:00
Zach Pomerantz
4022474b48
Constrain procedural updates to render thread
2016-03-09 19:39:38 -08:00
Zach Pomerantz
40fbe2d1e5
Reuse procedurals on entities
2016-03-09 17:34:03 -08:00
Howard Stearns
2b576e86f0
Merge pull request #7259 from jherico/crashes
...
Crash fixes
2016-03-09 16:42:36 -08:00
Chris Collins
ddb09ec222
Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements
...
Hand controller mouse improvements
2016-03-09 16:34:35 -08:00
Chris Collins
690d877e93
Merge pull request #7292 from zzmp/fix/cache-loaded
...
Mark Resource loaded after postprocessing
2016-03-09 16:31:45 -08:00
Brad Davis
6d090895b7
Don't crash on QML menu creation failure
2016-03-09 14:48:20 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Brad Davis
b2be54a179
Ensure we don't get trapped in the QML rendering loop on shutdown
2016-03-09 13:45:00 -08:00
Brad Hefta-Gaub
975f0f049c
Merge pull request #7297 from jherico/upload_fix
...
Fix edit.js upload button
2016-03-09 13:14:35 -08:00
Andrew Meadows
4ae94c0611
fine tuning for when to make simulation bid
2016-03-09 13:06:34 -08:00
Brad Davis
6e24b66b38
Fix edit.js upload button
2016-03-09 12:21:31 -08:00
Brad Hefta-Gaub
e038c8a43c
Merge branch 'master' of https://github.com/highfidelity/hifi into bugfixes
2016-03-09 11:47:55 -08:00
Zach Pomerantz
d06b99967e
Merge branch 'master' of github.com:highfidelity/hifi into fix/cache-loaded
2016-03-09 11:18:05 -08:00
Andrew Meadows
9157ff6eda
more correct notion of desired simulation priority
2016-03-09 11:02:50 -08:00
samcake
f82bd441a9
IMproving th ecomment
2016-03-09 10:34:49 -08:00
Zach Pomerantz
54af58834a
Mark Resource loaded after postprocessing
2016-03-09 10:34:07 -08:00
samcake
d1135c4a37
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-09 10:20:54 -08:00
Anthony J. Thibault
4691ca1716
Merge branch 'master' into tony/hand-controller-move-improvements
2016-03-09 10:06:28 -08:00
Brad Hefta-Gaub
1c07276501
fix a couple bugs
2016-03-09 09:45:55 -08:00
Seth Alves
a2eb819bc2
Merge pull request #7282 from zzmp/fix/tex-cache
...
Avoid caching textures before they load
2016-03-09 09:25:01 -08:00
Seth Alves
efdef52081
Merge pull request #7269 from ctrlaltdavid/20822
...
Restyle bookmark dialogs
2016-03-09 07:31:15 -08:00
Andrew Meadows
99a1310711
change properties at 127 priority, grab at 128
2016-03-08 22:17:44 -08:00
samcake
2fc359d34c
Merge branch 'orange' of https://github.com/samcake/hifi into orange
2016-03-08 19:42:54 -08:00
samcake
5f80d7e53e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-08 19:42:26 -08:00
samcake
bb9957b7f1
using comments from review
2016-03-08 18:45:20 -08:00
samcake
bfed0304c3
Merge pull request #7218 from zzmp/fix/resort-in-octree
...
Fix item key lookup on updated items in scene
2016-03-08 17:48:51 -08:00
Anthony J. Thibault
deb17e1f93
Merge branch 'master' into tony/hand-controller-move-improvements
2016-03-08 17:45:50 -08:00
samcake
afbec33f36
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-08 16:12:21 -08:00
Brad Hefta-Gaub
8d4ef28411
CR feedback
2016-03-08 15:29:04 -08:00
Brad Hefta-Gaub
35d6afbe77
Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable
2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5
first cut at fixing the scene not stable bug
2016-03-08 14:52:21 -08:00
Chris Collins
fd53d4de2b
Merge pull request #7280 from zzmp/fix/fbx-multiple-mats
...
Fix inlined fbx content for identically named texs with different paths
2016-03-08 14:41:23 -08:00
Zach Pomerantz
883d4ba006
Only cache processed textures
2016-03-08 14:39:53 -08:00
David Rowe
10e4e5e3a7
Use OffscreenUI icon enum instead of QMessageBox icon enum
2016-03-09 11:33:55 +13:00
