HifiExperiments
1b84244210
merge with master
2019-08-05 09:35:56 -07:00
sabrina-shanman
64fb046a33
Simplify naming for script functions to get list of picks/pointers
2019-08-05 09:25:32 -07:00
David Rowe
e2748a861a
Merge branch 'master' into DOC-98
...
# Conflicts:
# libraries/platform/src/platform/backend/Platform.cpp
2019-08-03 11:22:23 +12:00
sabrina-shanman
20fa78e51d
Fix some dates and no newline at EOF
2019-08-02 16:13:07 -07:00
sabrina-shanman
f7c324c017
Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility
2019-08-02 16:10:39 -07:00
MiladNazeri
ae7b415152
Merge pull request #16008 from HifiExperiments/text
...
Supporting text effects + fonts on Text Entities
2019-08-02 14:25:28 -07:00
MiladNazeri
76e9f8896c
Merge pull request #16021 from kencooke/audio-volume-control-persist
...
BUGZ-352: Persist the audio volume settings across sessions
2019-08-02 10:34:44 -07:00
Bradley Austin Davis
543f07b6ae
Merge pull request #16018 from jherico/fix/dev-279
...
DEV-279: Add rendering API information to the platform JSON object
2019-08-02 10:16:06 -07:00
Sam
d84bebcc28
Merge branch 'master' of github.com:highfidelity/hifi into toulouse
2019-08-02 09:36:58 -07:00
Ken Cooke
437d0ea928
Save and restore the audio gain settings
2019-08-02 06:46:34 -07:00
David Rowe
789f9c7d67
Merge branch 'master' into DOC-124
...
# Conflicts:
# interface/src/scripting/Audio.h
2019-08-02 20:34:09 +12:00
Shannon Romano
2f6d79fb45
Merge pull request #15920 from annabrewer/combine-tone-map-resample
...
BUGZ-965: Standardize and shorten deferred/forward and desktop/android pipelines
2019-08-01 17:39:38 -07:00
Brad Davis
06ad461c32
PR feedback
2019-08-01 16:57:54 -07:00
Brad Davis
bfe42215aa
DEV-279: Add rendering API information to the platform JSON object
2019-08-01 14:29:03 -07:00
Sam
7948fb266e
Merge branch 'master' of github.com:highfidelity/hifi into toulouse
2019-07-31 11:46:09 -07:00
HifiExperiments
7b29f0f718
reduce locking necessary for render updates
2019-07-31 11:21:29 -07:00
Seth Alves
8ec4505b95
add an on/off control for audio echo cancelation to Audio Settings page. It's not yet hooked to anything.
2019-07-30 14:09:32 -07:00
Anna
f58400950a
made color format for resolve FB a parameter, reverted name of tonemapping task to preserve back compatibility
2019-07-30 11:57:01 -07:00
Shannon Romano
fe900cf55f
Merge pull request #15991 from jherico/fix/bugz-964
...
BUGZ-964: fix for incorrect color curve when rendering 3D into QML
2019-07-30 11:52:58 -07:00
HifiExperiments
078ca7edea
supporting text effects + fonts on text entities
2019-07-30 09:59:45 -07:00
David Rowe
833bbf1cce
Render API JSDoc
2019-07-30 11:36:56 +12:00
David Rowe
ade85ad8c0
Update API JSDoc with glTF
2019-07-30 10:41:07 +12:00
Shannon Romano
f29284198c
Merge pull request #15978 from roxanneskelly/bugz829
...
BUGZ-829 DEV-168 - domain backup/content management improvements
2019-07-29 15:28:49 -07:00
Amer
7bc0ea27d0
Merge pull request #15995 from amerhifi/master
...
BUGZ 1029: changing raw pointer to unique pointer with custom deleter
2019-07-29 13:04:58 -07:00
Howard Stearns
b17e796f0f
Merge pull request #15994 from howard-stearns/steam-store-commerce
...
steam gets the oculus store commerce treatment
2019-07-29 12:06:29 -07:00
amer cerkic
85fa510d38
addressing comment
2019-07-29 10:28:31 -07:00
Shannon Romano
75146a104d
Merge pull request #15982 from sabrina-shanman/bug_lod_too-low
...
(BUGZ-1040) Fix LOD randomly being too low in simplified UI
2019-07-29 09:45:19 -07:00
amer cerkic
b3ea9d0de7
addressing commetn
2019-07-29 09:40:58 -07:00
amer cerkic
854f89cace
addressing comment
2019-07-29 09:39:31 -07:00
amer cerkic
1f4b149f75
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-07-29 09:36:03 -07:00
Sam
767f413a2c
merging the various job/task/switch congif into one
2019-07-29 00:07:16 -07:00
Anna
6a6b2f6d27
added tone mapping back
2019-07-26 18:55:08 -07:00
Anthony J. Thibault
2f949a4d4d
Disable head ik while reacting
...
Also, split getReactions() API into two calls
* getTriggerReactions() - lists all reactions that can be triggered with MyAvatar.triggerReaction().
* getBeginReactions() - lists all reactions that can be used with MyAvatar.beginReaction() and MyAvatar.endReaction().
2019-07-26 15:26:43 -07:00
amer cerkic
de0b038ee1
trunked to a lambda for simplicity
2019-07-26 13:52:38 -07:00
Anthony Thibault
5375e53ecb
Merge pull request #15974 from luiscuenca/avatarSitAPI
...
DEV-269: First Class Sitting API
2019-07-26 13:36:00 -07:00
amer cerkic
087b19d64d
removed extra space
2019-07-26 13:15:01 -07:00
amer cerkic
b2e07fd990
changing raw pointer to unique pointer with custom deleter
2019-07-26 13:02:59 -07:00
Howard Stearns
6ef0821801
steam gets the oculus store commerce treatment
2019-07-26 12:44:48 -07:00
Brad Davis
11d7890f48
BUGZ-964: fix for incorrect color curve when rendering 3D into QML
2019-07-25 18:24:53 -07:00
luiscuenca
c1b818cd9b
Set timeout before enabling drive keys
2019-07-25 17:40:09 -07:00
sabrina-shanman
3da5896e22
Bring back lodQualityLevel
2019-07-25 17:16:14 -07:00
sabrina-shanman
94e725dc2a
Fix rare case where script would fail to set LOD after disabling auto LOD
2019-07-25 17:15:28 -07:00
sabrina-shanman
4b5a45209e
Prefer using LODManager.lodAngleDeg for setting manual LOD
2019-07-25 17:15:22 -07:00
Ryan Huffman
ef0977248d
Merge pull request #15986 from huffman/fix/create-not-working-patch
...
Fix non-functional Create
2019-07-25 16:17:43 -07:00
David Rowe
0555cf1804
Revisions and typos
2019-07-26 10:50:53 +12:00
David Rowe
bce3e9bd6b
PlatformInfo API JSDoc update
2019-07-26 10:32:19 +12:00
Roxanne Skelly
130e68c9b5
DEV-168 - make interface-installed content sets display info on web
...
installed content section
2019-07-25 14:37:41 -07:00
Ryan Huffman
9872c1c2f7
Add missing emit inside of
2019-07-25 13:55:44 -07:00
Howard Stearns
520ba59899
Merge pull request #15980 from SimonWalton-HiFi/audio-injector-shutdown
...
BUGZ-985: Guard against AudioInjectorManager takedown in scripted audio injector destructor
2019-07-25 12:50:07 -07:00
sabrina-shanman
3a4ce44633
On second thought, do not expose default octree size scale
2019-07-24 17:32:25 -07:00
sabrina-shanman
772eb57898
Remove broken/undocumented LODManager script features
2019-07-24 16:43:51 -07:00
sabrina-shanman
9d93a2f502
Fix simplifiedUI stuck on wrong LOD value
2019-07-24 16:27:24 -07:00
amer cerkic
db945851ac
fixed merge conflict
2019-07-24 16:03:23 -07:00
amer cerkic
3315271493
reverting commit:
2019-07-24 15:43:31 -07:00
Anthony Thibault
abeba03a7e
Merge pull request #15975 from huffman/fix/interactive-window-qmlto-script-crash
...
BUGZ-1028: Fix qmlToScript getting called on script thread and causing crash
2019-07-24 15:39:25 -07:00
Simon Walton
53cf915e8d
Guard for AudioInjectorManager existance; clear an audio interface pointer
2019-07-24 14:51:41 -07:00
amer cerkic
bea31237b7
addressing comments
2019-07-24 14:30:43 -07:00
Ryan Huffman
c4b63ed5e4
Fix qmlToScript getting called on script thread and causing crash
2019-07-24 13:44:20 -07:00
luiscuenca
8900c4f2cd
stand up to right location-orientation
2019-07-24 13:29:01 -07:00
luiscuenca
6e4d1bde8e
Fix code and warnings
2019-07-24 13:16:53 -07:00
amer cerkic
f94b082946
addressing comment
2019-07-24 11:47:10 -07:00
amer cerkic
ac17493a40
removing comments
2019-07-24 11:37:38 -07:00
amer cerkic
8c022b025d
implementing Dante's change to connect the slots
2019-07-24 11:19:32 -07:00
luiscuenca
015d1951fc
Add sitting clip node
2019-07-24 10:44:33 -07:00
amer cerkic
ddc678bbc0
added interactivewindow proxy. moved event bridge binding to the proxy instead
2019-07-23 16:57:53 -07:00
luiscuenca
e7e864121f
Merge branch 'master' into avatarSitAPI
2019-07-23 14:22:42 -07:00
luiscuenca
9cec979552
Add sit API to MyAvatar
2019-07-23 14:20:54 -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
jennaingersoll
1e84b3f4a2
Merge pull request #15951 from ctrlaltdavid/DOC-122
...
DOC-122: LocationBookmarks JSDoc
2019-07-23 12:00:03 -07:00
David Rowe
8c92f972e5
Merge branch 'master' into DOC-124
...
# Conflicts:
# interface/src/scripting/Audio.h
2019-07-23 12:53:35 +12:00
David Rowe
3b2bb65c77
Tidy MyAvatar API's animation debug graphics methods' JSDod
2019-07-23 12:42:41 +12:00
David Rowe
6b80a27258
Tidy Audio API's gain properties etc. JSDoc
2019-07-23 11:26:48 +12: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
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
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
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
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
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
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
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
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
