amer cerkic
|
64f14dd6ba
|
fixing selection issues
|
2019-09-20 11:32:57 -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 |
|
Sam Gateau
|
ee5de175eb
|
Better monitoring of the resource loading in flights
|
2019-09-19 16:56:55 -07:00 |
|
amerhifi
|
7fbce46e30
|
fixing android build, I removed a function thinking it was unused. also added android ifdef guards for name since default does to exist on that device. Simplified getting a default device
|
2019-09-19 15:57:38 -07:00 |
|
amerhifi
|
8d7c28fe83
|
fixed audio switching issues. removed risky access to properties. adressing comments
|
2019-09-19 14:19:43 -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 |
|
Shannon Romano
|
eda7314f1c
|
Merge pull request #16220 from zfox23/removeAudioInjectorLogging
DEV-613: Remove unnecessary audio injector logging
|
2019-09-19 12:09:42 -07:00 |
|
Zach Fox
|
80414a6f1c
|
DEV-613: Remove unnecessary audio injector logging
|
2019-09-19 11:17:39 -07:00 |
|
Zach Fox
|
5077089518
|
BUGZ-1529: Iteration on JumpTo Field visuals/interaction states. NOTE - need to fix placeholder text swap
|
2019-09-19 11:15:53 -07:00 |
|
luiscuenca
|
6d98537a20
|
Clean up code and refactor avatar-animation.json
|
2019-09-19 10:45:20 -07:00 |
|
danteruiz
|
82faeb70c8
|
remove merge conflict comments
|
2019-09-19 10:40:16 -07:00 |
|
Ryan Huffman
|
e21885905f
|
Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher
|
2019-09-19 10:31:44 -07:00 |
|
Ryan Huffman
|
f97a8a06c8
|
Add fix for S_IFLNK on Windows, and fix createClient
|
2019-09-19 10:30:08 -07:00 |
|
amerhifi
|
9cc3b7a5c7
|
addressing pr comments
|
2019-09-19 10:08:30 -07:00 |
|
Zach Fox
|
5e96ce8822
|
DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR
|
2019-09-19 09:48:11 -07:00 |
|
dante ruiz
|
09b9b1e10c
|
mac auto-updater
|
2019-09-19 09:41:01 -07:00 |
|
Sam Gateau
|
6154611b05
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-19 09:10:38 -07:00 |
|
Shannon Romano
|
a5fdf5bb40
|
Merge pull request #16214 from hyperlogic/bug-fix/additive-blend-scale-fix
Fix additive blending on avatars with non identity scale.
|
2019-09-19 09:04:28 -07:00 |
|
Sam Gateau
|
819c942056
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-19 09:01:19 -07:00 |
|
Andrew Meadows
|
ab419ddd23
|
beware null sessionID
|
2019-09-19 08:25:01 -07:00 |
|
Sam Gateau
|
a87db2636c
|
SOme stuff workbetter
|
2019-09-18 18:25:42 -07:00 |
|
luiscuenca
|
fc223e4cb6
|
Reverse the up/down arrow keys if in selfie mode
|
2019-09-18 17:15:25 -07:00 |
|
amer cerkic
|
be2fff13d2
|
fixed wrong device in if block
|
2019-09-18 17:10:12 -07:00 |
|
Clement
|
527b27b32d
|
Make sure the flush timer is not spawned too early
|
2019-09-18 17:05:05 -07:00 |
|
luiscuenca
|
7bc8e6b237
|
Solved some sitting and sound issues while looking at
|
2019-09-18 17:00:10 -07:00 |
|
Shannon Romano
|
e7001c3f1b
|
Merge pull request #16157 from sethalves/vive-pro-groundwork
DEV-605: Vive pro groundwork
|
2019-09-18 16:36:12 -07:00 |
|
Shannon Romano
|
0be972062d
|
Merge pull request #16207 from hyperlogic/bug-fix/sitting-bug-fixes
Sit bug fixes
|
2019-09-18 16:20:51 -07:00 |
|
Zach Fox
|
d5ff3cd871
|
Merge pull request #16213 from zfox23/goToTopBar
DEV-576: Allow users to type HiFi locations into the SimplifiedUI top bar just like GOTO
|
2019-09-18 17:56:13 -04:00 |
|
Anthony J. Thibault
|
41978aa4a4
|
Fix additive blending on avatars with non identity scale.
Some avatars that have non 1.0 scale values were incorrectly being scaled during additive blends, this fixes that.
|
2019-09-18 14:42:57 -07:00 |
|
amer cerkic
|
ecca898db8
|
fixed some more vs clang reformatting
|
2019-09-18 14:39:55 -07:00 |
|
Zach Fox
|
f92c5d0882
|
DEV-576: Allow users to type HiFi locations into the SimplifiedUI top bar just like GOTO
|
2019-09-18 14:39:11 -07:00 |
|
Zach Fox
|
8a8af6b14a
|
Merge pull request #16212 from zfox23/updateEmojiSearchField
DEV-521: Update Emoji window's search field to display emoji's name during hover
|
2019-09-18 17:38:01 -04:00 |
|
Zach Fox
|
59184edc89
|
DEV-521: Update Emoji window's search field to display emoji's name during hover
|
2019-09-18 13:37:46 -07:00 |
|
Sam Gateau
|
e801eab7bf
|
Merge pull request #16208 from AndrewMeadows/ess-with-simulation-fallout-002
BUGZ-1487: bug fix for inability to pick entities after unowned kinematic motion
|
2019-09-18 13:25:22 -07:00 |
|
amer cerkic
|
d4dc06d2e7
|
fixed issue with null device on load.
|
2019-09-18 12:44:03 -07:00 |
|
Clement
|
86196cfd62
|
Add account settings to the AccountManager
|
2019-09-17 18:48:14 -07:00 |
|
Sam Gateau
|
381fc5146f
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-17 18:08:09 -07:00 |
|
Sam Gateau
|
c0660329a3
|
Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family
|
2019-09-17 18:06:08 -07:00 |
|
luiscuenca
|
1054e8fcde
|
Selfie camera and updated camera menus
|
2019-09-17 17:15:16 -07:00 |
|
amer cerkic
|
46b9496965
|
fixing mac build error
|
2019-09-17 16:02:20 -07:00 |
|