Commit graph

54103 commits

Author SHA1 Message Date
David Rowe
f7d87c4c28 Tweak start-up delay 2017-04-19 16:32:46 +12:00
David Rowe
9088d1ef9c Tablet version of recordings browser dialog 2017-04-19 16:15:22 +12:00
samcake
2c16b2bf3a Expose the runtime from the engine in Stats 2017-04-18 18:12:42 -07:00
David Rowe
00b6b2a2c0 Implement desktop recordings browser dialog 2017-04-19 12:34:59 +12:00
samcake
5af171f69f Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-18 17:08:02 -07:00
samcake
63fe579022 simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead' 2017-04-18 17:05:40 -07:00
Sam Gateau
4df41ff7d3 Merge pull request #10206 from AndrewMeadows/avatar-renderer-001
Cleanup dependencies in Avatar class in preparation for migration to new lib
2017-04-18 16:45:51 -07:00
Dante Ruiz
1cf9485143 fixed compile issue 2017-04-19 00:23:05 +01:00
Zach Pomerantz
e0cb809f58 add hmd:bool to changed_display_mode 2017-04-18 18:48:28 -04:00
Zach Pomerantz
858a1db38b only log changed_display_mode on successful change 2017-04-18 18:48:23 -04:00
Zach Pomerantz
c7a7fa90ec update Display menu on unsuccesful selection 2017-04-18 18:47:57 -04:00
Zach Pomerantz
f432cfea62 check HMD.active for tutorial zone 2017-04-18 18:47:11 -04:00
Zach Pomerantz
a310acd37f check HMD usage for tutorial teleport 2017-04-18 18:46:53 -04:00
Brad Davis
2a2102c7fe Recompute memory pressure state after each promote / demote call 2017-04-18 15:12:34 -07:00
Dante Ruiz
ce8dba21a0 fix tablet proxy choosing wrong root 2017-04-18 22:49:43 +01:00
Dante Ruiz
f8ec49eb96 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-18 21:53:37 +01:00
Dante Ruiz
5cd4007aaa got input recording working 2017-04-18 21:53:23 +01:00
Howard Stearns
89fa6601b9 Merge pull request #10238 from howard-stearns/callback-on-profile-failure
Be sure to callback even on profile failure.
2017-04-18 13:40:03 -07:00
kunalgosar
ffdbc12968 copy into new vector 2017-04-18 12:20:03 -07:00
howard-stearns
3113dced7b Be sure to callback even on profile failure. 2017-04-18 12:06:44 -07:00
Seth Alves
0807e036e8 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-18 11:59:23 -07:00
Seth Alves
21ca767b7c remove setPosition and setRotation for actions because they were never finished and never used. 2017-04-18 11:59:16 -07:00
Seth Alves
d077c9f1de print rather than crash in what should be an impossible situation 2017-04-18 11:58:56 -07:00
Andrew Meadows
da55c96c4c protect against crash on invalid scene on shutdown 2017-04-18 11:52:22 -07:00
Andrew Meadows
014d7b8d8d use viewFrustum position for laser pointer render filtering 2017-04-18 11:52:22 -07:00
Andrew Meadows
71c5644c23 more shared_ptr by const reference 2017-04-18 11:52:22 -07:00
Andrew Meadows
31bfc98b87 use const reference for ScenePointer when possible 2017-04-18 11:52:22 -07:00
Andrew Meadows
0cc6763617 fix build by including EntityItem.h 2017-04-18 11:52:22 -07:00
Andrew Meadows
e60a28620d cleanup FancyCamera implementation 2017-04-18 11:52:22 -07:00
Andrew Meadows
a3682a1a0e cleanup includes in Avatar.cpp and remove cruft 2017-04-18 11:52:21 -07:00
Andrew Meadows
5a458c9923 remove last qApp usage from Avatar class 2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c remove Camera argument from Avatar::render() 2017-04-18 11:52:21 -07:00
Andrew Meadows
fbacbd74f7 pass shared pointers by ref in Avatar::render() 2017-04-18 11:52:21 -07:00
Andrew Meadows
9cddbbc42a more interface-only spaghetti out of Avatar 2017-04-18 11:52:21 -07:00
Andrew Meadows
272cf07c31 removed cruft: unused Camera::toViewFrustum() 2017-04-18 11:52:21 -07:00
Andrew Meadows
1137bd1436 pull qApp spaghetti out of Avatar class
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
2017-04-18 11:52:21 -07:00
kunalgosar
06c5fa0585 correctly resizing blendshapes vector 2017-04-18 11:44:59 -07:00
kunalgosar
d215856b23 cleanup to blendshapes 2017-04-18 11:44:59 -07:00
kunalgosar
0a295fc258 setBlendshapes will presist 2017-04-18 11:44:59 -07:00
Zach Fox
7505b82189 Merge pull request #10046 from Triplelexx/21224
21224 - Allow people to save avatar bookmarks
2017-04-18 11:10:50 -07:00
samcake
c008a6dd14 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-18 11:05:04 -07:00
samcake
f8a59aa255 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-18 11:04:16 -07:00
samcake
fc7e2edc51 Merge branch 'brown' of https://github.com/samcake/hifi into brown 2017-04-18 11:04:07 -07:00
Seth Alves
d84dd4ce67 Merge pull request #10234 from druiz17/webview-redesign
tablet webview navigation bar redesigned
2017-04-18 10:23:39 -07:00
Rob Kayson
a0c8c4df52 tetherball stick and ball remove themselves after 2 seconds if user who has them equipped leaves the domain 2017-04-18 10:07:02 -07:00
Seth Alves
b2de5ebdaf Merge pull request #10136 from mittens/21217
Added quadratic ease-in-and-out smoothing to remote avatars
2017-04-18 10:05:48 -07:00
Thijs Wenker
9ea28ab8d6 remove Script.require-less code now that the release with Script.require is out. 2017-04-18 18:02:53 +02:00
Brad Hefta-Gaub
8c1ca1dc33 Merge pull request #10236 from highfidelity/stable
Stable back to master...
2017-04-18 09:01:16 -07:00
Chris Collins
a8e43c99ca Merge pull request #10197 from highfidelity/RC-37
Beta Release 37
2017-04-18 07:58:04 -07:00
volansystech
e5c7587ad8 Improve far grabbing based on timescale. 2017-04-18 20:01:02 +05:30