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

24015 commits

Author SHA1 Message Date
Zach Fox
aadf407842 Merge pull request #10978 from zfox23/hoverOverlayInterface 
New HoverOverlayInterface skeleton
 2017-07-17 13:16:32 -07:00
Zach Fox
19b42b0180 CR feedback 2017-07-17 13:15:23 -07:00
Zach Fox
4b9797c179 Comment explaining category debugs 2017-07-17 11:35:27 -07:00
Zach Fox
0a4ab23356 Remove unnecessary include 2017-07-17 11:32:47 -07:00
Zach Fox
147474e19a Logging category and filter 2017-07-17 11:17:59 -07:00
Andrew Meadows
99aad77e53 Merge pull request #10954 from jherico/qml_crashes_again 
Still trying to address QML crashes
 2017-07-17 10:21:23 -07:00
Zach Fox
19d5b8750a Cleanup logging 2017-07-17 09:51:00 -07:00
Olivier Prat
1f14b6ef38 Shape entities have the correct pipeline picked when fading is activated. Still need to support instanced rendering 2017-07-17 17:50:59 +02:00
1P-Cusack
af751c8b8c Add filter to map the boolean negation of a flag. 2017-07-17 10:53:37 -04:00
Olivier Prat
f8b2ffe359 Removed transparency on fading shapes 2017-07-17 15:06:32 +02:00
Olivier Prat
db7871fca7 Merge branch 'fadevoxel' into fadeshape 2017-07-17 14:33:00 +02:00
Olivier Prat
95059e26c1 Fading working on voxels 2017-07-17 14:32:05 +02:00
Olivier Prat
3f8daa21ec Created FadeEffect singleton to be able to get fade item & batch setters for every special entity render 2017-07-17 14:26:41 +02:00
Olivier Prat
76dd421ecd Merge branch 'fade' into fadevoxel 2017-07-17 12:00:10 +02:00
Olivier Prat
146f934019 Cleaned up shader code as fade position is now world position 2017-07-17 11:59:10 +02:00
Olivier Prat
0123e2936b Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-17 11:44:10 +02:00
Olivier Prat
290d106cf4 Shapes are working again. Had to re-specialize all the payload hooks for ShapePayload::Pointer... 2017-07-17 11:37:50 +02:00
Olivier Prat
9e9c0aff65 Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape 2017-07-17 09:59:59 +02:00
Olivier Prat
5e5148ca91 Merge branch 'fade' into fadeshape 2017-07-17 09:53:26 +02:00
Olivier Prat
61de99dfe8 Merge branch 'fade' into fadevoxel 2017-07-17 09:42:14 +02:00
Zach Fox
e602d3610e Initial commit for HoverOverlayInterface 2017-07-14 17:26:53 -07:00
Andrew Meadows
5a4f56388b Merge pull request #10881 from hyperlogic/feature/smooth-ik-chains 
Smooth IK when trackers are disabled / enabled.
 2017-07-14 16:59:30 -07:00
druiz17
3b112450f0 Merge pull request #10959 from druiz17/bug/wrong-tablet-state 
Fix tablet scripting interface setting its internal state to home when switching between toolbar and tablet mode
 2017-07-14 14:31:04 -07:00
Atlante45
2d246d2563 Implement shutdown with parent for Mac and Linux 2017-07-14 11:39:32 -07:00
Seth Alves
806d9f1436 Merge pull request #10968 from druiz17/bug/load-priority 
Prioritize file:// requests over http://
 2017-07-14 11:13:35 -07:00
Zach Fox
a9197509d8 Merge pull request #10965 from CainFoool/avatar-scaler 
WL 21422 - Add a scale slider for avatar size
 2017-07-14 10:30:33 -07:00
Dante Ruiz
68fa426da9 set file url as higher priority 2017-07-14 18:17:13 +01:00
Anthony J. Thibault
de199bff9d code review feedback 2017-07-14 09:47:37 -07:00
SamGondelman
6f970fd7a0 Merge remote-tracking branch 'upstream/master' into sharks 2017-07-14 09:37:11 -07:00
Olivier Prat
82da9fb537 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-14 17:28:35 +02:00
Anthony J. Thibault
c85e187c61 first stab at secondary target pose support 2017-07-13 18:12:33 -07:00
SamGondelman
3a35cd128f fix dirOffset, expose intersection type to JS 2017-07-13 16:09:21 -07:00
Brad Hefta-Gaub
b35d696077 Merge pull request #10966 from sethalves/fix-softattachment-crash 
avoid crash in soft-attachment code
 2017-07-13 15:48:23 -07:00
Olivier Prat
b125fba2e1 Removed untested avatar bubble fade code. Made changes as requested by Andrew 2017-07-13 23:04:55 +02:00
Howard Stearns
17fcfad957 Merge pull request #10875 from highfidelity/spectator-camera 
Spectator Camera
 2017-07-13 13:57:18 -07:00
Olivier Prat
b68ec4f933 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-13 22:36:52 +02:00
Andrew Meadows
c7ec82f98a use local copy of _element for thread safety 2017-07-13 13:30:57 -07:00
Andrew Meadows
8fc4d1f43e make UNEXPECTED logs warnings 2017-07-13 13:30:57 -07:00
Andrew Meadows
02bc9b9610 minimize the lock context 2017-07-13 13:30:57 -07:00
Andrew Meadows
f71ef554b7 use copy of _entityMap for debug logging 2017-07-13 13:30:57 -07:00
Andrew Meadows
fe79514b08 lock when changing EntityTree elements 2017-07-13 13:30:57 -07:00
Andrew Meadows
a0c6c49360 bump some "debug" messages to "warning" status 2017-07-13 13:30:57 -07:00
Andrew Meadows
39e5259e03 remove unused variable 2017-07-13 13:30:57 -07:00
Andrew Meadows
7ea1e7285f map EntityItemID to EntityItemPointer 2017-07-13 13:30:57 -07:00
Cain Kilgore
f91a8c0f53 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler 2017-07-13 21:25:39 +01:00
Seth Alves
12f52e8f20 don't do SoftAttachmentModel::updateClusterMatrices if geometry isn't ready 2017-07-13 13:18:21 -07:00
Andrew Meadows
4f75558b49 Merge pull request #10963 from sethalves/fix-sort-joints 
put result of Avatar::getJointNames back in index-order
 2017-07-13 12:44:32 -07:00
