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
kunalgosar
9b758dbdba
updated headers
2017-04-04 11:54:21 -07:00
kunalgosar
a0f0879087
added file type filter and interceptor
2017-04-04 11:54:21 -07:00
Stephen Birarda
c7a28a527a
cleanup Agent recording handling, make loadRecording async
2017-04-04 10:56:25 -07:00
Lexx
af95741a7e
Merge branch 'master' into 21224
2017-04-04 18:24:49 +01:00
Triplelexx
b4b5d4fe9b
resolve merge conflict
2017-04-04 18:15:12 +01:00
Triplelexx
01b13d7032
fix crash when pressing "Bookmark Avatar" button
...
also modified LocationBookmarks for consistency
2017-04-04 18:05:00 +01:00
Howard Stearns
b0fa784267
Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach
...
Dk/pal improvements mostly zach
2017-04-04 10:03:10 -07:00
David Kelly
08ac25473f
wording change
2017-04-04 09:53:09 -07:00
Ryan Huffman
8b6dd2a835
Change default avatar to ball and stick avatar
2017-04-04 09:39:06 -07:00
Vladyslav Stelmakhovskyi
367555acdb
Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set
2017-04-04 16:35:21 +02:00
Vladyslav Stelmakhovskyi
332f9bb283
Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error
2017-04-04 16:22:40 +02:00
Vladyslav Stelmakhovskyi
072e024d9a
Fixed warning in JSConsole
2017-04-04 16:10:37 +02:00
Thijs Wenker
2b85563413
Merge pull request #10115 from sethalves/fix-fast-talking
...
Fix fast talking
2017-04-04 02:13:09 +02:00
David Kelly
4d6886d1f4
cr feedback, plus changed 'People' to 'Connections' in a couple places
2017-04-03 17:03:14 -07:00
Seth Alves
cb787c2862
Merge pull request #10104 from druiz17/tablet-webView3.0
...
Remove unnecessary prints and code for tabletWebView.qml
2017-04-03 16:10:54 -07:00
Seth Alves
fbf2014f04
Merge pull request #10102 from vladest/tablet-ui-goto
...
Put current address to location instead of inputfield
2017-04-03 16:09:58 -07:00
Seth Alves
d1827cf12c
Merge pull request #10002 from fayeli/tablet-photobooth
...
Photobooth Improvements: Using Tablet & Ability to Rotate Model
2017-04-03 16:05:13 -07:00
David Kelly
4629accc9c
style updates
2017-04-03 15:35:53 -07:00
Seth Alves
55c2d36752
math fixes, cleanups
2017-04-03 15:30:06 -07:00
Seth Alves
2a43c41954
Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking
2017-04-03 14:44:13 -07:00
Seth Alves
7ac09398be
include deltaTime in audioAttack running average
2017-04-03 14:44:05 -07:00
Andrew Meadows
66ff551a7c
Merge pull request #10080 from ZappoMan/footActions
...
add foot IK targets as actions, map Kinect feet to foot targets
2017-04-03 12:06:14 -07:00
Seth Alves
7f1095c590
use deltaTime rather than calling usecTimestampNow
2017-04-03 11:55:08 -07:00
Seth Alves
9e08925d7e
involve clock time in _mouthTime calculation
2017-04-03 11:34:29 -07:00
David Kelly
2f1b6be24d
Merge branch 'PAL_v2_Zach_new' of https://github.com/zfox23/hifi
2017-04-03 10:55:55 -07:00
Dante Ruiz
3090629f77
clean up code
2017-04-03 18:51:39 +01:00
Anthony Thibault
999bd0d339
Merge pull request #10075 from sethalves/tablet-ui
...
Tablet ui -- misc changes + landscape mode
2017-04-03 10:43:34 -07:00
Vladyslav Stelmakhovskyi
990e1379e3
Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task
...
(cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)
2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi
156166ce4a
Fixed another warning in TabletAddressDialog.qml
...
(cherry picked from commit 73c923bb522ad711380a2fcdaa9babe9f01a639a)
2017-04-03 19:33:13 +02:00
Vladyslav Stelmakhovskyi
9e96888534
Fixed warning: TabletAddressDialog.qml:546: Error: Cannot assign to non-existent property 'shown'
...
(cherry picked from commit e70c2cdcc74f9fd43273dca268433cdefd9ecf40)
2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
6b7f3f7125
Fixed warning: TabletAddressDialog.qml:282:13: QML ListView: Cannot specify top, bottom, and verticalCenter anchors at the same time.
...
(cherry picked from commit b11e245cb1b19149ff00f16b718ff4088b856f3e)
2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
849d65f95f
Fixed warning: Tablet.qml:205: TypeError: Cannot read property of null
...
(cherry picked from commit b1dc14b355bc6053a0e264a057a799a4d446e347)
2017-04-03 19:32:09 +02:00
Seth Alves
c45514a557
Merge pull request #10066 from vladest/tablet-ui-connection-dialog
...
Implemented no connection dialog for Tablet UI
2017-04-03 09:57:00 -07:00
Seth Alves
98a54d9119
Merge pull request #10101 from ctrlaltdavid/21252
...
Fix tablet scrolling getting stuck to mouse pointer
2017-04-03 09:52:45 -07:00
Seth Alves
0f936f7511
Merge pull request #10078 from hyperlogic/feature/avatar-skeleton
...
Expose Avatar Skeleton to JavaScript
2017-04-03 09:39:35 -07:00
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
Vladyslav Stelmakhovskyi
d207dae5b7
Put current address to location instead of inputfield
2017-04-02 20:02:40 +02:00
David Rowe
2b4afdb987
Fix tablet window getting stuck to pointer if release mouse off tablet
2017-04-02 12:58:11 +12:00
Chris Collins
3c62826ef9
Merge pull request #10091 from ctrlaltdavid/21248
...
Fix HTML controls not working properly in the tablet
2017-04-01 08:41:44 -07:00
Chris Collins
cc8b52fff4
Merge pull request #10095 from druiz17/tablet-webView2.0
...
Tablet webview now uses mobile format
2017-04-01 08:33:09 -07:00
Dante Ruiz
7ca7ad5e0b
removed junk file
2017-04-01 01:53:00 +01:00
Zach Fox
f148bca1c0
More progress on ComboDialog
2017-03-31 17:12:41 -07:00
Zach Fox
8a96969471
Merge pull request #9873 from highfidelity/PAL_v2
...
PAL v2.0
2017-03-31 17:00:41 -07:00
Dante Ruiz
b10f491c6e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0
2017-04-01 00:58:37 +01:00
Dante Ruiz
d1bf3e4bf2
fixed webview mobile view
2017-04-01 00:58:09 +01:00
Zach Fox
fd3167ca9c
'PEOPLE' back to 'CONNECTIONS'
2017-03-31 16:41:25 -07:00
Andrew Meadows
0181783290
Merge pull request #10064 from samcake/ambient
...
Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1
2017-03-31 16:04:00 -07:00
Seth Alves
cec02bbf6f
Merge pull request #10011 from humbletim/fix-rightclick-menu-again
...
Fix right-click popup menus in web views
2017-03-31 15:48:11 -07:00
Chris Collins
b36f688a5a
Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default
...
use tablet-ui stylus as default, rather than avatar finger
2017-03-31 15:34:37 -07:00
David Kelly
8ceb6a20f0
friend/unfriend working
2017-03-31 15:05:21 -07:00
Zach Fox
6a4c2c5e12
Fix issues; checkpoint on new ComboDialog
2017-03-31 14:56:42 -07:00
David Rowe
25ac82f162
Don't send "move" events for non-move events
2017-04-01 10:47:04 +13:00
David Rowe
b03fd44240
Fix controls in HTML pages not responding to mouse events on tablet
2017-04-01 10:40:06 +13:00
Clément Brisset
9d0676dd87
Merge pull request #10088 from huffman/stable-merge
...
Stable merge
2017-03-31 14:27:42 -07:00
howard-stearns
5c8b2ba1c3
restore lost code
2017-03-31 13:28:14 -07:00
Seth Alves
8d4982d794
Merge pull request #10087 from druiz17/tablet-webView
...
Better webview handing for the tablet
2017-03-31 13:26:56 -07:00
Seth Alves
54c66aff07
use tablet-ui stylus as default, rather than avatar finger
2017-03-31 13:18:40 -07:00
Dante Ruiz
70d2d69557
Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView
2017-03-31 19:29:31 +01:00
Dante Ruiz
9658e1b8ac
better web view handling
2017-03-31 19:25:03 +01:00
Dante Ruiz
b6901bba3e
added tabletWebView.qml
2017-03-31 18:48:08 +01:00
Vladyslav Stelmakhovskyi
7558765042
Script log now back to HUD
2017-03-31 14:20:15 +02:00
Sam Cake
dd73cb7b8e
Use a magic number gpu::Texture::SINGLE_MIP instead of 1
2017-03-30 23:46:37 -07:00
ZappoMan
53c439ffba
add foot IK targets as actions
2017-03-30 19:11:16 -07:00
Anthony J. Thibault
22901a40c8
Expose Avatar skeletons to JavaScript
2017-03-30 17:27:40 -07:00
Dante Ruiz
8f402c73b0
saving work 2.0
2017-03-31 01:18:31 +01:00
Zach Fox
05c34fb3ee
Move some things around so ComboBox works (and layout improves)
2017-03-30 15:19:19 -07:00
Ryan Huffman
150dcd7dec
Merge remote-tracking branch 'upstream/master' into stable-merge
2017-03-30 14:22:27 -07:00
Zach Fox
c24b8b47a9
Minor layout changes
2017-03-30 14:08:29 -07:00
Howard Stearns
0edbf1fbd9
Merge pull request #10044 from howard-stearns/pal-backend-integration
...
Pal backend integration
2017-03-30 12:55:11 -07:00
Howard Stearns
3056bb16a2
typo, and delete request on abort/fail
2017-03-30 12:40:54 -07:00
David Rowe
985a804fe9
Merge branch 'master' into 21242
2017-03-31 08:03:05 +13:00
Triplelexx
8aa3e56ad4
remove dead code
2017-03-30 19:47:50 +01:00
Triplelexx
57d6213175
remove dead code
2017-03-30 19:42:25 +01:00
Seth Alves
c62b07d26f
add setLandscape call to tablet
2017-03-30 11:36:21 -07:00
David Kelly
e66c075f8e
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-30 10:14:29 -07:00
Seth Alves
cc5fe05268
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-30 09:33:04 -07:00
Triplelexx
ae3f04288d
cleanup
2017-03-30 14:56:04 +01:00
Triplelexx
aa9a2532a9
fix for displaying "Bookmark Avatar" dialog in tablet ui
2017-03-30 13:54:33 +01:00
Triplelexx
bec70976d8
change hidden overloading
2017-03-30 12:07:19 +01:00
samcake
e6d30fbb2f
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-03-29 18:22:47 -07:00
David Rowe
06910d1881
Add comment re scrollbar stability in tablet
2017-03-30 14:20:02 +13:00
David Rowe
f954767b84
Get entities list and entity properties scrollbars working on tablet
2017-03-30 14:04:03 +13:00
samcake
b6504bba56
Moving the num mips per texture to the creator so it s immutable and simpler
2017-03-29 17:58:56 -07:00
Howard Stearns
af25e0e21f
Don't consider changes to location details as update-worthy if we're not discoverable.
2017-03-29 17:55:57 -07:00
Dante Ruiz
cb8660c699
saving work
2017-03-30 01:34:14 +01:00
Triplelexx
50e35a220b
Merge remote-tracking branch 'upstream/master' into 21224
2017-03-30 01:25:27 +01:00
Zach Fox
4887081e2c
New PAL colors; slight layout changes
2017-03-29 16:30:24 -07:00
Howard Stearns
3a7edebb94
Adjust reporting of availability to metaverse.
2017-03-29 16:12:50 -07:00
Zach Fox
a6ff3fcdb7
Tablet PAL bugfix; Connections help text v1
2017-03-29 15:47:19 -07:00
Seth Alves
371df35013
remove code related to tablet being a model rather than an overlay. start on landscape mode
2017-03-29 14:16:14 -07:00
Anthony J. Thibault
332dfa098f
Fix for disappearing toolbar after reload all scripts
2017-03-29 14:10:26 -07:00
Delamare2112
3ebe1a0015
Add AvatarInputs::loudnessToAudioLevel
2017-03-29 14:01:27 -07:00
Howard Stearns
b8f557ca54
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration
2017-03-29 13:30:15 -07:00
Delamare2112
2f6add3398
Expose LimitlessSpeechRecognition to scripts
2017-03-29 12:56:08 -07:00
Delamare2112
4f7cbd5b7c
Add limitless connection and scripting interface
2017-03-29 12:47:58 -07:00
samcake
9bc7e41642
Remove extra calls for binding default textures, not needed
2017-03-29 10:57:08 -07:00
Vladyslav Stelmakhovskyi
209de29b2a
Intial commit. Basically works. Need some testing
2017-03-29 17:36:05 +02:00
Vladyslav Stelmakhovskyi
9822193644
Set z-order of comboboxes to make sure lowest will no overlap higher ones
2017-03-29 14:41:18 +02:00
Howard Stearns
c795d2ca3b
Four-way discoverability. (Needs testing.)
2017-03-28 18:31:08 -07:00
Zach Fox
b776f25b3b
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b
Revert "Merge from upstream/master"
...
This reverts commit b5ba4a109d
2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d
Merge from upstream/master
2017-03-28 17:37:34 -07:00
Seth Alves
8dcbf33e16
Merge pull request #10041 from druiz17/tablet-improve-goto
...
added left out design elements to the tablet goto page
2017-03-28 17:19:50 -07:00
Triplelexx
255e781cc7
check-in after menu experiments
...
https://highfidelity.fogbugz.com/f/cases/3714
2017-03-29 00:48:14 +01:00
howard-stearns
c2a49a582e
send credentials to local metaverse servers, and initial users data
...
integration.
2017-03-28 16:44:16 -07:00
howard-stearns
37ab0b57a7
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration
2017-03-28 15:41:46 -07:00
Dante Ruiz
a76e5ef8d9
improve the design of the tablet goto
2017-03-28 23:02:23 +01:00
Seth Alves
6df4dda746
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 11:42:14 -07:00
Seth Alves
39ec53d69a
Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy
...
Mark the system TabletProxy object as Cpp ownership.
2017-03-28 10:08:05 -07:00
Seth Alves
9e675d4c93
Merge pull request #9990 from hyperlogic/bug-fix/sliders
...
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Anthony J. Thibault
ec6ef01600
Mark the system TabletProxy object as Cpp ownership.
...
This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.
2017-03-28 09:53:00 -07:00
Andrew Meadows
60b8dbfce1
Merge pull request #10026 from AndrewMeadows/cleanup-fbx
...
reduce memory bandwitdh to GPU for skinned meshes
2017-03-28 08:55:06 -07:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
Chris Collins
83aa7358e2
Merge pull request #9998 from birarda/bug/oculus-buttons-flipped
...
fix swapped buttons in oculus touch graphic
2017-03-28 06:50:20 -07:00
Zach Fox
fce2049630
Trivial removal of commented code
2017-03-27 16:45:03 -07:00
Seth Alves
c013813161
Merge pull request #10027 from druiz17/tablet-disable-vto
...
Remove visibleToOthers option for the tablet from general settings
2017-03-27 16:28:23 -07:00
Dante Ruiz
65be71fa69
min diff
2017-03-28 00:05:02 +01:00
Dante Ruiz
7434cc5644
force vto to false on start up
2017-03-28 00:02:02 +01:00
howard-stearns
85347e3269
new location protocol
2017-03-27 15:55:05 -07:00
Dante Ruiz
02535722ba
removed visible to others opition from general settings
2017-03-27 23:31:41 +01:00
Dante Ruiz
018138f422
fixed some issues with tablet help
2017-03-27 22:46:06 +01:00
Andrew Meadows
18544581e6
remove warnings about implicit float cast
2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub
c986077a4f
Merge pull request #10007 from hyperlogic/feature/ik-debug-draw
...
Added Developer > Avatar > Show IK Targets
2017-03-27 14:29:02 -07:00
David Kelly
5c1e085e7b
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 11:29:18 -07:00
David Kelly
76657a670c
added notifications (faked user name for now), along with switch to avatar entities
2017-03-27 11:28:57 -07:00
Seth Alves
9c990b0358
Merge pull request #10018 from druiz17/tablet-login
...
Show login screen in tablet at startup if not logged in and connecting to a domain that requires login
2017-03-27 10:10:41 -08:00
Dante Ruiz
cba7adf32a
removed qDebug
2017-03-27 19:08:41 +01:00
Seth Alves
48ea9acfb3
Merge pull request #10016 from druiz17/tablet-goto
...
Porting goto to the tablet
2017-03-27 10:04:11 -08:00
Dante Ruiz
f4255735a9
make login screen show up on the tablet on startup
2017-03-27 18:03:38 +01:00
Zach Fox
e1a880a5d4
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 09:10:12 -07:00
Dante Ruiz
b8eac7abef
revoming useless code
2017-03-27 16:17:50 +01:00
Triplelexx
07e6b766b5
rename FILENAME constants
2017-03-26 23:10:50 +01:00
Triplelexx
dc64065668
Merge remote-tracking branch 'upstream/master' into 21224
...
update
2017-03-26 22:20:24 +01:00
Triplelexx
a1db20c5fc
cleanup for QA
...
added sorting
2017-03-26 22:18:37 +01:00
Seth Alves
bb28976d0e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-26 09:32:35 -07:00
humbletim
59008e4a40
remove old ../../qml/menus import
2017-03-25 18:37:36 -04:00
Triplelexx
8f507942cf
change storage location
...
still unsure what is best. this is consistent and doesn't require login
2017-03-25 19:10:12 +00:00
Triplelexx
c4bcacf0e0
use QueuedButton for upload dialog
2017-03-25 19:04:40 +00:00
Seth Alves
3abd6b3948
Merge pull request #10006 from druiz17/tablet-help
...
Ported help into the tablet
2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi
edb66ae704
Merge branch 'tablet-ui' into tablet-ui-audio-screen
2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb
Implemented Audio settings screen for Tablet UI
2017-03-25 13:17:38 +01:00
humbletim
5d5d947ddb
updates per discussion with triplelexx
2017-03-25 04:01:02 -04:00
humbletim
630afb716f
consolidate QML->C++ triggering workaround to help compartmentalize the problem for later fixin'
2017-03-25 03:01:35 -04:00
humbletim
96f905362b
alternative way to connect the button?
2017-03-25 01:17:27 -04:00
Triplelexx
d1eee19d7d
move more Bookmark functionality into base class
2017-03-25 01:01:25 +00:00
Zach Fox
e88895935b
Revert "Actually merge from master"
...
This reverts commit 056d6fbe4f
2017-03-24 17:56:48 -07:00
Dante Ruiz
2a59139c76
trying to fix focus issue
2017-03-25 01:17:37 +01:00
Dante Ruiz
9e2768cc84
saving work
2017-03-25 01:06:21 +01:00
Dante Ruiz
3e98b2273c
help in the tablet
2017-03-25 00:52:41 +01:00
Anthony J. Thibault
49a95089d1
Remove hacks for debug rendering of IK targets
...
A AnimContext class was introduced. This context is passed into every node during evaluation/overlay.
It holds non-animVar "global" data passed from the application.
(cherry picked from commit a028d3ba58
2017-03-24 16:27:27 -07:00
Anthony J. Thibault
dd17b2e2f3
Added developer option to draw IK targets in world.
...
(cherry picked from commit 7e7803c648
2017-03-24 16:20:52 -07:00
Triplelexx
bda1d54209
create AvatarBookmarks
...
derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted
2017-03-24 22:58:36 +00:00
Dante Ruiz
6178a86a46
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
2017-03-24 23:56:33 +01:00
Dante Ruiz
119a71d0d1
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-goto
2017-03-24 23:55:18 +01:00
Dante Ruiz
d9046a1982
goto on the tablet
2017-03-24 23:54:54 +01:00
Seth Alves
f1470e34f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-24 15:17:52 -07:00
Anthony J. Thibault
f7de74109b
Added jsdoc documentation for some of MyAvatar properties and methods
2017-03-24 15:10:26 -07:00
Faye Li
8cb771d9a8
fix conflict
2017-03-24 14:46:24 -07:00
Stephen Birarda
3985354ff4
update graphic for oculus touch help with correct buttons
2017-03-24 13:45:56 -07:00
Zach Fox
056d6fbe4f
Actually merge from master
2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087
Revert "Merge from Master"
...
This reverts commit e48123b5bb
2017-03-24 10:04:51 -07:00
Brad Hefta-Gaub
1972b140b9
Merge pull request #9976 from mittens/21215
...
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
2017-03-24 08:52:12 -07:00
Seth Alves
902e3d41d6
merge from upstream
2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59
Merge pull request #9970 from Triplelexx/21223
...
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
Dante Ruiz
a078121c46
saving work
2017-03-24 00:23:13 +01:00
Zach Fox
3f95982f34
Fix bug due to incorrect merge...
2017-03-23 14:00:50 -07:00
Anthony J. Thibault
bab9890fea
Added inputMode property to Web3DOverlay.
...
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
2017-03-23 13:54:18 -07:00
Anthony J. Thibault
8915ecd23d
compile time option to switch from touch to mouse events for web tablet
2017-03-23 13:54:17 -07:00
Zach Fox
a231b57472
Merge pull request #9962 from birarda/cmake-with-space
...
Fix failing POST_BUILD steps on Windows with spaces in build path
2017-03-23 11:41:38 -07:00
Zach Fox
98ee02f84f
Use OpacityMask instead of hack; fix connectionsTab
2017-03-23 10:49:31 -07:00
Zach Fox
a7623dcac8
Use OpacityMask instead of hack; fix connectionsTab
2017-03-23 10:48:44 -07:00
Dante Ruiz
ae111ff2e9
Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto
2017-03-23 18:25:31 +01:00
Zach Fox
e48123b5bb
Merge from Master
2017-03-23 09:54:14 -07:00
Seth Alves
ff3fc244d1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:50:53 -07:00
Dante Ruiz
e708c6478e
Merge branch 'tablet-popup' into tablet-help
2017-03-23 17:35:45 +01:00
Dante Ruiz
af97c7275e
Use loadQMlSource if no stack is aviable
2017-03-23 17:03:24 +01:00
Zach Fox
692ef369c7
Attempted Stale PAL fix - hard to test!
2017-03-22 15:14:11 -07:00
Triplelexx
09cbace975
remove unused getBodyForwardDirection
2017-03-22 21:54:21 +00:00
Brad Davis
85c80f3be8
Merge remote-tracking branch 'upstream/master' into smarter_textures
...
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
Zach Fox
bf191eabb7
Some new stale PAL behavior
2017-03-22 13:35:48 -07:00
trent
36619cd2e4
Fixed issue with duplicate physics status icons per sub-object.
2017-03-22 15:07:29 -04:00
Triplelexx
fd312f6bf8
rename fronts to forwards
2017-03-22 18:49:34 +00:00
Dante Ruiz
3a89654111
saving work
2017-03-22 19:14:53 +01:00
Dante Ruiz
7423bf6ca1
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
2017-03-22 16:33:29 +01:00
Dante Ruiz
a44704c4fe
merging with tablet-ui
2017-03-22 16:32:37 +01:00
Triplelexx
2515563a0b
change getFront to getForward
2017-03-21 22:35:07 +00:00
Triplelexx
8df0395754
change getFrontDirection to getForwardDirection
2017-03-21 22:28:12 +00:00
Triplelexx
b7980569cc
change all references of IDENTITY_FRONT to IDENTITY_FORWARD
2017-03-21 22:13:33 +00:00
Seth Alves
91cac892d2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 14:04:58 -07:00
Chris Collins
4c789c44aa
Merge pull request #9922 from birarda/bug/stuck-ess
...
fix a couple of ESS issues during ES/ESS restart
2017-03-21 12:44:53 -07:00
Seth Alves
1da6349505
merge from upstream
2017-03-21 10:26:02 -07:00
Zach Fox
058faa8c0f
Row color bugfix
2017-03-21 10:03:51 -07:00
Ryan Huffman
13222468e3
Merge pull request #9712 from huffman/feat/edit-particle-icon
...
Add particle system overlay in edit.js
2017-03-21 10:02:52 -07:00
Seth Alves
cc4ddd1387
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 08:43:35 -08:00
Chris Collins
ea13151d55
Merge pull request #9945 from mnafees/21233
...
21233: Remove Scripts Editor option from Edit menu and all related files
2017-03-21 08:01:36 -07:00
Vladyslav Stelmakhovskyi
fb0adae0b1
Scripts debug window in Tablet UI
2017-03-21 15:04:38 +01:00
Zach Pomerantz
20ea13e00a
Merge pull request #9897 from zzmp/record/noise-gate
...
Add AudioNoiseGate to recordings played through Interface
2017-03-21 00:21:20 -04:00
Stephen Birarda
c9d1916eea
fix for build with win path with spaces
2017-03-20 18:24:19 -07:00
Zach Fox
29e97381eb
PAL open, user leaves, gray out row
2017-03-20 17:20:28 -07:00
Faye Li
9cab8b6c4a
end of day commit
2017-03-20 17:04:29 -07:00
