Seth Alves
b600000307
refactor code a bit
2016-03-20 17:59:15 -07:00
Brad Hefta-Gaub
92c9dbc1aa
Merge pull request #7404 from sethalves/quiet-invisible-zone
...
don't spam log when a zone is invisible
2016-03-20 17:56:15 -07:00
Seth Alves
21c688390c
make voxels.js buttons work, again
2016-03-20 17:40:03 -07:00
Seth Alves
f8b8877369
coding standard
2016-03-20 17:37:06 -07:00
Brad Hefta-Gaub
5b3be03098
Merge pull request #7402 from hyperlogic/tony/empty-geometry-crash
...
NetworkGeometry: Fix crash for empty geometry/bad FBX versions
2016-03-20 17:25:27 -07:00
Seth Alves
d4ed9993b2
don't spam log when a zone is invisible
2016-03-20 15:06:17 -07:00
Anthony Thibault
5b2a050df7
display-plugins: Pulled getHeadPose into common base class.
...
* Moved getHeadPose and _headPoseCache out of each derived class and into HmdDisplayPlugin.
* updated comment in application.
2016-03-20 14:08:35 -07:00
Brad Hefta-Gaub
9d4d396db4
Merge pull request #7403 from hyperlogic/tony/disable-watchdog-for-debug
...
Application: disable deadlock watchdog for debug builds
2016-03-20 12:37:50 -07:00
Anthony Thibault
b71a56de38
Application: disable deadlock watchdog for debug builds
...
Cause it will cause a crash if you sit on a breakpoint for too long.
2016-03-20 12:18:33 -07:00
Anthony Thibault
6e872edcae
NetworkGeometry: Fix crash for empty geometry/bad FBX versions
...
Interpret empty geometry as an error.
2016-03-20 12:13:54 -07:00
Brad Hefta-Gaub
b8929c4416
Merge pull request #7384 from zzmp/fix/bugsplat-1836
...
Check qml gl context on create
2016-03-20 11:26:09 -07:00
Zach Pomerantz
62e635a52a
Compile qml render thread on *nix
2016-03-18 18:43:59 -07:00
Zach Pomerantz
12aa057ff6
Always log if gl context fails
2016-03-18 18:37:14 -07:00
Zach Pomerantz
f987da4c43
Move qml rendering to defined thread
2016-03-18 18:10:45 -07:00
Ryan Huffman
b7678f9818
Remove accidental addition of whitespace
2016-03-18 16:33:00 -07:00
Ryan Huffman
c5c35b7e89
Add HandshakeRequest packet
2016-03-18 16:30:19 -07:00
Anthony J. Thibault
e1d47e7028
OculusLegacyDisplayPlugin: mac os x and linux fixes
2016-03-18 16:23:30 -07:00
Zach Pomerantz
105b4e16a9
Add back ambientURL listener in editor
2016-03-18 16:18:41 -07:00
Anthony J. Thibault
4321c5a62b
OculusLegacyDisplayPlugin: fixes for macosx and linux
2016-03-18 15:59:48 -07:00
Andrew Meadows
e81e49b32e
prevent crash in SwingTwistConstraint
2016-03-18 15:59:25 -07:00
Brad Hefta-Gaub
c3c7d3d776
Merge pull request #7394 from howard-stearns/safer-early-exit-for-obj-subresources
...
Safer early-bail for fetch of subresources of .obj models.
2016-03-18 15:42:33 -07:00
Anthony J. Thibault
960ffd9c9e
DisplayPlugins: updateHeadPose() no longer returns a value.
...
Also, moved updateHeadPose so that the overlay and the main rendering use the same headPose.
Which should also be the same place the latencyMarker for the ovr_GetTrackingState is set.
2016-03-18 15:16:58 -07:00
howard-stearns
b9a3e130cb
Safer early-bail for fetch of subresources of .obj models.
2016-03-18 15:02:30 -07:00
Brad Hefta-Gaub
2ef5b3727e
Merge branch 'master' of https://github.com/highfidelity/hifi into fixBlenderCrash
2016-03-18 14:04:45 -07:00
Anthony J. Thibault
2faaf243a1
Revert change to OpenVrDisplayPlugin::isSupported()
2016-03-18 13:42:31 -07:00
Chris Collins
5e8c10508c
Merge pull request #7392 from jherico/resource
...
Make shared lists thread safe
2016-03-18 13:25:58 -07:00
James B. Pollack
ce932640bd
Merge pull request #7353 from huffman/fix-keylight-edit
...
Fix keylight direction naming and usage in edit.js
2016-03-18 12:35:48 -07:00
Anthony J. Thibault
d218ca4960
openvr: fix for crash on exit
...
Before this fix, a script could call into HMD.getHUDLookAtPosition2D() while the app was shutting down, which in turn would call
getHeadPose() on the currently active display plugin. This call could cause a crash within the openvr plugin, because the SDK was either shutdown, or in the process of shutting down on the main thread.
This fixes this by spliting the previous DisplayPlugin::getHeadPose(int) into two parts:
* updateHeadPose(int) which is only called once a frame and only by the main thread.
* getHeadPose() which is thread-safe and will return a cached copy of the hmd pose sampled by the last updateHeadPose.
2016-03-18 12:26:11 -07:00
Brad Hefta-Gaub
925d5d36ac
clean up the recalculateMeshBoxes() calls in findRayIntersectionAgainstSubMeshes()
2016-03-18 12:20:45 -07:00
samcake
312635c1db
Merge pull request #7391 from zzmp/fix/fbx-alpha
...
Look at whole tex for alpha mask
2016-03-18 11:31:00 -07:00
Bradley Austin Davis
16e6d9a4f9
Make shared lists thread safe
2016-03-18 11:15:35 -07:00
Zach Pomerantz
a0ba5d3c29
Look at whole tex for alpha mask
2016-03-18 11:00:36 -07:00
Brad Hefta-Gaub
481a75faca
Merge pull request #7366 from markej/ShowDownloadURLs
...
Show which URLs are being actively downloaded
2016-03-18 10:42:01 -07:00
Chris Collins
5ca1598572
Merge pull request #7388 from howard-stearns/os-window-vs-modal-overlay-in-script-editor
...
Os window vs modal overlay in script editor
2016-03-18 09:33:17 -07:00
timemarkov
160b4e7ba2
Implement new design of attachment dialog
2016-03-18 12:11:00 +01:00
Howard Stearns
0cbddb217c
Don't ask about differences over after the user has said no -- until the external file changes again.
2016-03-17 19:58:28 -07:00
Brad Hefta-Gaub
0474be59c9
remove invalid.com url
2016-03-17 19:49:45 -07:00
Brad Hefta-Gaub
eb8a6527c6
change ModelBlender to use a set<WeakPointers> to safely handle model lifetime
2016-03-17 19:44:42 -07:00
Brad Hefta-Gaub
917c4644a5
make SkeletonModel be shared_ptr friendly as well
2016-03-17 18:03:49 -07:00
Philip Rosedale
0347f85d3a
Merge pull request #7386 from sethalves/fix-parenting-grab
...
observers see parent-grabs again
2016-03-17 17:47:25 -07:00
Seth Alves
1e02c8d9d3
minimize diff
2016-03-17 17:28:36 -07:00
Seth Alves
cbfde2032c
fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand
2016-03-17 17:09:32 -07:00
Brad Hefta-Gaub
7483b8546b
remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it
2016-03-17 17:05:35 -07:00
howard-stearns
d59d5549a1
Merge branch 'master' of https://github.com/highfidelity/hifi into os-window-vs-modal-overlay-in-script-editor
2016-03-17 17:04:54 -07:00
Zach Pomerantz
60f22c51b9
Check qml gl context on create
2016-03-17 16:56:23 -07:00
howard-stearns
a957716511
Disable script editor close and tab close when we have a modal dialog up
...
about external changes to the file.
2016-03-17 16:54:59 -07:00
Brad Hefta-Gaub
a6ecfd789c
Merge pull request #7381 from sethalves/fix-crashes-1
...
fix FBXGeometry::convexHullContains crash
2016-03-17 16:00:58 -07:00
Zach Pomerantz
b1e020d3fd
Fix threadname typo
2016-03-17 15:56:57 -07:00
Zach Pomerantz
5e953c9833
Rm Enable3DTVMode const
2016-03-17 15:56:57 -07:00
Brad Hefta-Gaub
edcf642410
Merge pull request #7374 from jherico/plugin_switch_crash
...
Reduce crashes on switching display plugins
2016-03-17 15:51:39 -07:00