Cain Kilgore
521babb6bd Avatar Scaler - should be PR Ready. 2017-07-13 19:18:51 +01:00
Seth Alves
59d88cb564 Merge pull request #10941 from sethalves/audio-injector-smart-pointers 
Audio injector smart pointers
 2017-07-13 11:00:02 -07:00
Olivier Prat
4d5f2ebdfe Removed unused variable that prevented build on Linux 2017-07-13 18:45:08 +02:00
Olivier Prat
96f0c35b79 Yet some more compilation fixes for Mac and Linux 2017-07-13 18:22:18 +02:00
Olivier Prat
93218da473 Fixed compilation errors on Mac and Linux 2017-07-13 17:51:16 +02:00
Olivier Prat
1b8696fdda First draft of custom pipeline on geometry cache 2017-07-13 17:09:49 +02:00
Olivier Prat
c583de4d96 Fade working on voxel objects 2017-07-13 15:22:10 +02:00
Olivier Prat
736ecf0082 Fixed infinite recursion in collectMetaSubItems due to meta sending itself as sub-item 2017-07-13 14:43:41 +02:00
Olivier Prat
21a11d72c4 Added define to activate/deactivate transition support (fade) in Scene 2017-07-13 12:44:26 +02:00
Olivier Prat
53a92c1506 Fade edit is working again and time based transitions are garbage collected 2017-07-13 12:31:10 +02:00
Olivier Prat
4081cd2cbf Merge branch 'fader' of http://github.com/samcake/hifi into fade 2017-07-13 11:19:28 +02:00
Olivier Prat
edcfecd5d4 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-13 11:05:14 +02:00
Olivier Prat
2d2722bfc5 Added async transition query on scene 2017-07-13 11:05:04 +02:00
Sam Gateau
1557b985c4 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2017-07-13 09:30:33 +02:00
Sam Gateau
b065b99b0b fix linux compilation maybe 2017-07-13 09:30:04 +02:00
Seth Alves
85d0b68284 try again on putting result of Avatar::getJointNames in index order 2017-07-12 20:36:37 -07:00
Seth Alves
44de1dd2be put result of Avatar::getJointNames back in index-order 2017-07-12 19:25:39 -07:00
SamGondelman
916a99c670 added JS/C++ RayPickResult, working on RayPickManager::update 2017-07-12 17:12:25 -07:00
David Kelly
4b3cf5ee2e Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreviewFix 2017-07-12 16:50:51 -07:00
David Kelly
88a449c1af Fixes hmd preview when resizing 2017-07-12 16:49:26 -07:00
SamGondelman
ea65a04f28 expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing) 2017-07-12 14:20:39 -07:00
SamGondelman
3ac369d782 framework for LaserPointers and abstracted RayPicking on C++ side, including JS API 2017-07-12 14:20:39 -07:00
Zach Fox
8553277c56 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-12 14:18:50 -07:00
Cain Kilgore
43782a29c7 Avatar Scaler - WIP 2017-07-12 22:04:58 +01:00
Seth Alves
06618e81d0 remove unneeded <> 2017-07-12 13:14:32 -07:00
Dante Ruiz
e07b067d7b fixed tablet getting in the wrong state 2017-07-12 21:09:54 +01:00
Seth Alves
59ad3d50ec Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers 2017-07-12 12:45:58 -07:00
Seth Alves
ddf2312dc6 code review 2017-07-12 12:45:52 -07:00
utkarshgautamnyu
6b969bc39d added code to record total number of ATP/HTTP/File bytes downloaded during session 
Update FileResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update HTTPResourceRequest.cpp

Update AssetResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update AssetResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update FileResourceRequest.cpp

Update HTTPResourceRequest.cpp

Update FileResourceRequest.cpp

Update FileResourceRequest.cpp

Update Application.cpp

Update Application.cpp
 2017-07-12 11:13:13 -07:00
