ericrius1
b7534fbd57
basics of virtual baton
2016-03-21 13:52:26 -07:00
Ryan Huffman
99010c7bf6
Fix audio packet being used in a thread-unsafe way
2016-03-21 13:33:56 -07:00
samcake
ec7165983d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-21 13:30:28 -07:00
samcake
d189dc4af2
Problem not fixed yet, need to merge with upstream
2016-03-21 13:30:08 -07:00
Zach Pomerantz
40aabe7fae
Delete used QNetworkReply
2016-03-21 13:30:01 -07:00
Ryan Huffman
afb1d68f3b
Fix handshake packet being used across SendQueues
2016-03-21 13:24:04 -07:00
Andrew Meadows
f58a00f75a
Merge pull request #7409 from huffman/fix-handle-reply-finished
...
Fix edge-case where resource can receive a signal after request deleted
2016-03-21 13:10:24 -07:00
Andrew Meadows
47c4b226ea
Merge pull request #7395 from hyperlogic/tony/openvr-crash-on-exit
...
openvr crash on exit fix
2016-03-21 13:04:45 -07:00
Brad Hefta-Gaub
2389295217
actually properly remove pending blendshapes
2016-03-21 13:04:37 -07:00
samcake
227ddb12a6
Trying to clen up the way the opacity final value comes to the fragment shader
2016-03-21 12:14:59 -07:00
Anthony J. Thibault
df5afffc77
AnimUtil: prevent accumulateTime from looping forever
...
This might happen with large dts, large timeScales.
2016-03-21 11:58:13 -07:00
Ryan Huffman
4f32749c17
Fix edge-case where resource can receive a signal after request deleted
2016-03-21 11:54:41 -07:00
ericrius1
6c5ad187a0
Merge remote-tracking branch 'upstream/master'
2016-03-21 11:51:38 -07:00
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
Menithal
cdbb7b2ad4
Set UserAnimPreAndPostRotations true by Default
...
If Blender avatars are animated by Blender animations, they have missing
Pre and Post rotations. This step is no longer necessary to have false,
and also makes sure all animations from Blender Work on all avatars (from
other platforms).
This commit make it default to be enabled:
2016-03-19 12:49:57 +02: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
samcake
f7847f6561
Trying to fix names
2016-03-18 17:32:00 -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
