Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 03:47:15 +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
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
Zach Fox
6ddd7a612c Initial pass at fix looks promising 2017-04-10 22:15:44 -07:00
Chris Collins
d8581c1026 Merge pull request #10176 from vladest/snaps_hover 
Added hover to Snaps and Places
 2017-04-10 16:09:43 -07:00
Seth Alves
eb281389f5 fix includeActions so places show up in All 2017-04-10 14:46:31 -07:00
Howard Stearns
99ba07dcb2 Merge pull request #10181 from davidkelly/dk/infoButtonFix 
re-enable the info button for user images on nearby tab
 2017-04-10 13:27:33 -07:00
Dante Ruiz
e0f19944bc Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix 2017-04-10 20:58:46 +01:00
Dante Ruiz
4e94aaa9e8 finished allowing to go back to previous app 2017-04-10 20:58:10 +01:00
Seth Alves
05bf1930ca Merge pull request #10169 from hyperlogic/feature/absolute-default-joints-in-object-frame 
Added accessor to get Avatar default pose in avatar space
 2017-04-10 12:55:02 -07:00
Howard Stearns
8682df6bb7 Merge pull request #10154 from davidkelly/dk/3995 
updated connection instructions
 2017-04-10 12:43:20 -07:00
David Kelly
5fc4bbc260 re-enable the info button for user images on nearby tab 2017-04-10 12:26:34 -07:00
Andrew Meadows
e20fcca959 Merge pull request #10179 from jherico/avatar_rendering 
Creating new avatar rendering library, prepping for crowd rendering project
 2017-04-10 11:29:08 -07:00
David Kelly
082d0964d2 oops 2017-04-10 11:08:45 -07:00
Bradley Austin Davis
0ca0874c52 Creating new avatar rendering library, prepping for crowd rendering project 2017-04-10 10:55:04 -07:00
samcake
16e6f0900d Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-10 10:12:23 -07:00
David Kelly
cd55728490 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/4036 2017-04-10 10:09:27 -07:00
David Kelly
46b6903b93 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-10 10:08:17 -07:00
Vladyslav Stelmakhovskyi
393b24452d Added hover to Snaps and Places 2017-04-10 17:07:59 +02:00
David Kelly
3ea6cac45a HMD.mounted instead of HMD.isMounted 2017-04-10 08:05:01 -07:00
druiz17
92bb7f2329 saving work 2017-04-09 18:55:53 -07:00
Philip Rosedale
c74778116a Merge pull request #10156 from Triplelexx/21256 
21256 - Add packet loss % to stats
 2017-04-09 18:00:01 -07:00
Vladyslav Stelmakhovskyi
7628916db6 Check if dialog was opened from StackView and then pop or just go to home menu 2017-04-09 20:09:15 +02:00
Sam Cake
b65448bcbe Trying to improve the Job/Task classes and testing it with the ZoneRenderer 2017-04-09 11:08:35 -07:00
Triplelexx
7936637e9c and tired.. 2017-04-09 11:02:35 +01:00
Triplelexx
54eb7c10c6 distracted 2017-04-09 10:50:22 +01:00
Triplelexx
ec6885a2fb change audioPacketLoss stat to display largest of upstream/downstream loss 2017-04-09 09:49:41 +01:00
Seth Alves
aa89903a9f Merge pull request #10160 from vladest/tabletwebview-yahoo-fix 
Yahoo, Reddit etc now works correctly
 2017-04-08 20:25:18 -07:00
Dante Ruiz
86c67a3017 tablet pages 2017-04-08 02:01:21 +01:00
Chris Collins
8e12f62cbb Merge pull request #10153 from druiz17/goto-fix 
Ability to toggle goto with the crt-l and enter keys
 2017-04-07 16:36:41 -07:00
Chris Collins
1175f65cb0 Merge pull request #10162 from vladest/goto-white-buttons-fix 
Check if offset outside image, set to last image
 2017-04-07 15:58:48 -07:00