Brad Davis
0e9f8cc103 Still trying to address QML crashes 2017-07-12 11:04:33 -07:00
Stephen Birarda
f6d9a79fb5 Revert "Revert "fix for invisible avatars after radius ignore"" 2017-07-12 10:36:53 -07:00
Olivier Prat
0f60cca617 Merged cleaned up fader branch from Sam 2017-07-12 18:09:17 +02:00
Sam Gateau
5394ac8672 Cleaning up changes, removing comments and dead code etc... 2017-07-12 17:33:05 +02:00
Olivier Prat
2f9885870b First merge with Sam's fader branch with custom pipeline support in shape plumber 2017-07-12 17:29:21 +02:00
Seth Alves
b556ddc0ef remove unneeded AudioInjectorPointer constructor 2017-07-12 07:24:19 -07:00
Sam Gateau
49779754ff Remove unecessary shaders and apply the custom shader pipeline to polyvox 2017-07-12 15:50:06 +02:00
Sam Gateau
258f1654f2 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2017-07-12 14:14:27 +02:00
Sam Gateau
98cc8c0683 Refining the custom shader pipeline design and registration mechanism 2017-07-12 14:13:58 +02:00
Seth Alves
084a989a7a stopAndDeleteLater is now just stop 2017-07-11 21:21:42 -07:00
Seth Alves
3897ab2723 don't call deleteLater on smartpointered object 2017-07-11 20:16:00 -07:00
Seth Alves
972dc4d1b2 more const ref 2017-07-11 19:56:34 -07:00
Seth Alves
c52e7e180a use const AudioInjectorPointer& in some places 2017-07-11 19:42:03 -07:00
Seth Alves
81489ea6c4 use QEnableSharedFromThis 2017-07-11 18:44:37 -07:00
Seth Alves
dbd46fc4b8 Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers 2017-07-11 17:48:29 -07:00
Atlante45
bf13d0cc80 Send ordered packet lists for ignore feature 2017-07-11 17:12:12 -07:00
Seth Alves
0b2f13dacc don't use deleteLater on smartpointered object 2017-07-11 17:07:44 -07:00
Seth Alves
59c586bc5d remove unused code 2017-07-11 16:58:19 -07:00
Seth Alves
3c8c87cff5 i hate you, milkman dan 2017-07-11 16:48:28 -07:00
Zach Fox
d786820670 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-11 16:16:37 -07:00
Andrew Meadows
782155e9ea Merge pull request #10876 from Atlante45/fix/ac-crash 
Fix AC crash (buffer overflow)
 2017-07-11 14:26:08 -07:00
Seth Alves
3670a04d8e switch bare pointers to AudioInjector objects to be QSharedPointers 2017-07-11 14:24:58 -07:00
David Kelly
e1df3feb5c fix hmd preview 2017-07-11 10:54:35 -07:00
Olivier Prat
7552cca316 First alpha version of bubble collision fade events. Missing a lot of information. 2017-07-11 19:26:15 +02:00
Olivier Prat
381e0c64a8 Working avatar fade in / fade out except that it is also triggered on bubble collisions 2017-07-11 16:43:27 +02:00
Olivier Prat
aba8be595e Separated fade categories from transition event types 2017-07-11 11:37:24 +02:00
Sam Gateau
1f2f539507 Merge branch 'orange' of https://github.com/samcake/hifi into hobbes 2017-07-11 10:26:26 +02:00
Anthony J. Thibault
b0177c2522 remove comment, it does indeed work 2017-07-10 16:25:37 -07:00
Anthony J. Thibault
1cdc0071f3 Fixed issue with hips and chest not ramping off properly. 2017-07-10 16:17:25 -07:00
Atlante45
c32f4ab0d3 CR 2017-07-10 14:24:53 -07:00
Seth Alves
9b5dfc8d3a Merge pull request #10929 from druiz17/luanch-crash-fix 
Fixed crash when launching interface from fresh install
 2017-07-10 11:31:59 -07:00
David Kelly
1c9c36a8c8 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview 2017-07-10 10:22:31 -07:00
Andrew Meadows
ab6f615f96 Merge pull request #10910 from Atlante45/fix/audio-mixer-crash 
Fix Audio Mixer crash
 2017-07-10 09:55:44 -07:00
David Kelly
4843b91f47 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-10 09:50:17 -07:00
Dante Ruiz
cc86cda737 Merge branch 'master' of github.com:highfidelity/hifi into luanch-crash-fix 2017-07-10 17:49:20 +01:00
Dante Ruiz
75e1b265d5 comment out code that causes a crash on launch from fresh install 2017-07-10 17:48:53 +01:00
Andrew Meadows
96b88dccd7 Merge pull request #10913 from samcake/orange 
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
 2017-07-10 09:46:09 -07:00
Olivier Prat
9758a6ded0 Edition picking again (but without bounding box highlighting) 2017-07-10 17:57:02 +02:00
Sam Gateau
746812ff78 Merging with origin orange 2017-07-10 17:25:13 +02:00
Olivier Prat
cc4e168369 Working fade again 2017-07-10 16:45:13 +02:00
Olivier Prat
66d09a4c3c Some objects fade and fixed crash due to invalid meta item id 2017-07-10 16:02:12 +02:00
Olivier Prat
267531cc1a First working fade 2017-07-10 15:27:09 +02:00
Sam Gateau
0c3755483b adding assert or checks whenever getting a scene stage 2017-07-10 12:37:26 +02:00
Sam Gateau
4edea433ce Rename the _pipeline into _shapePipeline in the render::Args 2017-07-10 12:16:53 +02:00
Zach Fox
dbb48cd1aa Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-07 16:03:04 -07:00
David Kelly
f18e64ed1a first pass at blitting correct hmd preview (in mono) 2017-07-07 15:53:29 -07:00
Seth Alves
01b612fd14 Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-07 10:42:12 -07:00
Seth Alves
6782a891d0 rename the joint-name caches in AvatarData and Avatar so it's more clear that they are different 2017-07-07 10:35:45 -07:00
Andrew Meadows
2349057306 Merge pull request #10879 from AndrewMeadows/avoid-null-shape 
fix crash in ObjectMotionState::handleEasyChanges()
 2017-07-07 10:22:05 -07:00
