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

33813 commits

Author SHA1 Message Date
Marcus Llewellyn
3bb8498067
Merge pull request #39 from daleglass/fix_invoke_method_crash 
Don't bind action if QML menu can't be added.
 2019-12-30 18:23:08 -06:00
Dale Glass
dabda684b8 Don't bind action if QML menu can't be added. 
Otherwise eventually methods will be called on a NULL pointer.
Fixes crash related to QMetaObject::invokeMethod.
 2019-12-26 01:04:53 +01:00
Thijs Wenker
0ac8c178db
fix spacing 2019-12-20 12:43:43 +01:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Fluffy Jenkins
83e9b891d8 Workaround for Secondary camera crash 2019-12-19 23:31:10 +00:00
Kasen IO
1f01beba70 Fixed patch issues 2019-12-13 12:29:08 -05:00
Kasen IO
9839b23061 Made Sam's graphics patches work with 86 K2. 2019-12-13 02:38:14 -05:00
HifiExperiments
0bd5e15b47 fix non-procedural material entity crash 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-13 02:17:52 -05:00
Maki
a7851c9205 Fixed type conversions for environmental domain ports 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 23:09:18 -05:00
Maki
1ef45b703c Added environment variables to change domain server ports 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 23:09:18 -05:00
HifiExperiments
204c7a7391 fix shadows!! 2019-12-12 23:04:55 -05:00
HifiExperiments
6156495345 stupid, shadows still broken 2019-12-12 23:04:47 -05:00
SamGondelman
1736252f0d trying and failing to fix models 2019-12-12 23:04:47 -05:00
SamGondelman
398562321d fix wearables not disappearing with avatar 2019-12-12 23:02:57 -05:00
HifiExperiments
e0a29d9367 material entities support cullFaceMode and support gltf doubleSided 2019-12-12 23:01:57 -05:00
HifiExperiments
59c67e5590 put back stepping in translucent case 2019-12-12 23:01:57 -05:00
HifiExperiments
3fe395ca32 properly implement alphaModes 2019-12-12 23:01:57 -05:00
HifiExperiments
b66fa1d57a put back stepping in translucent case 2019-12-12 22:58:36 -05:00
HifiExperiments
d54ca43554 properly implement alphaModes 2019-12-12 22:58:36 -05:00
HifiExperiments
6e961b9f2f procedural vertex shaders 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 22:49:48 -05:00
Marcus Llewellyn
af4c0ea0d1 Removes the environment variable requirement for procedural material shaders. 
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
 2019-12-10 16:52:19 -06:00
Kasen IO
3e6660b633 Updated whitelist debugs for clarity in dev log 2019-12-09 08:30:02 -05:00
Kasen IO
2de388ab3b Fixes bug where empty "" whitespace allows all scripts. 2019-12-09 01:20:04 -05:00
Kasen IO
fe66dc82f3 scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly. 2019-12-08 23:11:21 -05:00
Kasen IO
f49e64b99f Cleaned out extra commented code. 2019-12-08 21:12:20 -05:00
Kasen IO
2e36c40912 added QML + C++ system for whitelists 2019-12-07 21:37:23 -05:00
Kasen IO
edfce861a8 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 22:56:19 -05:00
Kasen IO
07d706d681 Removed all hardcoded whitelist rules 2019-12-01 22:55:51 -05:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
DouglasWilcox
a3de25618a Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states. 
(cherry picked from commit f9f28fc286)
 2019-11-13 09:52:56 -08:00
Kalila R
7c1b9e79ae Setting ModelBaker.cpp back to main. 2019-11-11 20:28:16 -05:00
Kalila R
fd7ac223b0 activitylogger still disabled but does not output to console 2019-11-11 20:08:03 -05:00
Sam Gateau
269289412e Same fix for highlight effects 2019-11-08 09:11:58 -08:00
Sam Gateau
5682e8ee2f Fixing bug with custom pipeline and deformed shape renderItems in shadow pass 2019-11-07 15:16:11 -08:00
Shannon Romano
d30f30191f
Merge pull request #16457 from jennaingersoll/doc-193 
DOC-193 Clarified legacy vs current camera modes
 2019-11-06 10:59:32 -08:00
Shannon Romano
668061e154
Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes 
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes
 2019-11-06 10:35:53 -08:00
