Anna
1df43fc83a
Merge branch 'master' of github.com:highfidelity/hifi into combine-tone-map-resample
2019-07-23 15:41:01 -07:00
Shannon Romano
266230a53c
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api
...
Initial version of Avatar Reaction API
2019-07-23 13:13:31 -07:00
Shannon Romano
0031b238c6
Merge pull request #15957 from AndrewMeadows/mac-readable-stats
...
BUGZ-937: more readable debug stats on MacOS
2019-07-23 12:05:01 -07:00
jennaingersoll
1e84b3f4a2
Merge pull request #15951 from ctrlaltdavid/DOC-122
...
DOC-122: LocationBookmarks JSDoc
2019-07-23 12:00:03 -07:00
Anthony J. Thibault
687588cde7
Hooked up first-pass reaction animations.
2019-07-23 09:47:37 -07:00
dante ruiz
ce2849b570
Revert "Merge pull request #15944 from danteruiz/add-signing"
...
This reverts commit 47b7e9a5dc6d0ba98bfc
2019-07-23 09:38:32 -07:00
Shannon Romano
4f922e350e
Merge pull request #15913 from ctrlaltdavid/DOC-102
...
DOC-102: Overlays JSDoc Update
2019-07-22 16:24:53 -07:00
Shannon Romano
1594e25c4e
Merge pull request #15950 from ctrlaltdavid/DOC-121
...
DOC-121: AvatarBookmarks JSDoc
2019-07-22 15:43:57 -07:00
Shannon Romano
47b7e9a5dc
Merge pull request #15944 from danteruiz/add-signing
...
DEV-117: the signing of MAC HQ launcher AND the interface exe
2019-07-22 15:30:26 -07:00
David Rowe
1e8a205275
Fix typo
2019-07-23 10:30:10 +12:00
Shannon Romano
6d0ba98bfc
Merge pull request #15953 from ctrlaltdavid/DOC-123
...
DOC-123: AvatarInputs JSDoc
2019-07-22 15:21:50 -07:00
Shannon Romano
d719952022
Merge pull request #15946 from AndrewMeadows/avoid-nan-scriptedMotor
...
BUGZ-870: MyAvatar's scripted motor needs to filter against NaN input
2019-07-22 15:06:35 -07:00
Andrew Meadows
95187f97c8
use bold monospace font for debug stats
2019-07-22 12:38:24 -07:00
David Rowe
a36bcbb2ed
Doc review
2019-07-23 07:36:11 +12:00
David Rowe
ddffb8ab9a
Doc review
2019-07-23 07:25:34 +12:00
jennaingersoll
abe1ce288c
Merge pull request #15926 from ctrlaltdavid/DOC-115
...
DOC-115: Comfort mode JSDoc
2019-07-22 10:46:11 -07:00
David Rowe
6d7b6f3e0a
AvatarInputs JSDoc
2019-07-20 10:19:22 +12:00
David Rowe
3a3bfd1463
Doc review
2019-07-20 09:39:34 +12:00
David Rowe
0a32386f45
Merge branch 'master' into DOC-102
2019-07-20 09:13:52 +12:00
Zach Fox
d62dde1ab8
Merge pull request #15952 from zfox23/setShowBubbleToolsCorrection
...
Fix BUGZ-1062: Set the correct Settings value for bubble tools
2019-07-19 11:51:59 -07:00
Zach Fox
510c922912
Fix BUGZ-1062: Set the correct Settings value for bubble tools
2019-07-19 11:34:14 -07:00
Shannon Romano
4f7b865cfe
Merge pull request #15945 from huffman/fix/create-window-not-reopening
...
BUGZ-998: Fix create window being destroyed when closed
2019-07-19 11:07:02 -07:00
Shannon Romano
c919980e8b
Merge pull request #15928 from AndrewMeadows/fix-safe-landing-003
...
BUGZ-942: fix SafeLanding to not accidentally "neglect to track" incoming entity packet when connecting to new domain
2019-07-19 09:53:15 -07:00
David Rowe
9165a04641
Typo and improvement
2019-07-19 11:41:12 +12:00
David Rowe
c2b67f28d0
LocationBookmarks JSDoc
2019-07-19 11:35:06 +12:00
David Rowe
cf9e563458
Miscellaneous JSDoc fixes noticed in passing
2019-07-19 08:37:10 +12:00
David Rowe
a04da70f16
AvatarBookmarks JSDoc
2019-07-19 08:36:45 +12:00
Andrew Meadows
dcf3df68f2
avoid NaN input for MyAvatar's scripted motor
2019-07-18 10:58:41 -07:00
Ryan Huffman
03b8de1ee7
Fix create window being destroyed when closed
2019-07-18 08:43:39 -07:00
Andrew Meadows
7b7414dead
revert optimization that would skip read from packet
2019-07-17 17:04:12 -07:00
Anthony Thibault
ecae92724e
Added reaction api
2019-07-17 14:28:39 -07:00
milad
a3b8ded56a
changed sessionDisplayName logic
2019-07-17 14:17:58 -07:00
Andrew Meadows
63b3d666f9
simplify rollover logic for SafeLanding sequence size calculation
2019-07-17 13:57:08 -07:00
Andrew Meadows
b0f297e696
wait for SafeLanding to start before starting octreeQuery
2019-07-17 11:22:01 -07:00
Andrew Meadows
05d896f3de
fix SafeLanding failure mode when first sequence number not 0
2019-07-17 11:22:01 -07:00
dante ruiz
99991c3259
fix signing crash
2019-07-16 19:49:37 -07:00
Anna
0b51e3c129
progress
2019-07-16 15:43:47 -07:00
Shannon Romano
d49fabf370
Merge pull request #15932 from SimonWalton-HiFi/remove-orb-on-kill
...
BUGZ-781: Remove loading-orb upon killing of avatar
2019-07-16 15:31:37 -07:00
Zach Fox
a4f4961dfd
Merge pull request #15941 from zfox23/graphicsSettingsMargin
...
Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings
2019-07-16 15:26:43 -07:00
Zach Fox
1cd136f178
Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings
2019-07-16 15:15:08 -07:00
Jamil Akram
d2000d810d
Merge pull request #15929 from dooglifeSF/teleport_fix
...
add teleport.fbx back to avatar/animations
2019-07-16 14:37:24 -07:00
dante ruiz
e896a53113
fix interactive crash
2019-07-15 17:18:38 -07:00
Shannon Romano
3f7e5a48bb
Merge pull request #15533 from sethalves/squeeze-vision-while-moving
...
Case 21663: comfort mode
2019-07-15 14:54:31 -07:00
Simon Walton
e259aa55c2
Remove loading-orb upon killing avatar, in case destructor isn't called
2019-07-15 14:14:24 -07:00
dooglifeSF
413a089402
add teleport.fbx back to avatar/animations
...
compiled and tested in local sandbox but need to test with Jamil in HMD to see that teleport plays correctly for remote viewer
2019-07-15 13:24:21 -07:00
Shannon Romano
a64bc7f638
Merge pull request #15761 from danteruiz/fix-interactive-window-crash
...
BUGZ-400: Crash in Application::notify
2019-07-15 11:35:15 -07:00
Matt Hardcastle
afb5f81ca0
Add signing to macOS Interface and HQ Launcher
...
This change adds signing to the macOS version of Interface and HQ
Launcher. By default, signing is not enabled; to enable signing you must
add the `XCODE_DEVELOPMENT_TEAM` environment variable and rerun CMake.
Jira: https://highfidelity.atlassian.net/browse/DEVOPS-52
2019-07-15 10:54:44 -07:00
Shannon Romano
7ea8675e83
Merge pull request #15919 from howard-stearns/mac-sleep-monitor
...
Mac sleep monitor
2019-07-15 08:39:19 -07:00
Shannon Romano
09729fb430
Merge pull request #15918 from zfox23/newGraphicsSettings
...
New Settings -> Graphics... dialog for Classic UI users
2019-07-15 08:38:01 -07:00
Shannon Romano
1bc72a86da
Merge pull request #15911 from amerhifi/bugz-968
...
case Bugz-968 adding a null check to the display plugin. Possible that display plug…
2019-07-15 08:35:29 -07:00