Anthony J. Thibault
64375c0438 Merge branch 'master' into feature/smooth-ik-chains 2017-07-07 09:31:46 -07:00
Anthony J. Thibault
bd8d6280a8 Interpolate out of ik chains when they are disabled 2017-07-07 09:29:57 -07:00
Sam Gateau
c3dd25e499 Drafting the mechanism to add shape pipeline 2017-07-07 18:26:10 +02:00
Olivier Prat
06d69d04c3 TransitionStage + FadeJob compiling but not linked to entity events 2017-07-07 18:22:11 +02:00
Seth Alves
88c39f3237 off-by-one 2017-07-07 09:15:42 -07:00
Olivier Prat
4256a1f2a7 Preparing for merge with stage. DOESN'T COMPILE! 2017-07-07 15:16:20 +02:00
Sam Gateau
d15c4ea2d3 Merging with the stage branch 2017-07-07 15:12:40 +02:00
Sam Gateau
a8086764da REmoving warnings for unused var 2017-07-07 12:19:22 +02:00
Sam Gateau
4c1bf6af47 REmoving comments 2017-07-07 11:38:25 +02:00
Olivier Prat
5ab093dc38 Preparing to introducte TransitionStage 2017-07-07 11:01:47 +02:00
Sam Gateau
156c20d01e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-07-07 10:58:05 +02:00
Olivier Prat
69a7ec42fd Added fade state in render::Item 2017-07-07 09:16:54 +02:00
Seth Alves
ddabe940d6 dry up some code 2017-07-06 18:42:00 -07:00
Atlante45
0c18f04e58 Fix Audio Mixer crash 2017-07-06 18:41:25 -07:00
Seth Alves
801c45898f dry up some code 2017-07-06 18:41:11 -07:00
Seth Alves
57ba2c5cd6 add invalidateJointIndicesCache method 2017-07-06 18:16:41 -07:00
Seth Alves
ef4a04b9cf code style 2017-07-06 18:01:58 -07:00
Seth Alves
ab8d9f4885 check for faux joints before heading into code that needs to lock 2017-07-06 18:00:11 -07:00
Seth Alves
a543b957ef fix a race 2017-07-06 17:45:57 -07:00
Seth Alves
fc61fcf494 coding style 2017-07-06 17:40:41 -07:00
Seth Alves
15d379cc5a coding style 2017-07-06 17:36:28 -07:00
Seth Alves
2e88eca2b9 oopsy crazy 2017-07-06 16:33:37 -07:00
Seth Alves
62b7ba6446 Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-06 16:01:42 -07:00
David Kelly
b41c470064 first cut, still stereo 2017-07-06 15:59:24 -07:00
Seth Alves
e03b902a15 change when joint cache is copied 2017-07-06 15:42:24 -07:00
Seth Alves
0ac8f6efa3 cache the jointnames and indexes from FBXGeometry for out-of-thread access 2017-07-06 14:02:59 -07:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only 
disable user activity logger in DS/AC/ac-client
 2017-07-06 14:01:49 -07:00
Seth Alves
24c8267030 in Rig joint accessors, if on the Rig's thread use internalPoseSet, else use external 2017-07-06 13:22:14 -07:00
Stephen Birarda
bdcdff3dbc force _isSet to be set before isSet() called 2017-07-06 12:01:08 -07:00
Anthony J. Thibault
92926e7a59 Merge branch 'master' into feature/smooth-ik-chains 2017-07-06 11:32:34 -07:00
Seth Alves
e9bdbd7715 Merge branch 'calvin' of github.com:samcake/hifi into faster-getters-on-avatar-for-scripts 2017-07-06 11:09:38 -07:00
Atlante45
1d07ab70f0 Fix warnings 2017-07-06 10:56:09 -07:00
Andrew Meadows
2299bb7718 supply minimum shape rather than null 2017-07-06 10:37:44 -07:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
Zach Fox
ee86638c4e Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-06 09:58:00 -07:00
David Kelly
1ccf0da7d8 Merge pull request #10897 from davidkelly/dk/cacheSwitchFix 
redo cache switch
 2017-07-06 09:53:01 -07:00
Olivier Prat
e178e36963 Fixed compilation error 2017-07-06 17:29:14 +02:00
Olivier Prat
018c0489f4 Merged with 21378 2017-07-06 16:53:47 +02:00
Sam Gateau
53ffca796f Drafting a better SHape plumber to render the items 2017-07-06 16:35:40 +02:00
David Rowe
cfd155c198 Merge branch 'master' into 21418 2017-07-06 16:56:10 +12:00
Brad Davis
d91516c630 Merge pull request #10894 from jherico/acclient_fix 
Fix ACClient on Linux
 2017-07-05 18:26:15 -07:00