David Kelly
948a821824 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-07 14:30:22 -07:00
Anthony J. Thibault
e065c1bac4 Added jsdoc for new Avatar.getAbsoluteDefaultJoint*InObjectFrame API 2017-04-07 14:12:03 -07:00
Anthony J. Thibault
40844d2a49 Added getAbsoluteDefaultJoint*InOjbectFrame to Avatar API. 2017-04-07 14:03:31 -07:00
David Kelly
174b2978e3 username stays around now when tabbing to connections 2017-04-07 14:01:36 -07:00
Howard Stearns
57d8ec883e Merge pull request #10163 from davidkelly/dk/3938 
updated availability combo dialog
 2017-04-07 13:57:17 -07:00
Seth Alves
03065ee6c8 Merge pull request #9938 from kunalgosar/jsRenderBug 
Stop WebEntities Running Files and Commands
 2017-04-07 13:44:03 -07:00
Dante Ruiz
cde9310f3e goto home button fix 2017-04-07 21:35:28 +01:00
Dante Ruiz
909fda98a4 git goto button toggle hightlight 2017-04-07 21:01:53 +01:00
David Kelly
870e003311 Scattered X glyphs around the letterbox and combo dialogs 2017-04-07 11:12:54 -07:00
Andrew Meadows
92495d9622 delete in proper order on shutdown 2017-04-07 11:10:48 -07:00
Andrew Meadows
8773497f7e remvoe commented out cruft 2017-04-07 11:08:06 -07:00
Andrew Meadows
1fb88a0315 add a helpful comment 2017-04-07 11:08:06 -07:00
Andrew Meadows
6d627aa9bc don't remove other avatars on sign-out 2017-04-07 11:08:06 -07:00
Andrew Meadows
2f18e51f6b lock mutex around fading avatar list 2017-04-07 11:08:06 -07:00
Andrew Meadows
662c34c266 fix avatar scale animation and avatar render debug 2017-04-07 11:06:16 -07:00
Vladyslav Stelmakhovskyi
a1892b351f Cant use underscores outside class internals 2017-04-07 19:40:46 +02:00
David Kelly
ee9bc0bfa4 updated availability combo dialog 2017-04-07 10:25:37 -07:00
Triplelexx
4c2823b42d change increment operator 2017-04-07 18:21:43 +01:00
Vladyslav Stelmakhovskyi
9a563ba02f Check if offset outside image, set to last image 2017-04-07 19:17:09 +02:00
Andrew Meadows
40e223cb82 cleanup unused return values and redundant variables 2017-04-07 09:58:04 -07:00
Andrew Meadows
2775b17a65 unravel one loop of spaghetti 2017-04-07 09:56:26 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient 
Rename render::PendingChanges to render::Transaction
 2017-04-07 09:54:10 -07:00
Triplelexx
fcfd206e9c change implict conversions 2017-04-07 17:47:04 +01:00
David Kelly
12b5b91754 Merge pull request #10161 from howard-stearns/fix-pal-connections-help 
fix pal connections-tab help trigger
 2017-04-07 09:34:11 -07:00
Howard Stearns
468cc7f19b Merge pull request #10150 from davidkelly/dk/3930 
friends checkbox speedup
 2017-04-07 09:27:39 -07:00
David Kelly
cb092d67dd Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-07 09:01:59 -07:00
Howard Stearns
03013ecb3a fix pal connections-tab help trigger 2017-04-07 07:30:36 -07:00
Vladyslav Stelmakhovskyi
f88ba7bc57 Yahoo, Reddit etc now works correctly 2017-04-07 15:45:33 +02:00
Triplelexx
27a404d0ea remove extra lines 2017-04-07 07:09:18 +01:00
Triplelexx
279997d905 change display plugin to deactivate when window minimized 2017-04-07 06:49:28 +01:00
David Kelly
d64a803451 no need to set checked 2017-04-06 16:08:48 -07:00
David Kelly
a1c211395b Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column 
fix sorting by pal connections-tab friends column
 2017-04-06 15:43:21 -07:00
Seth Alves
584905a618 fix warning 2017-04-06 15:41:35 -07:00
David Kelly
179a445f59 updated connection instructions 2017-04-06 15:21:10 -07:00
Howard Stearns
67f2cc3567 Merge pull request #10148 from davidkelly/dk/3936 
pal selection changes
 2017-04-06 14:58:46 -07:00
