Commit graph

53691 commits

Author SHA1 Message Date
David Rowe
ce86ce4530 Red buttons to unload recordings 2017-04-21 19:45:14 +12:00
David Rowe
8060e98bd5 Right-align "i" icon and update info text 2017-04-21 17:46:30 +12:00
David Rowe
d064511121 Rearrange dialog controls 2017-04-21 17:01:29 +12:00
David Rowe
1aa6e20791 Change "Record" button to "Stop" while recording 2017-04-21 16:15:49 +12:00
David Rowe
477237cca2 Red "recording" ring animation with countdown numbers inside 2017-04-21 16:07:50 +12:00
David Rowe
aaf9b40bb3 New app icon 2017-04-21 15:20:08 +12:00
David Rowe
daedb94b04 Merge branch 'master' into 21249 2017-04-21 14:50:28 +12:00
Sam Gateau
a668ed0409 Merge pull request #10244 from samcake/ambient
Cleaning the Engine/Task/Job interface
2017-04-20 15:48:21 -07:00
David Rowe
076bf0943e Attach HMD "recording" indicator to camera 2017-04-21 10:33:24 +12:00
Zach Pomerantz
b77917b8d1 Merge pull request #10241 from zzmp/fix/display-fail
Update Display menu on unsuccesful selection
2017-04-20 12:04:51 -04:00
David Rowe
43619d1db1 Finish with TODOs 2017-04-20 14:22:54 +12:00
David Rowe
0da4e3e3c4 Display scrollbar in recordings table when needed 2017-04-20 14:19:25 +12:00
Zach Fox
50456f71ed Merge pull request #10142 from Triplelexx/21258
21258 - Don't render (or heavily use GPU) when window in minimized
2017-04-19 16:26:49 -07:00
Brad Hefta-Gaub
a555846d5d Merge pull request #10235 from volansystech/21206
21206 Far grab improvement to draw held entity toward yourself
2017-04-19 14:33:09 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
samcake
7f72efa714 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-19 11:51:25 -07:00
Sam Gateau
788849e19a Merge pull request #10208 from jherico/gl41_variable
Adding support for variable allocated textures to the GL 4.1 backend
2017-04-19 11:42:23 -07:00
Brad Davis
472835d65c Port fix from master 2017-04-19 11:22:20 -07:00
Brad Davis
bccc06d2fe Fix resource texture memory usage tracking 2017-04-19 10:35:19 -07:00
Chris Collins
889b054085 Merge pull request #10067 from humbletim/fix-Entities-setLocalJointTranslations
Fix Entities.setLocalJointTranslations
2017-04-19 09:32:28 -07:00
druiz17
57f6529ce6 Merge pull request #10239 from druiz17/edit-model
Fix issue of tablet proxy not choose the correct root
2017-04-19 09:19:46 -07:00
volansystech
b194ddeb66 Resolve Comments of @sethalves 2017-04-19 16:39:23 +05:30
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
Zach Pomerantz
c7a7fa90ec update Display menu on unsuccesful selection 2017-04-18 18:47:57 -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
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
howard-stearns
3113dced7b Be sure to callback even on profile failure. 2017-04-18 12:06:44 -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
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
Seth Alves
d84dd4ce67 Merge pull request #10234 from druiz17/webview-redesign
tablet webview navigation bar redesigned
2017-04-18 10:23:39 -07:00