Atlante45
9a1d38384d Remove unecessary loops 2017-07-05 17:43:09 -07:00
Atlante45
20a633eb89 Check struct sizes at compile time 2017-07-05 17:42:59 -07:00
Atlante45
95abbd0ad4 Prevent Interface from trying to send packets bigger than an MTU 2017-07-05 17:08:04 -07:00
David Kelly
4a22fbca1b redo cache switch 2017-07-05 17:01:31 -07:00
Brad Davis
2409c83d5d Fix ACClient on Linux 2017-07-05 16:53:42 -07:00
Atlante45
7e9ce5a58b Don't overflow during AvatarData::toByteArray 2017-07-05 16:15:18 -07:00
Brad Davis
7f1bc07d04 Trying to fix overlay crashes again 2017-07-05 14:30:01 -07:00
Anthony J. Thibault
06d512dab9 Warning fixes 2017-07-05 10:43:24 -07:00
Sam Gateau
48b4b5f49c Fixing the bug appearing on Nvidia 284.76 2017-07-05 18:39:09 +02:00
Anthony J. Thibault
56cd31e92d Merge branch 'master' into feature/smooth-ik-chains 2017-07-05 09:33:22 -07:00
Anthony J. Thibault
1a24d4d8ec added safeLerp, shortest angle quat lerp with post normalize 2017-07-05 09:31:02 -07:00
Olivier Prat
b1b11ec756 Correct fix for mac and linux due to multiple Logging.h files 2017-07-05 09:08:51 +02:00
Olivier Prat
23bfc2c13d Fixed compilation on mac and linux 2017-07-04 18:36:54 +02:00
Olivier Prat
5cee2cff9f Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-07-04 17:48:07 +02:00
Olivier Prat
45342a00fd Forced faded objects to double sided (without correct lighting for the moment) 2017-07-04 17:45:32 +02:00
Olivier Prat
704effc0a6 Added cubic interpolation in noise for rounder effect 2017-07-04 17:38:45 +02:00
Olivier Prat
2525fe5869 Working save and load 2017-07-04 17:31:24 +02:00
Olivier Prat
98d915cf0f Smoother ease in / out functions 2017-07-04 14:35:43 +02:00
Olivier Prat
7d851c1cbd Added timing parameters and visual debug of threshold 2017-07-04 12:01:28 +02:00
Olivier Prat
0244dd6325 Working bubble isect trespasser POV 2017-07-04 09:47:23 +02:00
Olivier Prat
57b2bdf709 Working bubble isect owner POV 2017-07-04 09:14:08 +02:00
Anthony J. Thibault
7ed1382ac9 ik level interpolation of incoming targets 2017-07-03 16:32:46 -07:00
Anthony J. Thibault
2f6a37ee53 Removed interpolation of hand controllers 2017-07-03 16:31:05 -07:00
David Kelly
2a3b4b3bfb minor cleanup, and adjusted includes per austin's suggestion 2017-07-03 15:54:54 -07:00
David Kelly
373bd0cc8a aspect ratio preserved upon blitting, minor qml tweak, warnings fixed 2017-07-03 14:23:23 -07:00
David Kelly
5f015ec77f Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-07-03 13:57:25 -07:00
Seth Alves
70a7b302fc Merge pull request #10860 from jherico/deadlock_guards 
Don't use blocking connections on the main thread
 2017-07-03 09:05:56 -07:00
Olivier Prat
36f8f682b3 Merge branch '21378' of http://github.com/Zvork/hifi into fadeedit 2017-07-03 17:18:19 +02:00
Olivier Prat
972db8f54c Fixed compilation error on Mac and Linux 2017-07-03 17:17:37 +02:00
Olivier Prat
f2b8bd4c84 Merged with 21378 2017-07-03 16:44:00 +02:00
Olivier Prat
ec1cf9dc50 Changed array initialization to old style C 2017-07-03 16:42:27 +02:00
Olivier Prat
0d1d262db4 Working on bubble intersections 2017-07-03 16:28:00 +02:00
Olivier Prat
3fddac9f6e Fixed compilation errors with array initializations 2017-07-03 16:12:23 +02:00
Olivier Prat
d9a83539b2 Merged with master 2017-07-03 15:32:30 +02:00
Olivier Prat
af7957491b Working avater enter/leaves + manual threshold 2017-07-03 12:40:58 +02:00
Clément Brisset
8744b8e58d Merge pull request #10859 from Atlante45/fix/ac-cleanup 
Fix AC cleanup
 2017-06-30 16:42:15 -07:00
David Rowe
07697c5083 Merge branch 'master' into 21418 
# Conflicts:
#	interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
#	interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml

Removed stray "Vive Controller Picks" configuration item which no longer exists.
 2017-07-01 11:19:00 +12:00
Stephen Birarda
f6fe3f91fd Merge pull request #10829 from birarda/bug/sequence-skips 
fix avatar mixer sending empty avatar identities
 2017-06-30 15:28:29 -07:00
Brad Davis
31d2c9980e Merge pull request #10797 from ctrlaltdavid/21396 
Make Leap Motion a plugin
 2017-06-30 14:37:23 -07:00
David Kelly
09d959bdeb Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-06-30 14:16:01 -07:00
Anthony J. Thibault
aba164b26e more clean up of Rig::computeAvatarBoundingCapsule 2017-06-30 13:27:53 -07:00
David Kelly
133af0b522 jittery, still not working in tablet 2017-06-30 12:55:11 -07:00
Anthony J. Thibault
237872e477 sizes and order of IKTargetVarVec and IKTargetVec are now the same. 
Also, A change in how the bone name to bone index lookup occurs exposed a bug
in Rig::computeAvatarBoundingCapsule(), basically it was not actually preforming IK,
and the ik targets were in the wrong coordinate frame.  So when IK was actually
performed it would give bad results.  This bug is now fixed.
 2017-06-30 12:47:01 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
9c37b28ba0 Remove tool window logic 2017-06-30 10:58:19 -07:00
Zach Fox
0f9c917965 Merge pull request #10853 from samcake/brown 
Fix projection & lighting issues identified with 2nd rendering pipeline In Master
 2017-06-30 10:05:54 -07:00
Anthony J. Thibault
75e1a4a1e6 Refactor of JointChainInfo data structure 2017-06-30 09:28:39 -07:00
Anthony J. Thibault
c7e4bf931b WIP: first steps toward smoothing ik chains 2017-06-30 09:28:38 -07:00
Brad Davis
8372d73fec Additional thread safety 2017-06-30 09:15:06 -07:00
Olivier Prat
87833abd31 Sky working again. 2017-06-30 16:46:25 +02:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
anshuman64
b22daa9a6f Merge pull request #10838 from druiz17/avatar-recording-roomscale 
Fix loading of incorrect joint data for the avatar recording
 2017-06-29 12:24:37 -07:00