howard-stearns
9577102c22 fix sorting by pal connections-tab friends column 2017-04-06 14:45:08 -07:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
David Kelly
331f2da4f8 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936 2017-04-06 14:22:08 -07:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
David Kelly
726395ac3e friends checkbox speedup 2017-04-06 14:07:07 -07:00
Howard Stearns
f7ef587c61 Merge pull request #10138 from davidkelly/dk/3935 
Now you can forget connections
 2017-04-06 14:05:25 -07:00
David Kelly
46a7d28e16 Merge pull request #10144 from howard-stearns/notice-login-change-in-pal 
notice login/logout change in pal
 2017-04-06 12:57:22 -07:00
David Kelly
e0a1422345 pal selection changes 2017-04-06 12:07:51 -07:00
trent
21f810e040 Fixed formatting concerns as well as a benign order-of-constructor warning. 2017-04-06 14:50:16 -04:00
samcake
19d080c4cc Merging 2017-04-06 11:33:41 -07:00
howard-stearns
1d60a55d5f notice login/logout change in pal 2017-04-06 11:20:08 -07:00
David Kelly
85c78da839 updated, plus fixed some annoying errors in logs from Pal.qml 2017-04-06 11:16:51 -07:00
trent
76d3e6d598 Added an assert for out-of-bounds values in the smoothing function; also clamped the values that I was sending in on the avatar-side. 2017-04-06 13:21:59 -04:00
Triplelexx
1b2887d5b1 change paintGL to return if window is minimized 2017-04-06 17:06:06 +01:00
Vladyslav Stelmakhovskyi
16fa7988f6 TabletWebView redesigned to single WebView instance 2017-04-06 17:53:46 +02:00
Triplelexx
f588612fc3 add audioPacketLoss % display in stats 2017-04-06 16:04:14 +01:00
trent
43b3a6c624 Addressing some style inconsitency issues, as well as making the position/orientation times constants. 2017-04-05 21:31:13 -04:00
David Kelly
06bd9c97bf remove info button from avatar image 2017-04-05 18:21:54 -07:00
David Kelly
61ece265f4 now you can forget connections 2017-04-05 18:16:16 -07:00
Dante Ruiz
5bb4edf18c Merge branch 'master' of github.com:highfidelity/hifi into goto-fix 2017-04-06 00:16:59 +01:00
Dante Ruiz
90f5d02c99 goto toggle option 2017-04-06 00:13:53 +01:00
trent
c739db7562 Added quadratic ease-in-and-out smoothing to remote avatars position/orientation updates (through... one path, at least?). 2017-04-05 17:39:52 -04:00
samcake
1a9005ed8b Avoid unexpected changes 2017-04-05 13:57:40 -07:00
samcake
8356e5495f Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-05 13:12:21 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Dante Ruiz
34f3c4abee removed mousearea 2017-04-05 18:08:03 +01:00
Dante Ruiz
de8b7eeb27 removed commented code 2017-04-05 18:02:55 +01:00
Dante Ruiz
24b89275f2 fix new model dialog textInput 2017-04-05 18:00:43 +01:00
kunalgosar
8749428ede dont assume no query tags 2017-04-04 13:51:34 -07:00
howard-stearns
6f79b2eaeb send initial path in location update (e.g., on login) 2017-04-04 12:05:43 -07:00
kunalgosar
cc81bcab66 updating url check from hifi master 2017-04-04 11:58:38 -07:00
Kunal Gosar
e5c075f107 fix typo and namespace 2017-04-04 11:54:58 -07:00
kunalgosar
8e4229b211 dont redirect people from webentity 2017-04-04 11:54:58 -07:00
kunalgosar
3b88553699 check scripts 2017-04-04 11:54:58 -07:00
kunalgosar
9d0667cb31 add url tag to web entities 2017-04-04 11:54:58 -07:00
kunalgosar
19ab7526d3 apply profile to relevant entities 2017-04-04 11:54:21 -07:00