Anthony J. Thibault
5d405cac3b
Merge branch 'master' into feature/reaction-intro-loop-outro
2019-08-08 09:56:45 -07:00
Anthony J. Thibault
317c2f5219
sitting raise hand
2019-08-08 09:37:03 -07:00
sabrina-shanman
9c16fcfdef
Make the LOD half angle the definitive LOD variable
2019-08-07 17:23:04 -07:00
Sam Gateau
c01ab954e3
Merge branch 'master' of github.com:highfidelity/hifi into toulouse
2019-08-07 16:39:11 -07:00
Anthony J. Thibault
e5e012a83e
agree, point and disagree sitting emotes
2019-08-07 14:15:29 -07:00
Zach Fox
72e14a32f9
Implement the Help App skeleton; Implement Help App Controls; Implement Help App About
2019-08-07 17:13:20 -04:00
Sabrina Shanman
0728df8a8f
Merge pull request #16025 from sabrina-shanman/picks_debug
...
(BUGZ-1059) Improve debug API for picks/pointers
2019-08-07 12:01:26 -07:00
sabrina-shanman
66dbb08b01
Be explicit about pickType/pointerType being returned when getting script parameters
2019-08-07 10:44:43 -07:00
sabrina-shanman
4cb925e973
Fix jsdoc for getPointerScriptParameters
2019-08-07 10:04:44 -07:00
sabrina-shanman
8cde93973d
Disambiguate pick and pointer types in the returned properties
2019-08-07 09:56:23 -07:00
Anthony J. Thibault
147753309f
Updated clap02 with new version that is not as slow.
2019-08-06 17:57:27 -07:00
Anthony J. Thibault
3f6b488f27
Added intro-loop-outro phases for raiseHand, applaud and point
2019-08-06 17:39:30 -07:00
sabrina-shanman
0d5260bccc
More LOD renaming with focus on angles
2019-08-06 16:35:41 -07:00
sabrina-shanman
6db6890bac
Deprecate LODManager script properties: boundaryLevelAdjust and octreeSizeScale
2019-08-06 15:54:28 -07:00
sabrina-shanman
bc3acfa3c0
Clean up and re-name to reflect what uses octreeSizeScale and what uses
...
visibilityDistance
2019-08-06 15:46:10 -07:00
Simon Walton
baa586939c
Merge branch 'master' into min_threadpool_2
2019-08-06 14:25:37 -07:00
milad
75708170dd
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-06 13:23:32 -07:00
Shannon Romano
93d5d9bd3f
Merge pull request #15988 from ctrlaltdavid/DOC-98
...
DOC-98, DOC-114: PlatformInfo API changes JSDoc
2019-08-06 13:22:36 -07:00
Shannon Romano
9e0e6f9d5e
Merge pull request #16003 from ctrlaltdavid/DOC-84
...
DOC-84: Update JSDoc with glTF
2019-08-06 13:22:04 -07:00
Shannon Romano
8c981140b0
Merge pull request #16005 from ctrlaltdavid/DOC-61
...
DOC-61: Render API JSDoc
2019-08-06 13:18:17 -07:00
milad
1a95c126c3
working version but taking a snapshot of added emoji code before removing for handoff
2019-08-06 13:13:38 -07:00
Zach Fox
8b85bbfe67
Merge pull request #16034 from zfox23/masterGPU
...
BUGZ-1103: Use 'Master GPU' information in About screen
2019-08-06 12:31:54 -07:00
jennaingersoll
f487d094fe
Merge pull request #15959 from ctrlaltdavid/DOC-124
...
DOC-124: Tidy JSDoc from some recent API changes
2019-08-06 11:57:28 -07:00
Zach Fox
2a4c0a3ecd
BUGZ-1103: Use 'Master GPU' information in About screen
2019-08-06 14:13:31 -04:00
milad
77023b281b
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-06 09:27:49 -07:00
Shannon Romano
9d3d5b7701
Merge pull request #15992 from hyperlogic/feature/reaction-fixes
...
Refined reaction and sitting animations
2019-08-06 09:15:44 -07:00
milad
5e12f4c42a
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-05 19:01:20 -07:00
Sam Gateau
eb616452ec
An afternounwatchign code
2019-08-05 17:54:46 -07:00
David Rowe
1abf0eb207
Merge branch 'master' into DOC-124
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
2019-08-06 10:59:50 +12:00
Sam Gateau
3a053c32f4
Merge branch 'master' of github.com:highfidelity/hifi into toulouse
2019-08-05 14:26:18 -07:00
sabrina-shanman
30482c2db4
Give the pointer its own copy of the script parameters in case its pick is deleted
2019-08-05 13:36:15 -07:00
David Rowe
f97417932c
Fix typo
2019-08-06 08:08:08 +12:00
David Rowe
419044021b
Merge branch 'master' into DOC-61
2019-08-06 08:03:12 +12:00
Zach Fox
34bc71fba9
Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users
2019-08-05 15:12:29 -04:00
Sam Gateau
d55f143300
Merge branch 'master' of github.com:highfidelity/hifi into toulouse
2019-08-05 09:49:14 -07:00
Anthony J. Thibault
704a2d2ac9
Merge branch 'master' into feature/reaction-fixes
2019-08-05 09:43:32 -07:00
Anthony J. Thibault
649ef6c721
Added sitting idle variation and removed rejected emote variations.
2019-08-05 09:42:01 -07:00
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
milad
d1efbc051a
working UI
2019-08-04 15:11:55 -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
Anthony J. Thibault
31762a0c80
Bug fixes in seated reactions
2019-08-02 10:17:59 -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
Anthony J. Thibault
c8e4536bba
Hooked up variations of seated while talking and stubs for reactions while seated.
2019-08-02 10:11:38 -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
Anthony J. Thibault
f843c01b35
added missing seated idle pose
2019-08-01 13:09:02 -07:00
Anthony J. Thibault
a2e37b7275
talking/reactions while seated, work in progress check in
2019-08-01 13:05:15 -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
humbletim
bad32e9916
remove unnecessary include
2019-07-30 17:33:48 -04:00
Seth Alves
d8b940cc96
add control to enable/disable acoustic echo cancellation to simplified UI
2019-07-30 14:09:34 -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
Anthony J. Thibault
ee4bb233b9
Bug fix for head nod not going back to idle.
2019-07-30 12:56:43 -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
MiladNazeri
b81d0ecce3
Merge pull request #16002 from MiladNazeri/addNewTextSizeAPI
...
[BUGZ-972] :: changed root to micBar which had the gated property
2019-07-30 09:59:40 -07:00
Anthony J. Thibault
4f5d0d1c0f
Updated a negative reaction animation.
2019-07-29 16:49:16 -07:00
David Rowe
833bbf1cce
Render API JSDoc
2019-07-30 11:36:56 +12:00
Anthony J. Thibault
6f3bb749e2
Added new applaud, point and raisehand reactions.
2019-07-29 16:17:50 -07: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
Anthony J. Thibault
e205d90df6
Hooked up random positive & negative emote animations.
2019-07-29 15:01:10 -07:00
milad
2ea8b9efa4
changed root to micBar which had the gated property
2019-07-29 14:05:55 -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
Anthony J. Thibault
6e6440232c
Updated avatar-animation.json from animedit tool
2019-07-29 10:49:34 -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
MiladNazeri
e6e771df7b
Merge pull request #15977 from MiladNazeri/permissionsUIFix
...
[DEV-190] + [DEV-191] :: Permissions UI
2019-07-26 11:25:18 -07:00
humbletim
058c81aa1a
Merge branch 'hifi-master' into kpi-v1-modkit-rc
2019-07-26 01:36:52 -04:00
Kalila R
bac59b52aa
Added checkbox for script plugins to security.qml
2019-07-26 01:32:14 -04:00
humbletim
d334a2e5e2
QML-only write access for 'private/' Settings keys
2019-07-26 01:32:01 -04: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
MiladNazeri
b0723599d8
Update interface/resources/qml/controlsUit/PermissionPopup.qml
...
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-07-25 15:47:48 -07:00
MiladNazeri
b419be97be
Update interface/resources/qml/controlsUit/PermissionPopup.qml
...
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-07-25 15:47:24 -07:00
MiladNazeri
cf23b7a303
Update interface/resources/qml/controlsUit/PermissionPopup.qml
...
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-07-25 15:47:17 -07:00
MiladNazeri
20b709b382
Update interface/resources/qml/controlsUit/PermissionPopup.qml
...
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-07-25 15:46:10 -07:00
milad
5083e449b0
cr round 2
2019-07-25 15:42:25 -07:00
milad
2f4566b63c
merged master and fixed height
2019-07-25 15:42:03 -07:00
milad
4c0d8b6fda
improved layout to match the figment more
2019-07-25 15:42:02 -07:00
milad
993e5db2da
changed rectangle to have anchor.fill
2019-07-25 15:42:02 -07:00
milad
2498bf2fd8
Cr changes r1
2019-07-25 15:42:02 -07:00
milad
9f0fc8bd06
removed logs and prototype code
2019-07-25 15:42:02 -07:00
milad
189809dc2c
Fixed undefined error when displaying from the dictionary
2019-07-25 15:42:02 -07:00
milad
2b4dd327ec
removed log statements
2019-07-25 15:42:01 -07:00
milad
cd5df63f51
working version for all qml web files
2019-07-25 15:41:53 -07:00
milad
fb7a66b110
working version with just flickable
2019-07-25 15:38:23 -07:00
milad
43268c0f65
Working QML window
2019-07-25 15:38:23 -07:00
milad
dec176b921
checking to see if I did something blocking the build
2019-07-25 15:38:22 -07: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
Ryan Huffman
de233e456e
Merge pull request #15976 from huffman/feat/serverless-tutorial
...
DEV-266: Add serverless tutorial
2019-07-25 13:39:03 -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
Zach Fox
12a9837a4b
Merge pull request #15984 from zfox23/removeSomeEventBridgeCode
...
BUGZ-969: Remove some audio-related code that hasn't worked in a while
2019-07-25 12:41:43 -07:00
Zach Fox
6e33f3f23a
BUGZ-969: Remove some audio-related code that hasn't worked in a while
2019-07-25 11:49:28 -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
Ryan Huffman
2ec87f4e61
Add serverless tutorial
2019-07-24 16:38:03 -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
e6dd52d331
Merge branch 'master' into bugz-1029a
2019-07-24 15:53: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
Zach Fox
e1c198903d
Merge pull request #15973 from zfox23/fixGatedLog
...
BUGZ-972: Fix errant log involving 'gated' property
2019-07-24 11:19:02 -07:00
luiscuenca
015d1951fc
Add sitting clip node
2019-07-24 10:44:33 -07:00
Zach Fox
03b5f9f7f8
BUGZ-972: Fix errant log involving 'gated' property
2019-07-24 10:18:03 -07:00
Zach Fox
b918979fab
DEV-301: Adjust size of VR-mode header icon
2019-07-24 10:02:26 -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
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
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
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
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
Shannon Romano
8ce64d95ab
Merge pull request #15880 from AndrewMeadows/fix-safe-landing-redux
...
BUGZ-863: wait for objects to be added to physics before completing SafeLanding
2019-07-15 08:34:17 -07:00
kasenvr
e9e9607a3b
modkit core changes initial commit
...
whitespace corrections + warnings
updated cmake plugin
rework with focus on JS API integration example
cleanup edit_filter scope
separate-out edit_filter wantsScope stuff
-plugin metadata
split scriptengines out separately
cleanup __url/__filename sets
additional cleanup
fix typo; consolidate ScriptInitializerMixin inits
add more example API protoypes
cleanup pass; fix entity_server / agent init
fix whitespace
remove technically unnessary plugin filtering
+EDIT_FILTER_SCRIPT; cleanup
reorder public/slot/private
use std::count_if
formatting
better debug output; cleanup
fix msvc compiler warning
cleanup
eradicate QtScript references from API Example
updated header comments
Updated KasenAPIExample
2019-07-14 21:35:13 -04:00
David Rowe
8a82ea55c7
HMD API vision squeeze properties JSDoc
2019-07-13 10:39:40 +12:00
dante ruiz
d78661a47f
redo requested work
2019-07-12 13:34:08 -07:00
Zach Fox
5828f46c6b
Incorrect ID fixed - thanks Milad
2019-07-12 12:27:55 -07:00
Zach Fox
e0392642f7
Don't enable supersampling from graphics settings
2019-07-12 11:18:34 -07:00
amerhifi
ba6307e8e4
revert of extra space
2019-07-12 10:55:44 -07:00
amerhifi
f78c1cb5d0
reverting display plugin reset change
2019-07-12 10:54:08 -07:00
Howard Stearns
7ce6dd71d5
fix comment
2019-07-12 10:48:05 -07:00
Simon Walton
33494d7477
Bump minimum threadpool size to 2
2019-07-12 10:30:52 -07:00
Shannon Romano
74b830dd12
Merge pull request #15912 from SimonWalton-HiFi/early-rsa-keygen
...
BUGZ-918: Generate RSA key-pair early in start-up
2019-07-12 09:42:11 -07:00
Shannon Romano
3e70f4f51c
Merge pull request #15671 from SamGondelman/uber
...
DEV-203, BUGZ-978: Condense all redundant shader variants using new slp defines feature and add Haze to Forward renderer
2019-07-12 09:39:33 -07:00
Seth Alves
9baf4c7078
comfort mode -- squeeze vision to avoid sickness
2019-07-12 09:14:17 -07:00
howard-stearns
cc7214fca3
cleanup
2019-07-11 16:56:35 -07:00
Zach Fox
56a55efbb3
Fix a quick renderer bug
2019-07-11 16:12:40 -07:00
Dante Ruiz
2f74f8253f
finishing requested changes
2019-07-11 15:39:59 -07:00
Zach Fox
4c7d0fc6f4
Updated layout
2019-07-11 14:46:05 -07:00
howard-stearns
2eb3fdb1ec
Merge branch 'master' of https://github.com/highfidelity/hifi into mac-sleep-monitor
2019-07-11 14:35:00 -07:00
amer cerkic
15e7663ed5
removing the destroy call since its not necessary
2019-07-11 14:27:41 -07:00
SamGondelman
22a7a97a9a
fix forward web + parabola blending
2019-07-11 12:23:04 -07:00
amer cerkic
efccd10a65
adding a destroy call to hmd scripting interface to ensure that it does not call isHmd mode on already dead display plugin. Also moved displayplugin reset below ui destroy calls to make sure it does not get called after its been destroyed
2019-07-11 12:15:15 -07:00
PrestonB1123
07c71cbadb
disabled P shortcut and re-enabled in metaverse
2019-07-11 12:05:15 -07:00
Zach Fox
ce2b7e5baa
Finish all of the logic and most of the layout
2019-07-11 12:05:13 -07:00
howard-stearns
8d3dc52ac0
mac sleep monitor checkpoint
2019-07-11 10:58:31 -07:00
Zach Fox
2471a3eb72
Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings
2019-07-11 09:02:42 -07:00
SamGondelman
d545ba5bc6
haze on most entities, working on skybox
2019-07-10 23:52:50 -07:00
David Rowe
2cb3425740
Merge branch 'master' into DOC-102
2019-07-11 16:38:23 +12:00
David Rowe
a45d8924fa
Miscellaneous minor JSDoc fixes noticed in passing
2019-07-11 16:31:09 +12:00
David Rowe
46c81b268a
Typos and inconsistencies
2019-07-11 16:29:56 +12:00
David Rowe
e1f181e8ee
Update Overlays events and signals JSDoc
2019-07-11 16:15:24 +12:00
David Rowe
42bee63f52
Update Overlays methods JSDoc
2019-07-11 15:33:45 +12:00
dante ruiz
c4a0b39068
requested changes
2019-07-10 17:56:54 -07:00
Simon Walton
645a99c200
Generate RSA key-pair early in start-up
2019-07-10 17:36:25 -07:00
Zach Fox
4caa00d6cc
Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface
2019-07-10 16:42:48 -07:00
Amer
4c145386e5
Merge pull request #15899 from amerhifi/bugz-907
...
Case bugz-907: On launch default to non hmd device
2019-07-10 16:03:29 -07:00
Howard Stearns
7eaa29c147
Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui
...
new-account wallets in simplified UI
2019-07-10 15:09:59 -07:00
Andrew Meadows
1a5a925a4c
fix a typo
2019-07-10 14:18:34 -07:00
amer cerkic
e463a828ef
removed extra line
2019-07-10 14:09:51 -07:00
amer cerkic
bc51b8e709
removed extra space
2019-07-10 14:08:20 -07:00
amer cerkic
fc21f6088a
undoing code structures changes to else blocks
2019-07-10 14:07:10 -07:00
dante ruiz
7c024b4e8a
fix interactive window crash
2019-07-10 11:49:36 -07:00
Shannon Romano
f235778a6e
Merge pull request #15866 from huffman/feat/override-default-scripts
...
DEV-164: Add defaultScriptsOverride option
2019-07-10 10:16:55 -07:00
Andrew Meadows
2da0714e36
comments and more readable code
2019-07-09 15:51:56 -07:00
Andrew Meadows
1bfd5386a9
restore entity->requestRenderUpdate() in SafeLanding::updateTracking()
2019-07-09 15:51:56 -07:00
Andrew Meadows
520c62f6f6
wait for objects added to physics before stop SafeLanding
2019-07-09 15:51:56 -07:00
Zach Fox
4dfbc489e8
Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype
2019-07-09 15:40:16 -07:00
Howard Stearns
4191c37f6e
indentation
2019-07-09 14:48:17 -07:00
Howard Stearns
79a3d45eae
new-account wallets in simplified UI
2019-07-09 14:25:11 -07:00
SamGondelman
bd2003fa01
Merge remote-tracking branch 'upstream/master' into uber
2019-07-09 13:45:14 -07:00
RebeccaStankus
169b15c985
Merge branch 'master' of github.com:highfidelity/hifi into createAgain
2019-07-09 13:03:08 -07:00
RebeccaStankus
714a3f6b08
Fixed path to tabletAssetServer in HMD, simplifiedUI system folder
2019-07-09 13:02:54 -07:00
amer cerkic
09ecb49e5b
--no-launcher is the launcher override for interface. if app is launched with the args, the first run is bypassed and default display device will always be desktop. not hmd
2019-07-09 11:39:42 -07:00
amer cerkic
45b339a6c7
removing comment
2019-07-09 09:35:58 -07:00