Atlante45
5c731636b1 Sandbox restarts crashed processes 2017-06-29 12:13:52 -07:00
Olivier Prat
c5ca23f4ea Changing edited fade category properly updates widgets in edit window 2017-06-29 17:14:20 +02:00
Sam Gateau
f7a3b3a411 Experimenting faster getters on Avatar for scripts 2017-06-29 15:55:47 +02:00
Olivier Prat
fb33b8d1c1 Working edition and emissive edge on fade element enter/leave 2017-06-29 12:59:43 +02:00
Olivier Prat
6a31dc2659 Selection of edited object working 2017-06-29 12:13:55 +02:00
Sam Gateau
ca7e782566 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-29 10:54:27 +02:00
Sam Gateau
b766c256db Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-29 10:29:05 +02:00
Olivier Prat
8a12d0c106 Fade effect working again for basic enter domain but with various Fade jobs 2017-06-29 08:54:23 +02:00
Thijs Wenker
e781f97ddc Merge pull request #10846 from sethalves/fix-server-scripts-more 
make ResourceManager be owned by DependencyManager
 2017-06-28 17:05:30 -07:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Andrew Meadows
e9edf01a34 Merge pull request #10831 from kencooke/audio-hrtf-optimize 
More HRTF optimizations
 2017-06-28 14:17:00 -07:00
David Rowe
88ed69a4a1 Code review 2017-06-29 08:58:27 +12:00
Ken Cooke
0dbb7a71f3 CR fix: comments instead of ref code 2017-06-28 11:32:24 -07:00
Seth Alves
2f3109e4be move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it 2017-06-28 11:00:05 -07:00
Clément Brisset
a2c15c9794 Merge pull request #10770 from jherico/fix_deps_1 
Cleanup entity dependencies
 2017-06-28 10:48:58 -07:00
Ken Cooke
0acbdc7755 CR fix: use predefined PI 2017-06-28 10:18:54 -07:00
David Kelly
b73102d063 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-06-28 08:57:04 -07:00
Sam Gateau
9b0a0fb23b Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-28 17:33:26 +02:00
Andrew Meadows
1e23fa7baa Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle 
Eliminated toe wiggle while pucks are enabled.
 2017-06-28 08:30:27 -07:00
Dante Ruiz
96ae39989e Merge branch 'master' of github.com:highfidelity/hifi into avatar-recording-roomscale 2017-06-28 16:22:41 +01:00
Dante Ruiz
f6ba264de6 avatar recording fix 2017-06-28 16:22:28 +01:00
Sam Gateau
93963b3257 Apply the projection and deferred transform fixes found while working on spectator camera 2017-06-28 15:44:17 +02:00
Olivier Prat
b76a8a6f9b Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-06-28 14:37:03 +02:00
Sam Gateau
1e2b0ca91c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-28 10:21:05 +02:00
Seth Alves
e4a9674614 Merge pull request #10824 from sethalves/fix-script-sleep-busyloop 
use QEventLoop and a timer for a less CPU using sleep + event-processing
 2017-06-27 21:00:40 -07:00
Brad Davis
28d727153b PR feedback 2017-06-27 19:22:07 -07:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
Ken Cooke
ad970c9f5c fast compute of HRTF azimuth 2017-06-27 13:45:18 -07:00
Howard Stearns
20f713a241 Merge pull request #10803 from davidkelly/dk/cacheSwitch 
new --cache switch for interface
 2017-06-27 12:23:23 -07:00
Stephen Birarda
089a2bb362 do not manage identity data without identity data received 2017-06-27 11:58:03 -07:00
Ken Cooke
dcdf07191b Fast acosf() using polynomial approximation 2017-06-27 11:29:44 -07:00
Anthony J. Thibault
d4122cff5a warning fix 2017-06-27 11:29:08 -07:00
David Kelly
01155ba4e3 this handles redirecting ktx_cache, data8, prepared 2017-06-27 08:47:54 -07:00
Sam Gateau
1fbaac12ec Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-27 15:54:12 +02:00
Seth Alves
722dc46f60 Merge branch 'master' of github.com:highfidelity/hifi into fix-script-sleep-busyloop 2017-06-27 06:44:31 -07:00
Sam Gateau
63835d0863 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-27 14:24:55 +02:00
Sam Gateau
76dae279cf Removing the default case from the renderer 2017-06-27 14:24:34 +02:00
Anthony J. Thibault
2814c94582 Hips should no longer waggle when feet are active 2017-06-26 17:43:51 -07:00
Seth Alves
4f672f93d2 avoid cast that isn't always available 2017-06-26 16:03:39 -07:00
Seth Alves
bf7da71eaf use QEventLoop and a timer for a less CPU using sleep + event-processing 2017-06-26 15:07:22 -07:00
Anthony J. Thibault
8602d57a57 Eliminated to wiggle while pucks are enabled. 
* Added new anim node AnimDefaultPose
* AnimNodeLoader was changed to support the addition of the AnimDefaultPose node
* Edited default avatar-animation.json to insert an AnimOverlay and AnimDefaultPose between the IK node and the rest of the "underPose".
* Rig uses this to fade in default pose for the toes when the hip/feet puck are active.
  This effectively deadens the toe animations, without effecting the hand animations.
* Also, the rig was changed to use the LimitCenter solution when the feet are enabled but the hips are not.
 2017-06-26 14:09:10 -07:00
Ryan Huffman
209a4f33b5 Merge pull request #10784 from huffman/feat/pal-replicated 
Disable silence + ban buttons for replicated users
 2017-06-26 12:50:23 -07:00
Seth Alves
2f2a13ec27 Merge pull request #10799 from jherico/object_parent_warnings 
Fix warnings about creating QObjects with parents in different thread
 2017-06-26 09:39:29 -07:00