ingerjm0
499a0a8067 Clean up code per review 2019-11-05 14:14:46 -08:00
ingerjm0
faa4c97f8a Revisions per review 2019-11-05 14:04:01 -08:00
amerhifi
bc41087ea9 removing lock from WASAPI initialization 2019-11-05 12:50:59 -08:00
ingerjm0
27d4bfdd01 DOC-193 #comment Documented legacy vs current camera modes, along with code samples to re-enable legacy code 2019-11-05 12:20:51 -08:00
amerhifi
343807a9f5 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-05 10:17:04 -08:00
amer cerkic
b2ab33116f removing double calls to switch devices, handling default changes from scripting interface instead 2019-11-04 15:03:53 -08:00
Brad Hefta-Gaub
f5873e6f76
Merge pull request #16446 from samcake/zorro 
Renaming the env variable to enable Material Procedural Shaders
 2019-11-04 14:32:54 -08:00
Zach Fox
c39dbc600d
Merge pull request #16441 from zfox23/enableHashMapSignalsForESS 
Implement DEV-2654: Allow ESS to make use of signals like `avatarRemovedEvent`
 2019-11-04 11:59:15 -08:00
Sam Gateau
a4696992e8 Renaming the env variable to enable Material Proecural Shaders 2019-11-04 11:15:37 -08:00
Anthony J. Thibault
821a46697a Update fixUpLegacyBlendshapes as well 2019-11-04 10:55:05 -08:00
Anthony J. Thibault
101ec9d753 Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes 
These blendshapes are not present in ARKit and are not used by any of our procedural
face animations (talking, blinking etc).  This change should have been part of #16400 but
was accidently left out.
 2019-11-04 09:49:24 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
HifiExperiments
6e5217b80d fix build error, add environment variable 2019-11-02 01:03:34 -07:00
Zach Fox
8d07d401c3 Add a line of JSDoc 2019-11-01 14:45:07 -07:00
RebeccaStankus
b50fb47a95
Merge pull request #16438 from RebeccaStankus/macWindowSize 
Changed default interface window size on mac
 2019-11-01 13:40:18 -07:00
Rebecca Stankus
3f19bbfcac Changed variable to not be magic number 2019-11-01 11:46:01 -07:00
Rebecca Stankus
e5fcc577f0 Changed default interface window size on mac 2019-11-01 10:47:12 -07:00
Shannon Romano
295c37aea9
Merge pull request #16434 from kencooke/audio-webrtc-warning-spam 
DEV-2619: WebRTC spamming logs
 2019-11-01 10:22:35 -07:00
Ken Cooke
3cdf25f2bc Fix compiler warning (unused variable in Release build) 2019-11-01 07:36:35 -07:00
Ken Cooke
30564a67ef Only log a single "AEC not supported" warning per audio device configuration 2019-10-31 14:50:52 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes 
Extended avatar blendshape support for ARKit compatiblity
 2019-10-31 12:33:50 -07:00
Maia Hansen
de5570ced8
Merge pull request #16421 from amerhifi/dev-2571new 
case DEV-2771: Audio client shutdown lock
 2019-10-31 09:50:56 -07:00
amer cerkic
4b4b722875 fixed issues related to context switching and selection with hmd 2019-10-30 16:27:19 -07:00
Shannon Romano
faa192a337
Merge pull request #16338 from ctrlaltdavid/DOC-126 
DOC-126: Toolbars JSDoc
 2019-10-30 13:46:16 -07:00
Shannon Romano
161de1478b
Merge pull request #16335 from ctrlaltdavid/DOC-191 
DOC-191: Recording JSDoc
 2019-10-30 13:46:04 -07:00
Shannon Romano
9948a181dc
Merge pull request #16392 from kitely/load-avatar-entities-after-skeleton 
In Bookmarks, attach avatar entities after the skeleton is loaded
 2019-10-30 09:29:51 -07:00
Brad Hefta-Gaub
206e519b5e
Merge pull request #16390 from kitely/fix-walk-speed 
Fixed the sprint speeds of Desktop vs HMD
 2019-10-29 13:04:45 -07:00
Anthony Thibault
4341da03c5
Merge pull request #16419 from luiscuenca/lookAtFixes 
DEV-2285: Fix look at update and allow to release control
 2019-10-29 12:56:22 -07:00
