Commit graph

80833 commits

Author SHA1 Message Date
David Rowe
0cafae2422 EntityViewer JSDoc 2019-09-26 10:54:12 +12:00
MiladNazeri
7d7024f5eb
Merge pull request #16247 from MiladNazeri/DEV-148/add-mirror-mode-to-settings
Dev 148/add mirror mode to settings
2019-09-25 12:08:09 -07:00
Brad Hefta-Gaub
06c7a92c27
Merge pull request #16243 from Atlante45/fix/account-settings
DEV-648: Add flag for account settings feature
2019-09-25 11:20:14 -07:00
milad
aba6a28d54 updated camera modes 2019-09-25 11:05:32 -07:00
Brad Hefta-Gaub
068fb0e177
Merge pull request #16240 from ctrlaltdavid/BUGZ-577
BUGZ-577: Implement Recording.setPlayerVolume()
2019-09-25 10:31:57 -07:00
milad
39d96b76a6 fixed help text 2019-09-25 08:41:38 -07:00
milad
103b10e2f9 restored modified file 2019-09-24 16:52:37 -07:00
milad
af5e01f96b restored modified file 2019-09-24 16:51:35 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
milad
677dbe59cc fixed qml typo 2019-09-24 16:47:07 -07:00
milad
edb135776a Added selfie view and updated help 2019-09-24 16:44:34 -07:00
milad
e275fe1da8 Merge branch 'master' of github.com:highfidelity/hifi 2019-09-24 16:07:04 -07:00
milad
b8e7b23ba3 Merge branch 'master' of github.com:MiladNazeri/hifi 2019-09-24 16:06:51 -07:00
Shannon Romano
73c558bc51
Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle
Transition between walk/emote should be faster
2019-09-24 15:49:31 -07:00
Shannon Romano
0c2ca7500d
Merge pull request #16241 from RebeccaStankus/removeInspect
Undo removal of User Inspection
2019-09-24 15:41:35 -07:00
Anthony Thibault
6fbcc9151e
Merge pull request #16235 from luiscuenca/resetLookAtOnGoTo
BUGZ-1553: Reset look at params when the avatar's location is set
2019-09-24 13:20:26 -07:00
Brad Hefta-Gaub
5ff4dc5a35
Merge pull request #16242 from highfidelity/revert-16229-allow-qt-prefix
Revert "BUGZ-1551: Do not download Qt if Qt_CMAKE_PREFIX_PATH is set as an environment variable"
2019-09-24 13:15:00 -07:00
David Rowe
2fe24b39db Code review 2019-09-25 07:50:56 +12:00
Brad Hefta-Gaub
54dae34abe
Revert "BUGZ-1551: Do not download Qt if Qt_CMAKE_PREFIX_PATH is set as an environment variable" 2019-09-24 11:26:50 -07:00
RebeccaStankus
978bcaffeb Undo removal of User Inspection 2019-09-24 11:18:16 -07:00
Shannon Romano
b491d00c00
Merge pull request #16238 from RebeccaStankus/fullSizeWindow
Prereq work for 'Reduce User Friction'
2019-09-24 10:58:39 -07:00
RebeccaStankus
e06e458634
Merge pull request #16236 from RebeccaStankus/removeInspect
Removing connections to use inspect mode on mouse events
2019-09-24 09:49:26 -07:00
David Rowe
f60e863b66 Remove wayward comment 2019-09-24 16:36:11 +12:00
David Rowe
b174e002a9 Implement Recording.setPlayerVolume() 2019-09-24 12:52:51 +12:00
RebeccaStankus
982bdf5c98 Prereq work for 'Reduce User Friction' 2019-09-23 16:49:16 -07:00
dooglifeSF
7307bea16f speed up interpolation of point, rework point animation, add transitions for emotes to idle from settle 2019-09-23 16:45:35 -07:00
RebeccaStankus
e41632e3ec Removing connections to use inspect mode on mouse events 2019-09-23 14:42:13 -07:00
Shannon Romano
48c55d05c7
Merge pull request #16210 from Atlante45/feat/account-settings
DEV-544: Add account settings to the AccountManager
2019-09-23 13:00:23 -07:00
luiscuenca
10f76da3ec
Reset look at values when goToLocation or sitting 2019-09-23 11:53:47 -07:00
Shannon Romano
68c37e561a
Merge pull request #16233 from Atlante45/fix/flush-timer
Put flush timer on right thread without parenting
2019-09-23 09:37:05 -07:00
Shannon Romano
23d8274d4b
Merge pull request #16229 from danteruiz/allow-qt-prefix
BUGZ-1551: Do not download Qt if Qt_CMAKE_PREFIX_PATH is set as an environment variable
2019-09-23 09:21:56 -07:00
Shannon Romano
db0feb4f52
Merge pull request #16231 from danteruiz/fix-2.0
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
2019-09-23 09:20:42 -07:00
Clement
1ca30b688d Put flush timer on right thread without parenting 2019-09-20 15:39:35 -07:00
dante ruiz
b478a22ed2 fix edge case 2019-09-20 15:25:10 -07:00
Clement
1924dad51b CR changes 2019-09-20 13:30:08 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
2019-09-20 13:03:03 -07:00
Anthony Thibault
fecef584c9
Merge pull request #16226 from danteruiz/fix-snap-html-issue
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
2019-09-20 12:39:01 -07:00
Shannon Romano
22dffa5ce8
Merge pull request #16217 from Atlante45/fix/flush-timer
BUGZ-489: Make sure the flush timer is not spawned too early
2019-09-20 12:35:39 -07:00
Sabrina Shanman
460eaf523a
Merge pull request #16202 from AndrewMeadows/trace-stats-for-workload
DEV-594: add trace stats for workload region sizes
2019-09-20 10:37:45 -07:00
luiscuenca
f979c4e1ab
Add more info to jdocs 2019-09-20 09:51:51 -07:00
danteruiz
da655c837e Do not download Qt if Qt_CMAKE_PREFIX_PATH as an environment variable 2019-09-19 22:35:59 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings 2019-09-19 17:30:01 -07:00
Clement
282aa70db3 Sync settings on logout/shutdown 2019-09-19 13:45:34 -07:00
Zach Fox
97ef2c030e
Merge pull request #16223 from zfox23/simplifiedGoToIteration
Whoops! New placeholder text color
2019-09-19 16:40:48 -04:00
Zach Fox
10352f1cb2 New placeholder text color 2019-09-19 13:38:37 -07:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
Sam Gateau
6fe2b7a3d1
Merge pull request #16218 from AndrewMeadows/fix-avatar-entities-in-void
BUGZ-1457: scripted edits of avatar entites should succeed when in the void
2019-09-19 13:15:39 -07:00
Zach Fox
a472e723e2
Merge pull request #16222 from zfox23/simplifiedGoToIteration
BUGZ-1529: Iteration on JumpTo Field visuals/interaction states
2019-09-19 16:13:21 -04:00
Brad Hefta-Gaub
058c74f7d2
Merge pull request #16219 from zfox23/vrRotationSimplified
DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR
2019-09-19 12:18:35 -07:00