Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 07:13:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
80195 commits 76 branches 59 tags 1.2 GiB
Commit graph

29958 commits

Author SHA1 Message Date
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
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
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
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
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
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
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