amerhifi
7d5dcbfc77 space cleanup 2019-10-29 11:58:04 -07:00
amerhifi
77f5b985a1 added read/write lock to hmd name 2019-10-29 11:19:59 -07:00
amerhifi
9370ce9b76 removed items 2019-10-29 10:24:30 -07:00
amerhifi
884cbd7de9 working on moving display plugin lookup to audiodevices 2019-10-29 09:26:48 -07:00
amerhifi
57302dd223 fixing build warning on mac/linux 2019-10-29 08:34:35 -07:00
amerhifi
37ba50992c temp reverting the call to display plugin 2019-10-29 07:16:58 -07:00
luiscuenca
ab6631fae3
Fix look at update and allow to release control 2019-10-28 17:51:29 -07:00
Amer
e61d9f3091
Merge pull request #16409 from amerhifi/dev-2450 
case dev 2286: Wireless headphones crash due to missing device
 2019-10-28 11:39:04 -07:00
amer cerkic
f1f67f1996 android build fix 2019-10-28 10:42:25 -07:00
Oren Hurvitz
70c3bb2748 Emit an event when failing to load an avatar. 
Previously, MyAvatar only emitted an event (onLoadComplete) if the load succeeded.
Now it also emits an event (onLoadFailed) if the load failed.
 2019-10-27 10:55:31 +02:00
Oren Hurvitz
35082a730e Changed the desktop sprint speed to 2.0. 
This change will not actually be felt by users, because the speed was already effectively 2.0
(because the sprint speeds for Desktop and HMD were reversed).
 2019-10-27 09:35:16 +02:00
HifiExperiments
deb5aacfad fix materialcachescriptinginterface 2019-10-25 18:16:08 -07:00
amerhifi
8dc13ec242 fixed mac param spacing 2019-10-25 16:01:24 -07:00
amerhifi
397586bd19 setting defauld device code for mac to use QT with optional backup to platform code on failure 2019-10-25 15:19:24 -07:00
Anthony J. Thibault
8cf58f2034 Fix for unused avatar transit warnings on mac and linux 
This was introduced by PR #16403

https://github.com/highfidelity/hifi/pull/16403
 2019-10-25 13:56:12 -07:00
amerhifi
6860ac9693 fix missing default device 2019-10-25 13:09:13 -07:00
amerhifi
3e1f341225 typo fix 2019-10-25 12:50:13 -07:00
amerhifi
52637320f0 mac build fix 2019-10-25 12:49:03 -07:00
amerhifi
358f042f32 Merge branch 'master' into dev-2450 2019-10-25 12:12:10 -07:00
amerhifi
49465b1b96 null default device 2019-10-25 12:10:26 -07:00
Shannon Romano
c650ca6544
Merge pull request #16403 from hyperlogic/bug-fix/remove-avatar-transit-log-spam 
Remove AvatarTransit log spam
 2019-10-25 10:12:17 -07:00
Amer
42234b119f
Merge pull request #16381 from amerhifi/amer-dev471-re 
case Dev 471: HMD default audio behavior
 2019-10-24 16:23:14 -07:00
Anthony J. Thibault
a67904212d Remove AvatarTransit log spam 2019-10-24 15:52:44 -07:00
amerhifi
5dd5447095 moved call to hmd device name prior to locking device mutex 2019-10-24 15:03:55 -07:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Anthony J. Thibault
d43d12dfa7 Merge branch 'master' into feature/arkit-blendshapes 2019-10-23 21:45:10 -07:00
Anthony Thibault
edb181bd16
Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI 
DEV-2285: Improve eyes look at
 2019-10-23 20:42:27 -07:00
Anthony J. Thibault
f28d317914 Clean up reamining issues 2019-10-23 16:43:10 -07:00
amer cerkic
ac8b664537 addresing pr comments 2019-10-23 15:39:38 -07:00
amer cerkic
ed4df09a26 updated logging added clarifying comment for emit 2019-10-23 15:15:41 -07:00
amer cerkic
d7996c77f4 android build fix 2019-10-23 14:48:25 -07:00
luiscuenca
9432a37567
Undo changes in HeadData.cpp 2019-10-23 14:26:53 -07:00
luiscuenca
bb0849d3a0
Move changes to Head and remove leftover code 2019-10-23 14:23:29 -07:00
David Rowe
116510225a Typo 2019-10-24 09:10:26 +13:00
David Rowe
9d905dbec4 Merge branch 'master' into DOC-126 2019-10-24 09:05:41 +13:00
David Rowe
777f969919 Typo 2019-10-24 09:00:29 +13:00