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

20232 commits

Author SHA1 Message Date
Andrew Meadows
6393972874 remove AvatarManager dependency from Avatar 2017-04-27 13:11:57 -07:00
Andrew Meadows
65682a914d remove cufty AvatarManager LocalLights feature 2017-04-27 13:11:57 -07:00
Andrew Meadows
4c212fb1e5 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-27 13:11:57 -07:00
Seth Alves
b0c12dd84a warn rather than crash if we get unexpected action data 2017-04-27 13:04:47 -07:00
howard-stearns
e4f259e630 back to non-fake data 2017-04-27 13:01:33 -07:00
howard-stearns
56196c03a3 pr review 2017-04-27 12:56:32 -07:00
Seth Alves
203a14f2a0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux 2017-04-27 12:56:11 -07:00
David Kelly
63468cc9e1 Thread safety for sending location 2017-04-27 12:20:56 -07:00
howard-stearns
97777a416d Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar 2017-04-27 12:02:02 -07:00
Philip Rosedale
f555291d92 Merge pull request #10296 from Triplelexx/21296 
21296 - Move two menu items
 2017-04-27 11:37:07 -07:00
Seth Alves
93f9716557 merge from upstream 2017-04-27 10:17:00 -07:00
Seth Alves
15661987be load tablet overlay models with higher priority 2017-04-27 10:16:08 -07:00
Seth Alves
68b59e4601 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux 2017-04-27 07:56:49 -07:00
Seth Alves
b196dd082b expose bullet slider constraint to javascript 2017-04-27 07:56:35 -07:00
Triplelexx
a154879001 change menu item text Audio Noise Reduction to Noise Reduction 2017-04-27 03:25:24 +01:00
Triplelexx
f9c6cb27f4 change menu item for avatar collisions to "Collide with world" 2017-04-27 03:16:04 +01:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62 remove debugging code 2017-04-26 18:36:44 -07:00
Triplelexx
f795027ab7 change menu item locations 
AudioNoiseReduction moved under Audio.  Avatar Collision under Avatar.
 2017-04-27 01:09:04 +01:00
anshuman64
d146431e9b Merge pull request #10268 from druiz17/input-recorder 
Input recorder/ input playback system  for all input actions
 2017-04-26 16:20:20 -07:00
anshuman64
c088bd6891 Merge pull request #10271 from humbletim/21281 
CR Job #21281 -- Doppleganger Mirror
 2017-04-26 16:18:14 -07:00
Zach Fox
9ace7a7488 Merge pull request #10279 from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
Andrew Lowry
d3a9114676 Uses spaces instead of tabs for Edit.qml and EditTabView.qml. 2017-04-26 18:29:38 -04:00
humbletim
f8bbd9174c Merge remote-tracking branch 'upstream/master' into 21281 2017-04-26 18:26:15 -04:00
anshuman64
5bd9b2e631 Merge pull request #10130 from ctrlaltdavid/21249 
New avatar record and playback script
 2017-04-26 15:18:30 -07:00
Chris Collins
c28a5b2342 Merge pull request #10293 from zzmp/fix/tablet-typo 
fix tablet resolve typo
 2017-04-26 15:02:23 -07:00
Dante Ruiz
95d6a451c6 fixed work mapping 2017-04-26 22:14:53 +01:00
Ryan Huffman
8ba56a96df Merge pull request #10240 from zzmp/fix/hmd-tutorial 
Condition tutorial on active HMD
 2017-04-26 14:00:02 -07:00
Zach Pomerantz
532284f779 fix tablet resolve typo 2017-04-26 16:28:42 -04:00
Andrew Meadows
fd874429c1 remove unused cruft 2017-04-26 12:51:16 -07:00
Andrew Meadows
ac751029c0 remove identity cache code 2017-04-26 12:51:16 -07:00
Andrew Meadows
4511156d7b cache avatar identity info forever 2017-04-26 12:50:48 -07:00
ZappoMan
7840377109 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 12:39:30 -07:00
Anthony J. Thibault
ef43ff4b99 Add default pose matrices to InputCalibrationData structure 2017-04-26 11:55:24 -07:00
ZappoMan
5dd6daaad7 send identity on nodeActivated not nodeAdded 2017-04-26 11:42:38 -07:00
Dante Ruiz
4df953d510 fixed text issue 2017-04-26 19:14:14 +01:00
Dante Ruiz
d8e6e8e7d0 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-26 16:53:02 +01:00
Dante Ruiz
79d827c6be added requested features 2017-04-26 16:52:51 +01:00
Seth Alves
c7ab4994ea Merge pull request #10282 from druiz17/tablet-webview-keyboard 
Added tabletwebview keyboard for HMD
 2017-04-25 19:30:49 -07:00
