Commit graph

41306 commits

Author SHA1 Message Date
Brad Hefta-Gaub
6eed8fb429 fix unix build 2016-03-24 13:30:20 -07:00
Ken Cooke
063891d65e remove dead code 2016-03-24 13:29:57 -07:00
Anthony J. Thibault
ba4520fe56 Avatar: fix for Avatar animation updates while wearing HMD
The boundingSphere vs frustum check now uses the displayViewFrustum, which
more accurately reflects the actual projection matrix used for rendering.
2016-03-24 13:23:30 -07:00
Anthony J. Thibault
c302c803b0 CullTask: added ability to disable culling during rendering.
You can use the following JavaScript to disable culling:

    Render.RenderDeferredTask.CullSceneSelection.skipCulling = true
2016-03-24 13:20:29 -07:00
Ken Cooke
c6ca984782 Fix Reverb Zone settings to work correctly with new reverb. 2016-03-24 12:59:52 -07:00
Brad Hefta-Gaub
208b594ef8 make the deadlock watchdog more generous and add some logging so we can see heatbeats on slow machines 2016-03-24 12:37:07 -07:00
Menithal
24f2bdac77 Fixed Styling 2016-03-24 20:58:32 +02:00
Brad Davis
a43fde0803 Build a better event bridge 2016-03-24 11:01:06 -07:00
Clément Brisset
caf2595e13 Merge pull request #7452 from birarda/udt-fixes
fix unecessary re-sends at capacity on udt, race in SendQueue timeout check
2016-03-24 11:00:57 -07:00
Ozan
003af03b33 Merge pull request #7400 from Menithal/default-use-pre-post
Set UserAnimPreAndPostRotations true by Default
2016-03-24 09:57:03 -07:00
Seth Alves
bd178640f1 Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-24 09:51:31 -07:00
Brad Davis
8bbabf186f Fix async issues related to JS / QML object lifetimes 2016-03-24 09:38:54 -07:00
Brad Hefta-Gaub
16c5971a7f Merge pull request #7455 from ctrlaltdavid/20860
Miscellaneous improvements to Attachments dialog
2016-03-24 09:21:36 -07:00
Philip Rosedale
f8f0e48af9 Merge pull request #7453 from Atlante45/fix/atp-req-limit
Make ATP respect request limit
2016-03-24 09:20:30 -07:00
Seth Alves
1aadebb4e7 Merge pull request #7445 from AndrewMeadows/shape-management
fix memory leak in ShapeManager
2016-03-24 08:45:49 -07:00
Philip Rosedale
0e2d9d8aaa Merge pull request #7432 from samcake/orange
Fix some Model loading issues with the translucent textures
2016-03-24 08:41:35 -07:00
Andrew Meadows
21c770f37b Merge pull request #7441 from zzmp/clean/resource-reinsert
Restrict Resource reinsertion
2016-03-24 08:41:12 -07:00
Andrew Meadows
c8655b8524 Merge pull request #7438 from PhilipRosedale/airship
Sample script:  Airship
2016-03-24 08:40:36 -07:00
David Rowe
51728d14a7 Miscellaneous improvements to Attachments dialog 2016-03-24 21:17:36 +13:00
Philip Rosedale
8e572ed635 Merge pull request #7423 from thoys/20859
CR for Job #20859 - Fix particle color selection
2016-03-24 00:20:59 -07:00
Philip Rosedale
61205e0e37 Merge pull request #7450 from ZappoMan/reduceLogSpam
reduce log spam
2016-03-24 00:19:09 -07:00
Philip Rosedale
366810a20c Merge pull request #7447 from ZappoMan/fixNonAnimatedMotorProteins
fix animated motor proteins
2016-03-24 00:11:26 -07:00
PhilipRosedale
8c4ecc64d9 fix entity script location 2016-03-23 22:49:18 -07:00
Seth Alves
462da3aaf3 don't call getMesh from render 2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554 redo polyvox locking 2016-03-23 22:03:27 -07:00
Brad Hefta-Gaub
2b0670718f Merge pull request #7449 from howard-stearns/report-previous-session-data
Report previous session data
2016-03-23 20:58:51 -07:00
Brad Hefta-Gaub
3505c14552 Merge pull request #7444 from birarda/uncover-qml
Attachments Dialog QML updates (from contractor)
2016-03-23 20:45:50 -07:00
Brad Hefta-Gaub
cdd5126589 Merge pull request #7451 from hyperlogic/tony/increased-deadlock-timer
DeadlockWatchdogThread: bumped up age from 10 to 15 seconds.
2016-03-23 20:39:12 -07:00
Atlante45
69c516caaf Have ATP respect request limit 2016-03-23 19:09:28 -07:00
Stephen Birarda
ef3f5e0221 fix for race in last receiver response 2016-03-23 18:23:30 -07:00
Anthony J. Thibault
de3144cde5 Merge branch 'master' into tony/vive-rendering-work 2016-03-23 18:13:59 -07:00
Stephen Birarda
1b322c8d01 don't oversend because of packet pairs 2016-03-23 18:07:28 -07:00
Anthony J. Thibault
0ef5c45815 DeadlockWatchdogThread: bumped up age from 10 to 15 seconds.
This will, hopefully, prevent false positives from people loading content on slow PCs.
2016-03-23 17:59:54 -07:00
PhilipRosedale
7b326c9d7b fixes per review 2016-03-23 17:56:02 -07:00
samcake
add811e404 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-23 17:52:27 -07:00
samcake
6d6f0398f5 TRying to create a graph :) 2016-03-23 17:52:06 -07:00
Brad Hefta-Gaub
62a56ecbfa fix typos 2016-03-23 17:45:22 -07:00
Anthony Thibault
88c4e54cff openvr: predict 3 frames into the future
Becasue I revered the latency fix in the GLEscrow queue.

*sigh*
2016-03-23 17:38:40 -07:00
Howard Stearns
a393f36978 Forgot important comment. 2016-03-23 17:31:21 -07:00
Stephen Birarda
57da7c2ba7 add handling for short circuit loss in SendQueue 2016-03-23 17:29:46 -07:00
Howard Stearns
c09c1438f8 ivar init order. 2016-03-23 17:28:54 -07:00
Philip Rosedale
e1f3665185 Merge pull request #7435 from hyperlogic/tony/all-jitter-must-die
MyAvatar: fix jitter in hands when moving
2016-03-23 17:28:47 -07:00
Brad Hefta-Gaub
574642a6e4 Merge pull request #7440 from zzmp/feat/resource-finished
Add finished signal to Resource loading
2016-03-23 17:17:53 -07:00
Anthony J. Thibault
73725106f0 OpenGLDisplayPlugin: For non-threaded present use fetchAndReleasewithGpuWait 2016-03-23 17:13:29 -07:00
Anthony J. Thibault
cec6e7dd8d Application: reduced idle PROFILE_RANGE spam 2016-03-23 17:12:48 -07:00
Anthony J. Thibault
8bb387dc74 Revert GLEscrow changes 2016-03-23 17:11:16 -07:00
Brad Hefta-Gaub
fdd0b48ae1 reduce log spam 2016-03-23 17:06:03 -07:00
howard-stearns
dbdf79f96f Restore whitespace so there aren't superfluous diffs. 2016-03-23 17:01:50 -07:00
howard-stearns
c435ca212a Report previous session time. 2016-03-23 16:59:17 -07:00
Menithal
12ecd592ab Added Refresh Buttons to entityProperties
Pressing buttons next to the url bar will now allow for content to have an
automatic unix timestamp to be applied / updated to the end of the url.
Applies for all url entity Properties
2016-03-24 01:14:48 +02:00