Brad Hefta-Gaub
492e71345a
Revert "Revert "Fix ModelBlender crash""
...
This reverts commit f274cdcc7f
2016-03-21 11:42:25 -07:00
Zach Pomerantz
d3d0f229aa
Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread
2016-03-21 11:25:14 -07:00
Zach Pomerantz
41fcf4cc6d
Forward declare qml render thread
2016-03-21 11:18:18 -07:00
Brad Hefta-Gaub
091e34e792
Merge pull request #7396 from AndrewMeadows/do-not-trust
...
prevent crash in SwingTwistConstraint
2016-03-21 11:13:41 -07:00
Andrew Meadows
fa7371aff8
Merge pull request #7408 from highfidelity/revert-7387-fixBlenderCrash
...
Revert "Fix ModelBlender crash"
2016-03-21 10:54:01 -07:00
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00
Andrew Meadows
cd802a6549
Merge pull request #7406 from hyperlogic/tony/transparent-texture-fix
...
Model: fix for avatars with late loaded transparent textures.
2016-03-21 09:19:33 -07:00
Andrew Meadows
d7d428d1b2
Merge pull request #7387 from ZappoMan/fixBlenderCrash
...
Fix ModelBlender crash
2016-03-21 09:14:11 -07:00
Brad Hefta-Gaub
6822f0643b
Merge pull request #7397 from zzmp/fix/ambient-url-listener
...
Add back ambientURL listener in editor
2016-03-21 08:49:43 -07:00
Brad Hefta-Gaub
2e7bc5f430
Merge pull request #7405 from sethalves/fix-voxels-js
...
make voxels.js buttons work, again
2016-03-21 08:46:29 -07:00
Anthony Thibault
b06f027f2e
Model: fix for avatars with late loaded transparent textures.
2016-03-20 18:20:03 -07:00
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
Menithal
066c517dd7
Grab.js: Update Position on Mouse Grab Start
...
Fixes grab event issue where if the object is moving, the position does
not update until the user has moved their mouse.
This commit makes sure that the moment the user starts dragging on a
object that isnt grabbed by another, the position is immediately updated
instead of waiting for the user to move their mouse.
2016-03-18 08:59:07 +02: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