David Rowe
1b635d8c5e Replace FIXMEs with proper code 2017-04-26 13:29:51 +12:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
ZappoMan
65801cbb4d Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 18:21:17 -07:00
ZappoMan
5164aa4056 hacking 2017-04-25 18:21:09 -07:00
ZappoMan
90cdeb9582 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 16:09:59 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Dante Ruiz
5a9cf554e7 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-25 23:57:48 +01:00
Atlante45
62b7855e1f Add pending to stats 2017-04-25 15:56:23 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
Dante Ruiz
851eece0e4 removed comments 2017-04-25 23:26:16 +01:00
Dante Ruiz
b78bae37be added keyboard for tabletWebview 2017-04-25 23:22:27 +01:00
David Rowe
7c2e1aa846 Tidy FIXME 2017-04-26 10:16:35 +12:00
Anthony J. Thibault
dc19f37726 input/controller routing thru skeleton model and rig. 2017-04-25 15:04:47 -07:00
Brad Hefta-Gaub
1962a49f3b Merge pull request #10225 from sethalves/bullet-constraints-1 
Bullet constraints + far-grab bootstrap fix
 2017-04-25 13:36:47 -07:00
Zach Pomerantz
d2bfcce3f7 Merge pull request #10242 from zzmp/fix/display-log 
Send changed_display_mode after it changes
 2017-04-25 16:36:12 -04:00
humbletim
760113f9c9 add doppleganger example/placeholder icons 2017-04-25 16:29:34 -04:00
Brad Hefta-Gaub
0783433d75 Merge pull request #10251 from birarda/edit-baked-column 
add a column to edit.js to identity baked models
 2017-04-25 13:04:48 -07:00
Seth Alves
23592f4a53 get rid of _trackedHeadPosition 
(cherry picked from commit e909938b232e11400832ae7dd29de16968967668)
 2017-04-25 11:03:43 -07:00
Seth Alves
0cd2863df4 start on routing HMD position and rotation through controller interface 
(cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)
 2017-04-25 11:01:52 -07:00
Dante Ruiz
8c020a0ec2 saving work 2017-04-25 18:01:19 +01:00
David Rowe
d682924b00 Temporary fix for recording audio 2017-04-25 21:08:10 +12:00
ZappoMan
382645ddd0 more cleanup 2017-04-24 18:01:54 -07:00
ZappoMan
aa955ee360 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762 new approach to the tpose fix, as well as other improvements 2017-04-24 17:36:05 -07:00
Anthony J. Thibault
937f308ba8 code cleanup 2017-04-24 17:04:16 -07:00
humbletim
3641ca3816 add support for jointRotations/jointTranslations to ModelOverlay 2017-04-24 19:24:54 -04:00
humbletim
28b3eef7aa add getJointTranslations() methods 2017-04-24 19:22:02 -04:00
Zach Pomerantz
4a26785eda cleanup Audio bg threads in cleanupBeforeQuit 2017-04-24 18:21:27 -04:00
Zach Pomerantz
cd2665fc55 standardize Audio bg thread joins 2017-04-24 18:10:50 -04:00
Dante Ruiz
367a6ac03c first prototype 2017-04-24 22:09:01 +01:00
Anthony J. Thibault
dc3803a225 Re-enable IK _hipsOffset computation when no hips IK target is present. 2017-04-24 13:59:02 -07:00
David Rowe
d52125e2f5 Merge branch 'master' into 21249 2017-04-25 07:19:56 +12:00
Dante Ruiz
f69691afd5 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-24 19:57:48 +01:00
Dante Ruiz
d057dfebf0 got input recording to work 2017-04-24 19:57:38 +01:00
samcake
c36f8da4c0 Fixing build on mac 2017-04-24 10:46:29 -07:00
Andrew Lowry
6a218eaca9 Embeds colpick color picker in dat.GUI for particle explorer. 
Cleans up eslint for particleExplorer.js.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
aea89824c5 Switches tablet edit tab to particle explorer when particle entities are 
selected or created.
 2017-04-24 13:35:37 -04:00
