Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 05:13:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53665 commits 25 branches 0 tags 1.1 GiB
Commit graph

53665 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
076bf0943e Attach HMD "recording" indicator to camera 2017-04-21 10:33:24 +12: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
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12: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
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
David Rowe
00b6b2a2c0 Implement desktop recordings browser dialog 2017-04-19 12:34:59 +12: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
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
Seth Alves
d84dd4ce67 Merge pull request #10234 from druiz17/webview-redesign 
tablet webview navigation bar redesigned
 2017-04-18 10:23:39 -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
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
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
Dante Ruiz
31b61c3225 removed white space 2017-04-18 00:24:34 +01:00
Dante Ruiz
e46d9da98f fixed merge conflict 2017-04-18 00:22:35 +01:00
David Rowe
f920192244 Fix up script tear-down 2017-04-18 08:22:29 +12:00
Zach Fox
d1a11740f0 Whoops 2017-04-17 13:00:23 -07:00
Zach Fox
9c4e367245 Merge pull request #10213 from zfox23/fixGoToFocus 
FB 4156; Fix GoTo text field focus; other GoTo tweaks
 2017-04-17 12:13:41 -07:00
Zach Fox
e6edce5352 Entirely remove addressBarToggle() 2017-04-17 12:13:01 -07:00
Brad Hefta-Gaub
f841a18de4 Merge pull request #10230 from zfox23/fixGetAvatarACScripts 
Fix getAvatar() not working for AC scripts
 2017-04-17 12:04:11 -07:00
Zach Fox
e13000410e Whoops 2017-04-17 11:02:27 -07:00
David Kelly
af08df85c8 Merge pull request #10229 from davidkelly/dk/shareableURLForUserStories 
put shareable_url in UserStory details when creating
 2017-04-17 10:55:47 -07:00
Zach Fox
7a7cfb84e5 Remove HMD keyboard focus toggle on AddressBar input 2017-04-17 10:08:40 -07:00
Dante Ruiz
3eb9b37c29 Merge branch 'master' of github.com:highfidelity/hifi into webview-redesign 2017-04-17 16:41:15 +01:00
David Kelly
3e268fbf68 put shareable_url in UserStory details when creating 2017-04-17 07:38:24 -07:00
David Rowe
7dcda47f95 Fix recording GIF still displaying when reopen tablet to stop recording 2017-04-16 12:57:37 +12:00
David Rowe
15128faa49 Fix (work around) tablet access at Interface start-up crashing Interface 2017-04-15 17:11:03 +12:00