Sam Gateau
7687bdc060 less comments & constant 2017-06-26 17:02:45 +02:00
Sam Gateau
5e05c41980 less comments & constant 2017-06-26 16:56:04 +02:00
Sam Gateau
6ab2dccd38 less comments & constant 2017-06-26 16:52:04 +02:00
Sam Gateau
7cbeabfc29 less comments & constant 2017-06-26 16:49:20 +02:00
Sam Gateau
a2fc44703d One less constant 2017-06-26 16:45:54 +02:00
Sam Gateau
904f22985c CLeaning up comments 2017-06-26 16:43:04 +02:00
Sam Gateau
77644e7e9d Removing commented objects from deferredlighting effect 2017-06-26 14:34:09 +02:00
Olivier Prat
1bb0d51849 Merged with master 2017-06-26 11:55:46 +02:00
Sam Gateau
75e457ce7c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-26 10:05:04 +02:00
Sam Gateau
619b357ad0 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-26 10:03:53 +02:00
David Rowe
31714675c3 Remove unused Sixense preference and associated methods 2017-06-26 16:14:57 +12:00
David Rowe
bed0e8ef87 Merge branch 'master' into 21396 
# Conflicts:
#	interface/src/avatar/MySkeletonModel.cpp
 2017-06-26 12:07:25 +12:00
Seth Alves
9ae390853c Merge pull request #10814 from jherico/linux_fix_static_plugins 
Fix static plugin initialization on Linux
 2017-06-25 08:17:16 -07:00
Seth Alves
a09986a865 Merge pull request #10815 from jherico/fix_toolbar_buttons 
Fix toolbar button mouse click when they were added via the tablet scripting interface
 2017-06-25 08:16:41 -07:00
Brad Davis
6b47981c6e Merge pull request #10813 from sethalves/fix-initialization-order-fiasco 
fix an initialization order fiasco
 2017-06-25 02:57:26 -07:00
Brad Davis
08784ff30c Fix toolbar button mouse click when they were added via the tablet scripting interface 2017-06-25 02:34:58 -07:00
anshuman64
8d5bdd2d84 Merge pull request #10730 from hyperlogic/feature/pole-vector 
Pole vector support for elbow and knee joints
 2017-06-24 23:08:22 -07:00
Bradley Austin Davis
960017ddd7 Fix static plugin initialization on Linux 2017-06-24 22:22:47 -07:00
Seth Alves
05f0ec267e fix an initialization order fiasco 2017-06-24 18:53:00 -07:00
David Rowe
3de1c0a312 Make and save recording 2017-06-24 15:57:57 +12:00
humbletim
c10475186c add support for switching cursor from arrow to reticle 2017-06-23 18:48:29 -04:00
Anthony J. Thibault
b8c638b2b7 warning fixes 2017-06-23 14:36:59 -07:00
Ryan Huffman
86ed61a15d Push avatar packet version for isReplicated 2017-06-23 14:26:13 -07:00
Ryan Huffman
b56cfa56c7 Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated 2017-06-23 14:23:20 -07:00
David Rowe
6e266dfbac Merge branch 'master' into 21396 2017-06-24 09:19:12 +12:00
samcake
c0e8b6c8bc clean up 2017-06-23 14:18:56 -07:00
Anthony J. Thibault
f320610681 opened up shoulder constraint + other fixes 
* bent elbows will be away from the body a bit more.
* sped up smoothing of pole vectors
 2017-06-23 14:06:00 -07:00
samcake
b7b520a6e8 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-23 13:50:31 -07:00
samcake
17e2140826 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-23 13:28:58 -07:00
Brad Davis
f1fe4ed7cc Merge pull request #10804 from jherico/fix_deps_3 
Remove dependency between codec plugins and UI
 2017-06-23 12:51:35 -07:00
Brad Hefta-Gaub
dc649e84df Merge pull request #10792 from jherico/qml_crashes 
Trying to fix QtQml/QtScript crashes
 2017-06-23 12:41:43 -07:00
Brad Davis
fe7d4b1d23 Remove dependency between codec plugins and UI 2017-06-23 12:25:18 -07:00
Anthony J. Thibault
54af6af651 Fix for pole vector stability and knee pole vector computation 2017-06-23 10:38:21 -07:00
Brad Davis
416852c0cd Fix warnings about creating QObjects with parents in different thread 2017-06-23 10:19:16 -07:00
Brad Davis
341646c780 Fix bad invocation, cleanup signatures 2017-06-23 09:58:27 -07:00
David Kelly
63279f4525 Merge pull request #10790 from davidkelly/dk/scriptsSwitch 
Command line switch to override default scripts location
 2017-06-23 08:53:40 -07:00
David Kelly
7ef50042ba remove turd 2017-06-23 08:00:18 -07:00
David Rowe
9d0407cbdf Merge branch 'master' into 21396 2017-06-23 16:52:04 +12:00
samcake
c24e254257 Add support for profiling from scripts 2017-06-22 18:10:20 -07:00
samcake
20d8c11e28 ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore 2017-06-22 17:54:16 -07:00
Brad Davis
4439de240a Trying to fix QtQml/QtScript crashes 2017-06-22 16:39:57 -07:00
samcake
bda52c33e6 Adding the function source when profiling, to explore perf issues 2017-06-22 15:35:00 -07:00
Clément Brisset
c47645e075 Merge pull request #10778 from birarda/feat/upstream-in-nodelist 
add upstream nodes to NL and verify replicated packet sender
 2017-06-22 15:16:23 -07:00
David Kelly
06d1ac8bf7 Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch 2017-06-22 14:14:54 -07:00
David Kelly
ff5b37c785 new --scripts switch overrides default scripts location 2017-06-22 14:09:05 -07:00
Anthony J. Thibault
79d9bbe6c5 Merge branch 'master' into feature/pole-vector 2017-06-22 13:37:55 -07:00
Brad Hefta-Gaub
7668fbb7a0 Merge pull request #10755 from seefo/fb5278 
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
 2017-06-22 13:35:05 -07:00