Seth Alves
17b83dd64c Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-21 17:19:47 -07:00
Andrew Meadows
3f9f16cc98 Merge pull request #10223 from kunalgosar/blendshapesbug 
Make setBlendshape changes persist
 2017-04-21 16:11:13 -07:00
howard-stearns
fac40f51d9 message waiting art 2017-04-21 16:00:23 -07:00
Dante Ruiz
64fcfd33a4 working on loading files 2017-04-21 22:38:53 +01:00
howard-stearns
ce7f3197f6 watch for announcements 2017-04-21 14:27:38 -07:00
ZappoMan
ff45ad53a3 some more CR cleanup 2017-04-21 10:40:41 -07:00
ZappoMan
f133713d0e CR feedback 2017-04-21 10:21:34 -07:00
Dante Ruiz
cc34cb96e4 making ui for input recorder 2017-04-21 18:15:47 +01:00
Brad Davis
a62a44ff6a Merge pull request #10252 from jherico/organize_resources 
Organize the files in the JS and QML projects to appear in a folder hierarchy
 2017-04-21 09:38:59 -07:00
Ken Cooke
a5ed3007b3 Merge pull request #10248 from vladest/notify-sound-inject 
Notify sound inject
 2017-04-21 09:26:36 -07:00
ZappoMan
c03182546b some cleanup 2017-04-21 09:11:51 -07:00
Dante Ruiz
641a7390ba Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-21 16:46:55 +01: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
ZappoMan
e89b6c5d2c some initial debugging on tpose avatars 2017-04-20 17:26:31 -07: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
howard-stearns
e13237dade Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar 2017-04-20 14:57:25 -07:00
howard-stearns
4ea882cad1 faster initial response 2017-04-20 14:56:34 -07:00
howard-stearns
ce7145a388 Announcement cards, debug data. 2017-04-20 14:40:24 -07:00
Brad Davis
a8de6eab8c Organize the files in the JS and QML projects to appear in a folder hierarchy 2017-04-20 14:39:06 -07:00
Stephen Birarda
924624b127 add new glyphs with check, reference in entityList 2017-04-20 14:21:13 -07:00
howard-stearns
bc77eeeabd scroll, margins 2017-04-20 13:43:55 -07:00
Vladyslav Stelmakhovskyi
2665ede06f Audio injector cleanup 2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi
b2533b6106 Code nitpick. Pointer cleanup on exit 2017-04-20 21:12:57 +02: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
Vladyslav Stelmakhovskyi
06406ef7de Merge branch 'master' into notify-sound-inject 2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi
023d03d9f8 Implemented snap sound using sound injector 2017-04-20 17:43:16 +02:00
Seth Alves
f7378abb08 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-20 02:40:10 -07:00
howard-stearns
b8e9fb67b8 old style card fonts, margins, etc. 2017-04-19 16:34:10 -07:00
howard-stearns
2512255dd0 reusable feeds 2017-04-19 16:33:02 -07: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
howard-stearns
3ce238b8a0 make feed self contained 2017-04-19 13:45:58 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
howard-stearns
c5f1455872 go horizontal 2017-04-19 12:47:28 -07:00
Dante Ruiz
d4c8d06575 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-19 20:42:11 +01:00
Dante Ruiz
07f674eabe exprting compressed file 2017-04-19 20:41:56 +01: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
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
a310acd37f check HMD usage for tutorial teleport 2017-04-18 18:46:53 -04: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
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
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
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
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
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
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
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
Anthony J. Thibault
0ebaba7cf8 Now supports sensorConfig with hips and chest sensors 2017-04-14 17:00:46 -07:00
Anthony J. Thibault
a10b157aff First pass at having an explicit Hips IK target. 
Also, AnimManipulator nodes support setting position and rotation on a single joint.
 2017-04-14 17:00:44 -07:00
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -07:00
Sam Gateau
3519a72f8a Merge pull request #10190 from samcake/ambient-bis 
Introducing a tool to debug the current Zone Stack
 2017-04-14 13:28:59 -07:00
