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
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
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
Andrew Meadows
434f5ff300
fix comment
2019-09-17 15:57:20 -07:00
Andrew Meadows
5ad0dd20ac
update QueryAACube of unowned moving physical entities
2019-09-17 15:43:53 -07:00
Andrew Meadows
54d3ceda28
update QueryAACube of kinematic things with known parentage
2019-09-17 15:31:16 -07:00
Andrew Meadows
1119b9f29c
update local QueryAACube on deactivation
2019-09-17 15:05:37 -07:00
amer cerkic
c1854d3438
fixing gnu warnings and removing debug output
2019-09-17 14:42:35 -07:00
amer cerkic
7a9020a429
renamed file to match class
2019-09-17 14:16:25 -07:00
Anthony J. Thibault
1157d59f67
Sit bug fixes
...
* You should not be able to move after being seated, even if you switch seats.
* You should not be able to jump out of the chair by holding the space bar.
* Fixed small issue with the sitting to standing transition being delayed. (causing the user to look
like there were sitting in mid-air) This was due to a missing transition in the animation.json
2019-09-17 13:40:43 -07:00
amer cerkic
a777757c48
fixed android build
2019-09-17 12:46:38 -07:00
Zach Fox
610e0c3d82
Merge pull request #16205 from zfox23/changeAboutCopyright
...
v85: BUGZ-1485: Fix Copyright date in About dialog
2019-09-17 14:55:11 -04:00
Zach Fox
60f4189eb3
BUGZ-1485: Fix Copyright date in About dialog
2019-09-17 11:36:12 -07:00
Sam Gateau
b53fbde089
Merge pull request #16204 from samcake/orange
...
BUGZ-1497: Replacing key combination to trigger a frame capture
2019-09-17 11:34:14 -07:00
Seth Alves
3ece763a8e
code review
2019-09-17 10:52:55 -07:00
Howard Stearns
1c2df6b3d2
Merge pull request #16173 from roxanneskelly/dev444
...
DEV-444 - OAuth administration improvements
2019-09-17 10:21:30 -07:00
amer cerkic
05a8c7853c
added file info. moved pragma
2019-09-17 10:03:54 -07:00