Brad Hefta-Gaub
197006e3d3 Merge pull request #10780 from kencooke/audio-hrtf-avx512 
HRTF optimizations
 2017-06-22 13:34:05 -07:00
Stephen Birarda
8b7eaaa23a activate the public socket always for upstream/downstream servers 2017-06-22 13:33:57 -07:00
Stephen Birarda
0e0f216aed cleanup indentation in packet filter 2017-06-22 13:33:57 -07:00
Stephen Birarda
d05996c13d fix upstream filter check, audio interest set 2017-06-22 13:33:57 -07:00
Stephen Birarda
6da5a63152 verify replicated packets in packet filter 2017-06-22 13:33:57 -07:00
Stephen Birarda
ea45e341ee send upstream nodes down to avatar/audio 2017-06-22 13:33:57 -07:00
seefo
48b5989b60 add upstream nodes to domain nodelist 2017-06-22 13:33:57 -07:00
Stephen Birarda
86b2382f7c Merge pull request #10785 from birarda/bug/manage-avatar-identity 
push AvatarData sequence number when managing identity data for agent
 2017-06-22 12:02:42 -07:00
Stephen Birarda
ccbae07170 rename _sequenceNumber to _lastSequenceNumber 2017-06-22 11:23:58 -07:00
Stephen Birarda
42cceb02a4 push sequence number when managing identity data for agent 2017-06-22 11:10:43 -07:00
Clément Brisset
48aadb2899 Merge pull request #10775 from 1P-Cusack/21401 
Adding support for loading obj.gz files in ModelCache.
 2017-06-22 11:03:23 -07:00
samcake
96a10d2e95 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-22 09:32:49 -07:00
Andrew Meadows
e5602aa7d3 Merge pull request #10773 from Atlante45/fix/refresh-content 
Fix reload content for baked skyboxes
 2017-06-22 08:40:42 -07:00
1P-Cusack
f8c30c70e8 Addressing some feedback. Making the .obj.gz checks more specific and adding an exception if gunzip fails. 2017-06-22 11:21:19 -04:00
Ken Cooke
af0f460659 Fix extra whitespace 2017-06-22 06:38:13 -07:00
Ken Cooke
5d235f8c52 Fix typo 2017-06-22 06:32:32 -07:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
David Rowe
3bdf267900 Implement fingers control 2017-06-22 23:32:06 +12:00
Sam Cake
07e18eb3a8 Keep cleaning up the DeferredLightingEffect , removing stage s from there... 2017-06-22 01:12:32 -07:00
samcake
9ae2861ee6 Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements 2017-06-21 18:29:38 -07:00
Seth Alves
c70365d04a Merge pull request #10729 from druiz17/hand-pucks 
Hand pucks and Calibration UI
 2017-06-21 18:10:15 -07:00
Stephen Birarda
c516dd06e4 Merge pull request #10714 from highfidelity/replicants 
add broadcasting/replication to downstream avatar mixers and audio mixers
 2017-06-21 17:55:07 -07:00
samcake
2919607f86 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-21 17:20:44 -07:00
Stephen Birarda
aeb3f443f8 address code review comments 2017-06-21 16:14:14 -07:00
1P-Cusack
781e2f409f Adding support for loading obj.gz files in ModelCache. 2017-06-21 18:50:39 -04:00
Anthony J. Thibault
2dcca2125b Merge branch 'master' into feature/pole-vector 2017-06-21 15:50:03 -07:00
Atlante45
4a552affe6 Fix reload content for baked skyboxes 2017-06-21 15:19:03 -07:00
Anthony J. Thibault
0f51236fb0 Rig.cpp: take avatar scale into account when computing elbow pole vector 2017-06-21 14:36:42 -07:00
Clément Brisset
4929939501 Merge pull request #10768 from Atlante45/fix/skyboxes 
Fix skyboxes sometimes not showing
 2017-06-21 13:56:42 -07:00
Ken Cooke
38c87b0f08 Fallback code to allow compiling with VS2013 2017-06-21 13:19:46 -07:00
Atlante45
49623fefd8 Fix Skyboxes sometimes not showing 2017-06-21 11:40:32 -07:00
Ken Cooke
afb26df2de Runtime dispatch for AVX512 optimized HRTF 2017-06-21 11:26:53 -07:00
samcake
56d5f4ec5c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-21 11:25:07 -07:00
Brad Hefta-Gaub
f7d42c782d Merge pull request #10764 from thoys/feat/ac-location-jsapi 
Expose location scripting interface to Agent (AC script)
 2017-06-21 10:22:48 -07:00
Brad Hefta-Gaub
04d74a715a Merge pull request #10765 from samcake/brown 
Adding Profiling for script engine timer callback
 2017-06-21 10:13:20 -07:00
Dante Ruiz
f369303bfe removed warning 2017-06-21 18:12:31 +01:00
Brad Hefta-Gaub
c5845787da Merge pull request #10759 from jherico/file_cache_shutdown 
Fix crash when cache entry lifetime exceeds cache lifetime
 2017-06-21 10:06:48 -07:00
Ryan Huffman
0e7ddfd29f Disable silence/ban buttons in PAL if avatar is replicated 2017-06-21 09:49:16 -07:00
Ryan Huffman
8ce1474d9a Add isReplicated to avatar identity data 2017-06-21 09:48:34 -07:00
Ken Cooke
00c904c927 Detect compiler support for SIMD intrinsics in conditional compilation 2017-06-21 09:34:02 -07:00
Sam Cake
09529f6592 One more refinemnt of the comment 2017-06-21 00:54:04 -07:00
Sam Cake
484aeed589 More comments on the getCOnfig call 2017-06-21 00:36:03 -07:00