Zach Fox
a4587e33f3 Tiny forward/backward icon updates 2017-04-14 13:19:33 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Seth Alves
d0144f4110 avatar-action-far-grab works now 2017-04-14 12:44:54 -07:00
Zach Fox
a623ced64e Fix hover states on back/forward buttons 2017-04-14 12:43:07 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Seth Alves
b1dc5be316 make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar 2017-04-14 11:48:06 -07:00
Dante Ruiz
863d64b2fd removed comments and non-needed files 2017-04-14 18:06:44 +01:00
Dante Ruiz
7189d4d7fa daving web work 2017-04-14 17:01:23 +01:00
Zach Fox
0543709081 Focus fix 2017-04-13 16:10:36 -07:00
Zach Fox
520ceebf5b Small HMD tweaks 2017-04-13 15:52:59 -07:00
Zach Fox
d9dc8ebc41 More improvements 2017-04-13 15:48:51 -07:00
Seth Alves
0dab94fada Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:34:46 -07:00
Zach Fox
f23f9ec698 Merge pull request #10207 from zfox23/gifShareImprovements 
Snapshot sharing improvements
 2017-04-12 16:33:44 -07:00
Seth Alves
0eb9507a10 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:25:50 -07:00
Zach Fox
71caf85a27 Quick fix! 2017-04-12 14:57:44 -07:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
Chris Collins
c545558b8a Merge pull request #10199 from AndrewMeadows/avatar-should-vanish 
Avatar should vanish when teleporting far away
 2017-04-12 12:28:46 -07:00
Zach Fox
ef2cea0d63 Merge pull request #10203 from zfox23/fix/avatarMouthsMoving 
Make avatar's mouths move again
 2017-04-12 11:36:03 -07:00
Zach Fox
39587d5308 lol 2017-04-12 10:54:28 -07:00
David Kelly
a12407ddda Merge pull request #10202 from davidkelly/dk/3934 
Connection sort change
 2017-04-12 10:42:04 -07:00
David Kelly
058a5b14a4 damn linter didn't run - vimrc work ahead... 2017-04-12 10:22:40 -07:00
David Kelly
9376ac646f offline people sort change 2017-04-12 08:41:36 -07:00
Seth Alves
cc77fce95f hinge is sort-of working 2017-04-12 07:12:05 -07:00
Seth Alves
74c0a70cb0 rename base action classes to dynamics, start on constraints 2017-04-11 20:39:13 -07:00
Andrew Meadows
b8a3c856be update model transform even when out of view 2017-04-11 15:03:11 -07:00
Chris Collins
b07ed13023 Merge pull request #10184 from druiz17/snapshot-fix 
snapshot bug fixes
 2017-04-11 13:00:46 -07:00
Chris Collins
c86acfafef Merge pull request #10120 from huffman/feat/stick-default-avatar 
Change default avatar to ball and stick avatar
 2017-04-11 12:56:25 -07:00
Seth Alves
f555ae253f Merge pull request #10192 from druiz17/tablet-webview-fix 
webview go back to previous page fix
 2017-04-11 12:11:43 -07:00
Zach Fox
6569de697d Merge pull request #10187 from zfox23/fix/getAvatar_Fix 
Fix FB3999; Fix crashes caused by getAvatar() design bug
 2017-04-11 11:17:48 -07:00
Dante Ruiz
9c79e62004 webview-fix 2017-04-11 18:49:40 +01:00
samcake
79bcf95792 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-11 10:00:34 -07:00
Dante Ruiz
d823093ddb fixed merge conflict 2017-04-11 16:58:25 +01:00
Seth Alves
d5f5192954 Merge pull request #10174 from vladest/fix-snapshot-login-cancel 
Check if dialog was opened from StackView and then pop or just go to …
 2017-04-11 07:07:29 -07:00
Seth Alves
bf16309917 Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002 
avoid invisible avatars redux
 2017-04-11 07:07:03 -07:00
Stephen Birarda
db6fc40277 fix ScriptAvatar promotion of AvatarData 2017-04-10 22:15:45 -07:00
Stephen Birarda
b8620f6919 make getAvatar in AvatarManager Q_INVOKABLE 2017-04-10 22:15:45 -07:00
Stephen Birarda
e7299a5435 add missing include for ScriptAvatar in AvatarManager 2017-04-10 22:15:45 -07:00
Stephen Birarda
84a5807ff1 return ScriptAvatarData raw pointer from getAvatar 2017-04-10 22:15:45 -07:00
Zach Fox
54ca8bd89e grab audio loudness from correct avatar 2017-04-10 22:15:45 -07:00
Stephen Birarda
42a406e90a add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts 2017-04-10 22:15:45 -07:00
Zach Fox
a16e261735 Checkpoint before a number of confusing changes 2017-04-10 22:15:44 -07:00
Stephen Birarda
4ed22ad7ac move audio loudness to AvatarData, change AvatarData to ScriptOwnership 2017-04-10 22:15:44 -07:00