Stephen Birarda
bf3324fc6b
hold download of ATP script if Asset Server isn't ready
2016-04-08 15:28:12 -07:00
Anthony J. Thibault
93a5bdd79a
Prevent avatar rotation due to HMD head turning in third-person camera.
...
Also, fix one frame glitch during snap turning, by updating the sensorToWorld matrix
after the MyAvatar::updateOrientation rotates the avatar, but before we perform IK.
2016-04-08 15:27:43 -07:00
Brad Hefta-Gaub
f1f8fd8a24
fix export of animation properties
2016-04-08 14:40:06 -07:00
Stephen Birarda
1df0dce971
use ResourceRequest in Agent to handle ATP scripts
2016-04-08 14:38:26 -07:00
Brad Davis
b87e8220c4
Merge pull request #7619 from imgntn/noRefresh
...
Remove refresh feature from edit.js for now
2016-04-08 13:35:17 -07:00
Seth Alves
95f446183f
use for loop rather than iterator
2016-04-08 13:32:33 -07:00
Brad Davis
2353daa254
Merge pull request #7614 from ctrlaltdavid/20876
...
Disable arrow keys being able to move between HTML form fields
2016-04-08 13:28:30 -07:00
Brad Davis
8e1e11a6f8
Merge pull request #7615 from zzmp/fix/amd-particles
...
Add explicit layout to textured particle shader
2016-04-08 13:19:41 -07:00
Seth Alves
6088612ce0
guard access to _missingParent vector with a lock to allow safe access from multiple threads
2016-04-08 13:16:30 -07:00
Anthony J. Thibault
711a1b8c7d
Avatar: update renderItems when avatar position or render mesh is in the frustum.
...
Previously, when render mesh was visible the renderItems they were not updated with the latest avatar mixer joints rotations and position.
This would result in a frozen avatar being visible.
Now the renderItems are updated when the render mesh is in the frustum or the bounding sphere around the avatar position is visible.
2016-04-08 13:14:50 -07:00
Brad Hefta-Gaub
7ba08dd137
Merge pull request #7613 from hyperlogic/tony/model-entity-render-fix
...
Reading animation properties without an entityTree lock is considered harmful
2016-04-08 10:37:17 -07:00
samcake
ef70d41cf4
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-04-08 09:41:35 -07:00
Ryan Huffman
6232c82f66
Update BugSplat to only send first and last log files
2016-04-08 09:39:25 -07:00
Ryan Huffman
2d60a9a51e
Reduce log size limit from 1MB to 512KB
2016-04-08 09:39:08 -07:00
samcake
4374bd26ae
Disabling COmpression
2016-04-08 01:37:27 -07:00
James B. Pollack
b407e20e4b
remove regexp
2016-04-08 00:52:09 -07:00
James B. Pollack
fba6a74cf6
remove refresh for now
2016-04-08 00:50:15 -07:00
samcake
be178e9e09
fixing warnings
2016-04-07 23:44:28 -07:00
samcake
04e71df3bc
fixing a stupid code and a warning
2016-04-07 23:05:50 -07:00
Brad Hefta-Gaub
35c8ae3381
Merge pull request #7618 from sethalves/fix-voxel-icons
...
host voxel icons on s3 rather than hungry.com
2016-04-07 20:58:08 -07:00
Seth Alves
723af9bcbd
host voxel icons on s3 rather than hungry.com
2016-04-07 20:34:34 -07:00
samcake
76dd740578
Cleaning up to test before merge, not solved the stuttering happening when using compressed textures. cleaned up a bit of the TextureMap doanload callbacks
2016-04-07 20:05:05 -07:00
Zach Pomerantz
e54cfce392
Disable qml alpha gradients for AMD
2016-04-07 18:27:36 -07:00
Zach Pomerantz
e08c9db469
Expose GL property to QML
2016-04-07 18:27:07 -07:00
Zach Pomerantz
be489e8728
Codify qt qml version in one header
2016-04-07 17:35:31 -07:00
Zach Pomerantz
4e3ab73941
layout std140 in particle shader
2016-04-07 17:27:51 -07:00
Brad Hefta-Gaub
d79d66c34e
Merge pull request #7601 from ctrlaltdavid/20871
...
Entities editor fixes
2016-04-07 17:14:00 -07:00
Brad Hefta-Gaub
5287c174b4
Merge pull request #7605 from jherico/route_log_errors
...
Fixing logging errors on initial load of controller routes
2016-04-07 17:13:13 -07:00
David Rowe
86d314f31a
Clarify code comment
2016-04-08 10:47:45 +12:00
David Rowe
e37e46d34a
Disable arrow keys being able to move between HTML form fields
...
Moving between form fields with arrow keys makes it to easy to make
unintended changes to adjacent fields.
2016-04-08 10:30:00 +12:00
Brad Hefta-Gaub
3d94558d6b
Merge pull request #7589 from jherico/oculus_input
...
Support oculus remote input
2016-04-07 15:05:45 -07:00
Brad Hefta-Gaub
157dd96303
Merge pull request #7612 from ZappoMan/mirrorReturnsToLastView
...
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
2016-04-07 14:56:53 -07:00
Brad Davis
d3f5f6ed00
Merge pull request #7609 from ZappoMan/reduceLogSpam
...
reduce log spam for the deadlock watchdog
2016-04-07 14:51:02 -07:00
Brad Hefta-Gaub
772e7b95f6
Merge pull request #7584 from zzmp/log/dep-is-set
...
Avoid warning for expected unset PresentThread
2016-04-07 14:47:56 -07:00
Brad Hefta-Gaub
e7d75cb22e
Merge pull request #7573 from sethalves/update-collision-hulls-of-avatar-children
...
Update collision hulls of avatar children
2016-04-07 14:47:44 -07:00
Brad Davis
72d8990fed
Fix menu launch from Oculus remote
2016-04-07 14:13:02 -07:00
Anthony J. Thibault
8f530ceaf9
Reading animation properties without an entityTree lock is considered harmful
...
In RenderableModelEntityItem::update() make a copy of the _animationProperties, which is under the entityTree lock.
In RenderableModelEntityItem::render() read from the copy of _animationProperties when not under the entityTree lock.
2016-04-07 13:42:40 -07:00
Brad Hefta-Gaub
d1a2a30c02
fix build buster
2016-04-07 13:41:05 -07:00
Brad Hefta-Gaub
09004680d0
handle a couple edge cases
2016-04-07 13:32:26 -07:00
Brad Davis
2f28c64edb
Fixing menu navigation in oculus remote
2016-04-07 13:21:00 -07:00
Brad Davis
a58a627fdf
Support oculus remote input
2016-04-07 13:20:59 -07:00
Brad Davis
4c78c0b330
Fix broken xbox controllers
2016-04-07 13:17:49 -07:00
Seth Alves
45733478da
make auto-unequip code smarter -- equipping a long thing by the end is now possible
2016-04-07 13:15:39 -07:00
Brad Hefta-Gaub
81bb5ff07d
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
2016-04-07 13:13:19 -07:00
Brad Hefta-Gaub
bd1eb5842a
fix crash related to menu vs watchdog create order
2016-04-07 12:45:24 -07:00
Brad Hefta-Gaub
f3275b680b
Merge branch 'master' of https://github.com/highfidelity/hifi into reduceLogSpam
2016-04-07 12:10:15 -07:00
Brad Hefta-Gaub
dc4751a95b
Merge pull request #7595 from ZappoMan/depthReticleWork
...
Fix a random case of the depth reticle hiding when it shouldn't
2016-04-07 12:06:20 -07:00
Brad Davis
d8310cc6b1
Reduce controller log spam
2016-04-07 10:41:55 -07:00
Brad Davis
85019b2b5e
Fixing logging errors on initial load of controller routes
2016-04-07 10:41:54 -07:00
Brad Hefta-Gaub
2c3aeddbe4
reduce log spam for the deadlock watchdog
2016-04-07 10:25:08 -07:00
