Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 20:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
64946 commits 75 branches 59 tags 1.2 GiB
Commit graph

26746 commits

Author SHA1 Message Date
David Back
26a56f0173 Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-02-06 16:12:30 -08:00
Bradley Austin Davis
0455fb37b6 Merge remote-tracking branch 'upstream/master' into fix/shader_length 2018-02-06 15:55:01 -08:00
Andrew Meadows
672520f3bf quickfix for velocity spike for Tractor action 2018-02-06 12:06:27 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
John Conklin II
0e3bcda859
Merge pull request #12336 from sethalves/bump-av-protocol-more 
try harder to bump avatar-mixer protocol version
 2018-02-06 09:12:03 -08:00
Olivier Prat
d248e1ed79 Merge branch 'master' of http://github.com/highfidelity/hifi into scripts 2018-02-06 18:00:38 +01:00
Seth Alves
d8ad3192fe
Merge pull request #12332 from sethalves/fix-tractor-action-initial-crazy 
Fix tractor action initial crazy
 2018-02-06 08:59:25 -08:00
Seth Alves
213dd61502
Merge pull request #12341 from sethalves/fix-polyvox-visible 
make polyvox entities visible again
 2018-02-06 08:59:01 -08:00
Olivier Prat
733d36df47 Fixed save / load of fade effect configurations 2018-02-06 17:57:04 +01:00
Olivier Prat
179aca2bf9 Shadow task now uses LOD culling from main view task 2018-02-06 11:47:39 +01:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Seth Alves
33ca1fd344 make polyvox entities visible again 2018-02-05 14:58:34 -08:00
Dante Ruiz
0c5c4679fb Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update 2018-02-05 14:25:54 -08:00
Bradley Austin Davis
b658d4add2
Merge pull request #12338 from vladest/fix_build_gcc7 
Add include with std::function
 2018-02-05 13:34:48 -08:00
vladest
0715a7cae5 Add include with std::function 2018-02-05 21:02:44 +01:00
Seth Alves
14d8259a5e try harder to bump avatar-mixer protocol version 2018-02-05 11:54:48 -08:00
Stephen Birarda
52e63db70b
Merge pull request #12249 from birarda/bug/god-voice 
refuse to handle positional audio streams with NaN position
 2018-02-05 12:50:56 -07:00
Stephen Birarda
761321875c
Merge pull request #12195 from birarda/bug/connection-refused 
clear silent connection attempt counter on DomainHandler soft reset
 2018-02-05 11:35:02 -07:00
Anthony Thibault
819af96fcc
Merge pull request #12331 from ctrlaltdavid/21732 
Fix scaling of avatar submeshes attached to joints
 2018-02-05 10:19:18 -08:00
Olivier Prat
92279b5939 Merged with master 2018-02-05 18:24:05 +01:00
Olivier Prat
445ffbd82f Added tag bits to shadow octree query 2018-02-05 16:35:55 +01:00
David Rowe
615e54620b Remove Menu.isInfoViewVisible() and closeInfoView() from JavaScript API 2018-02-04 15:38:33 +13:00
David Rowe
efddec621f Remove Menu.addActionGroup() and removeActionGroup() from JavaScript API 2018-02-04 15:16:20 +13:00
David Rowe
d842e532ee Remove Window.customPrompt() from JavaScript API 2018-02-04 14:02:30 +13:00
Olivier Prat
2940a67b3e Merged with master 2018-02-03 16:55:25 +01:00
Seth Alves
639f7a52d8 remove unneeded/repeated line 2018-02-02 18:24:38 -08:00
Seth Alves
a6978a6dec Merge branch 'make-your-branch' of github.com:AndrewMeadows/hifi into fix-tractor-action-initial-crazy 2018-02-02 18:15:59 -08:00
ZappoMan
71a8e96d5a fix several CR requests 2018-02-02 18:14:12 -08:00
David Rowe
9818674549 Fix scaling of avatar submeshes attached to joints 2018-02-03 15:06:47 +13:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Andrew Meadows
83ab994181 avoid initial bad measure of tractor target's velocity 2018-02-02 16:42:51 -08:00
John Conklin II
c8bb26ae74
Merge pull request #12294 from samcake/pastel 
Improve startup time by optimizing shader bookkeeping
 2018-02-02 16:37:44 -08:00
ZappoMan
8a9153a461 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-02 16:08:05 -08:00
Andrew Meadows
a5e968867e
Merge pull request #12302 from druiz17/fix-another-bootstrapping 
Fix another bootstrapping and rename entityItem _dirtyFlags
 2018-02-02 15:14:38 -08:00
John Conklin II
9f4820df3b
Merge pull request #12255 from Zvork/trnormalmap 
Normal map support on translucent objects
 2018-02-02 14:19:50 -08:00
Stephen Birarda
eb9d100fc8 reset count on conn refusal, soft reset DH in Interface on limit reached 2018-02-02 13:47:48 -08:00
Stephen Birarda
e16a3859c2 reset silent check in packet check on domain connection reset 2018-02-02 13:47:48 -08:00
Dante Ruiz
d593e7107c fix merge conflict 2018-02-02 13:29:31 -08:00
Atlante45
8ebb3e52d8 Misc bug fixes 2018-02-02 13:10:49 -08:00
Stephen Birarda
ffd10b79bf refuse to handle positional audio streams with NaN position 2018-02-02 11:21:50 -08:00
Elisa Lupin-Jimenez
9f8e2017ce can add image directly from asset server 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d390e20139 removed extraneous commenting and image class 2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
42151b8fd4 creating new image entity opens image property options 2018-02-02 10:14:27 -08:00
Elisa Lupin-Jimenez
ceb621a521 reverted protocol change for images 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
576d683d3b initial changes to incorporate snap model 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
dc5f29aa58 entity item properties hooked up for image 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
c9c55af661 setting up properties page (not complete) 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
6f76650789 updated with master 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
3d000d3d01 changed packet number 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
72d8f90ec1 not sure why entities don't render with these changes 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
fc0e87d5ea more infrastructure links 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
fdca8ab93e added image button to edit.js, working on connecting to cpp 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
3a7290c3ed starting 2d image entity type 2018-02-02 10:08:39 -08:00
Olivier Prat
03daba9bac Removed duplicate shader include 2018-02-02 18:18:24 +01:00
Olivier Prat
8a011036ef Removed warnings on mac and ubuntu 2018-02-02 18:07:35 +01:00
Seth Alves
861497e907 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-02-02 08:56:18 -08:00
Seth Alves
14d5029f4d only update cauterization of child entities when something relevant changes 2018-02-02 08:56:11 -08:00
Olivier Prat
e9747e9d85 Small optimisations in shadow shader 2018-02-02 15:06:22 +01:00
Olivier Prat
ac92b3c130 Merge branch 'master' of http://github.com/highfidelity/hifi into scribe 2018-02-02 14:01:59 +01:00
Olivier Prat
234cb1e3e6 Added anti frustum test to remove lower cascade objects from higher shadow cascades 2018-02-02 12:15:43 +01:00
Olivier Prat
1f4671ba17 Cleaned up orthographic shadow culling functor 2018-02-02 11:09:28 +01:00
Olivier Prat
3804917cf4 Orthographic octree selection seems to be working 2018-02-02 09:40:57 +01:00
Olivier Prat
a44c5c9814 Merge branch 'master' of http://github.com/highfidelity/hifi into trnormalmap 2018-02-02 08:46:38 +01:00
John Conklin II
cbdbf51ccd
Merge pull request #12317 from hyperlogic/feature/remove-ik-hips-offset 
Removal of hips offset shifting from AnimInverseKinematics node
 2018-02-01 15:30:08 -08:00
ZappoMan
8751ef506e Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-01 14:29:12 -08:00
Seth Alves
53f536c476
Merge pull request #12320 from ctrlaltdavid/21731 
Bump avatar mixer packet version
 2018-02-01 14:28:23 -08:00
Seth Alves
45ab2e9654
Merge pull request #12319 from hyperlogic/bug-fix/cauterization-on-rigid-bound-mesh 
Fix for rigidly bound mesh not being properly cauterized.
 2018-02-01 13:44:27 -08:00
humbletim
06afaa7470 BufferView <-> QVariant/QScriptValue conversion 
update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
 2018-02-01 16:30:29 -05:00
samcake
9867b479fd APplying review feedback 2018-02-01 13:12:28 -08:00
David Rowe
f46362906d Bump avatar mixer packet version 2018-02-02 10:02:20 +13:00
Seth Alves
0a94af53fc
Merge pull request #12314 from ctrlaltdavid/21731 
FBX fixes
 2018-02-01 12:12:38 -08:00
Seth Alves
f7027b52e1
Merge pull request #12311 from ElderOrb/FB11511 
FB11511 - position of log windows should be persistent between invocations of interface
 2018-02-01 12:11:30 -08:00
Seth Alves
bdf6736a54 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-02-01 12:04:56 -08:00
Anthony J. Thibault
a1b67afabf Fix for rigidly bound mesh not being properly cauterized. 
For example, sometimes in first person view, you can see the back of your avatar's eyes or the brim of your avatar's hat.
 2018-02-01 11:57:50 -08:00
MiladNazeri
a9c6af6b13
Merge pull request #12318 from Triplelexx/entity_serverscript_log_typo 
Fix typos for entity server script log
 2018-02-01 10:55:29 -08:00
samcake
fd501cf3af Addressing review comments 2018-02-01 10:37:54 -08:00
Dante Ruiz
ab20643ada fix mistakes 2018-02-01 08:13:43 -08:00
Seth Alves
482be7ba4e Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-02-01 06:36:04 -08:00
Sam Gateau
351f619555 Fixing a shader error on android 2018-01-31 23:35:16 -08:00
Sam Gateau
60238fa644 Fixing the android build 2018-01-31 23:15:19 -08:00
Triplelexx
a8d2be045c fix typos 2018-02-01 07:09:24 +00:00
Sam Gateau
d4a3932549 Merge branch 'master' of https://github.com/highfidelity/hifi into pastel 2018-01-31 21:53:09 -08:00
Sam Gateau
edb416d24e Fixing the program map sorting, good to go 2018-01-31 21:32:22 -08:00
Anthony J. Thibault
b23f98b311 Removal of hips offset shifting from AnimInverseKinematics node 
With the addition of the hips IK target, the hips offset shifting code is no longer necessary.
This PR should not effect any behavior, but it removes this unused code from the animation system.
 2018-01-31 17:56:33 -08:00
samcake
89f4fe1c04 Adding the map of existing shaders and programs and ways to identify them to avoid recompiling them 2018-01-31 17:28:45 -08:00
David Rowe
a7ec4501e6 FBX node IDs aren't alphanumerically ordered per logical structure 2018-02-01 13:43:14 +13:00
David Rowe
4cd130dd63 Don't reparent model node with clusters if it's a root node 2018-02-01 13:39:57 +13:00
Dante Ruiz
bd5fc65bfb fix getDirtyFlags & getSpecialFlags function 2018-01-31 16:19:14 -08:00
John Conklin II
453d0038d6
Merge pull request #12297 from hyperlogic/bug-fix/hair-freakout 
Fix avatars with extra joints during mirrored animations
 2018-01-31 15:33:34 -08:00
John Conklin II
fd92ef226a
Merge pull request #12274 from samcake/flash 
FIxing the dark ambient lighting on scattering surface
 2018-01-31 15:32:29 -08:00
Dante Ruiz
f6029ed9dc made requested changes 2018-01-31 15:21:22 -08:00
samcake
0885b00ab8 Merge branch 'master' of https://github.com/highfidelity/hifi into pastel 2018-01-31 14:18:38 -08:00
Brad Hefta-Gaub
f5614618b9
Merge pull request #12288 from ctrlaltdavid/21729 
Add location.domainID as a synonym for location.domainId
 2018-01-31 13:50:48 -08:00
Alexander Ivash
579d9a8640 fix slots invocation 2018-02-01 00:48:03 +03:00
Bradley Austin Davis
f40d83381d
Merge pull request #12300 from jherico/fix/amd_crash 
Trying to fix AMD crash in QML rendering
 2018-01-31 13:24:50 -08:00
Seth Alves
96b6e85745 formatting 2018-01-31 12:24:23 -08:00
Brad Davis
e5559fa865 Better fix for AMD crashing (hopefully 2018-01-31 12:10:06 -08:00
samcake
582ef2a8a2 MErging with master 2018-01-31 11:00:23 -08:00
Seth Alves
64a46bf5df merge from upstream 2018-01-31 10:43:41 -08:00
Dante Ruiz
01f8227fa2 remove stray prints 2018-01-31 10:41:08 -08:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete 
JS scripting console auto-complete
 2018-01-31 10:39:51 -08:00
Brad Davis
ef699c2a78 Better fix for AMD crashing (hopefully 2018-01-31 10:38:20 -08:00
Dante Ruiz
9ff6e079ee fix functions 2018-01-31 10:09:23 -08:00
Sam Gateau
9a131cfab6
Merge pull request #12265 from SamGondelman/resourceCache 
Remove unnecessary invokeMethod from ResourceCache::getResource
 2018-01-31 09:35:05 -08:00
John Conklin II
ece72501b9
Merge pull request #12279 from druiz17/fix-parenting-crash 
fix entity parenting crash
 2018-01-31 09:32:52 -08:00
Dante Ruiz
c3b8565dea min diff 2018-01-31 09:23:00 -08:00
Dante Ruiz
4429be23c0 add comment 2018-01-31 09:13:11 -08:00
Brad Davis
9893273d33 Trying to fix AMD crash in QML rendering 2018-01-31 08:36:52 -08:00
Olivier Prat
d422545c78 Changed shadow task to do a single octree query as well as pipeline/depth sort for all cascades. Still issue with disapearing objects from shadow map with viewpoint 2018-01-31 17:13:06 +01:00
Olivier Prat
3fa2babec2 Moved cascade frustum pre-computation to single ShadowSetup job 2018-01-31 11:55:46 +01:00
Olivier Prat
f344e44d26 Switched to a simpler manual fixed/slope based shadow bias system. Automatic stuff fail most of the time 2018-01-31 10:19:17 +01:00
samcake
062bfbd7b6 Merging with master 2018-01-30 18:33:34 -08:00
samcake
f044cf76d6 add the count of compilations of shaders to avoid recompiling them if ot needed 2018-01-30 18:31:30 -08:00
samcake
63371ff59c Fix the android build 2018-01-30 17:17:22 -08:00
Anthony J. Thibault
ed67a5b408 Fix avatars with extra joints during mirrored animations 
When the avatar is rotated it will play a mirrored and non mirrored versions of the rotation animation.
The mirrored version would also mirror extra joints on the model, yielding unexpected results.
This refines the logic that determines which joints are NOT mirrored, so that extra joints
remain unaffected by the mirrored animation playback.
 2018-01-30 16:51:39 -08:00
Dante Ruiz
9c81909be5 restructures _dirtyFlags name and bits 2018-01-30 16:42:08 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
John Conklin II
215d03c4ce
Merge pull request #12269 from sethalves/backtrace-for-rc-63 
Backtrace for rc 63
 2018-01-30 15:13:01 -08:00
samcake
f078ff611a Refining the declaraion signatures and adding the binary capture 2018-01-30 15:10:52 -08:00
John Conklin II
eebbb7e563
Merge pull request #12276 from jherico/RC63_haze_hotfix 
RC63 Hotfix: Fix haze parameters uniform buffer size
 2018-01-30 15:04:07 -08:00
samcake
d5e52834ef cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation 2018-01-30 13:07:20 -08:00
ZappoMan
cd4b3b1a54 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-30 12:52:41 -08:00
samcake
2dcedf9f39 cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation 2018-01-30 12:52:05 -08:00
Atlante45
db08f1dda6 Move backtrace to interface 2018-01-30 11:39:48 -08:00
Anthony Thibault
b3798553ed
Merge pull request #12287 from Atlante45/fix/mac-builds 
Fix Mac dev builds
 2018-01-30 10:50:54 -08:00
Seth Alves
c146a231fa
Merge pull request #12284 from ctrlaltdavid/21717 
FBX reader fixes
 2018-01-30 10:49:02 -08:00
Anthony Thibault
1e8a5485c1 8x shader compilation optimization and watchdog disable 
addPlumberPipeline in RenderPipelines.cpp would recompile
a single program 7 more times then necessary.  This was
causing startup times on Mac OS X to trigger the deadlock
watchdog.

Even with this fix, compiling shaders is still too slow,
As a workaround, we disable the  watchdog thread during
rendering pipeline setup.
 2018-01-30 10:27:06 -08:00
Dante Ruiz
4c0a173287 trying another solution 2018-01-30 10:23:19 -08:00
Dante Ruiz
bed2ea052d better solution 2018-01-30 09:44:49 -08:00
Seth Alves
7d1eb5fef8 Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63 2018-01-30 09:13:02 -08:00
Dante Ruiz
eef2f656be Merge branch 'master' of github.com:highfidelity/hifi into fix-parenting-crash 2018-01-30 08:43:35 -08:00
Olivier Prat
5e6300ce46 Merged with master 2018-01-30 09:52:30 +01:00
David Rowe
280264d7ed Add location.domainID as a synonym for location.domainId 
And deprecate location.domainId.
 2018-01-30 20:46:27 +13:00
Atlante45
cb6bebd824 Fix Mac dev builds 2018-01-29 19:47:36 -08:00
David Rowe
cadd4e61ad Fix indent 2018-01-30 14:36:53 +13:00
David Rowe
09b92b93aa Handle geometric offsets in FBX mesh extents calculations 2018-01-30 14:36:34 +13:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
Seth Alves
98e0e663e7 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-29 12:36:37 -08:00
John Conklin II
e01bbcf10b
Merge pull request #12264 from sethalves/warn-for-head-position-nan 
print warnings if head position contains not-a-number
 2018-01-29 12:25:23 -08:00
samcake
1fd4c5c1a4 Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information 2018-01-29 12:20:51 -08:00
Atlante45
061f9ea359 Don't run settings preroutine when not initialized 2018-01-29 12:09:16 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
John Conklin II
92b9290294
Merge pull request #12267 from hyperlogic/bug-fix/rc63-neck-cauterization 
RC63: Bug fix for avatar neck cauterization
 2018-01-29 10:52:10 -08:00
samcake
04efaa0f92 Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch 2018-01-29 10:28:45 -08:00
Dante Ruiz
68fd9eafa8 fix entity parenting crash 2018-01-29 10:23:24 -08:00
Olivier Prat
0324f41565 Trying to improve adaptive shadow bias 2018-01-29 17:23:35 +01:00
Olivier Prat
70a7ecc5f0 Fixed merge with remote trnormalmap 2018-01-29 10:50:17 +01:00
Olivier Prat
4cbfef55ef Merged with master. Had to add back shaders and code 2018-01-29 10:33:16 +01:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
David Rowe
d334f1c35c Don't append trailing FBX root nodes to the tail of the tree 2018-01-29 13:45:39 +13:00
Brad Davis
206927d72a Fix haze parameters uniform buffer size 2018-01-27 12:05:29 -08:00
Brad Davis
08df262474 Fix haze parameters uniform buffer size 2018-01-27 11:42:17 -08:00
Sam Gateau
221475d7d9 FIxing the dark ambient lighting on scattering surface 2018-01-27 10:37:32 -08:00
Sam Gateau
3d9985fa67 FIx the scattering ambient lighting diffuse which was too dark (got divided by PI) comparedd to non scattering 2018-01-27 08:48:19 -08:00
Sam Gateau
e08e64b573 Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch 2018-01-26 19:43:07 -08:00
ZappoMan
efc63a41e9 make sure true results for delete actually work, add more examples 2018-01-26 18:49:55 -08:00
ZappoMan
b883d006c8 add flags to support asking for specific messages, update examples 2018-01-26 18:26:48 -08:00
ZappoMan
a3d86a0242 cleanup 2018-01-26 17:37:24 -08:00
samcake
8dfa3aace3 cleaning en route 2018-01-26 17:34:37 -08:00
ZappoMan
aa82ad8855 adjust client to only delete entities on server echo 2018-01-26 14:57:36 -08:00
Anthony J. Thibault
3be857567b updated Skinning.slh comment and constant. 
(cherry picked from commit 43eaa02ef0)
 2018-01-26 14:02:18 -08:00
Seth Alves
78a5f535c1 Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63 2018-01-26 12:09:38 -08:00
Seth Alves
d73538f233 oops 2018-01-26 12:08:19 -08:00
Seth Alves
b7303414f2 unmangle merges 2018-01-26 11:57:30 -08:00
Seth Alves
3be42fe79a Merge branch 'master' of github.com:highfidelity/hifi into warn-for-head-position-nan 2018-01-26 10:36:26 -08:00
Seth Alves
503175cd28 Merge branch 'RC63' of github.com:highfidelity/hifi into warn-for-head-position-nan-for-rc-63 2018-01-26 10:34:51 -08:00
Seth Alves
2962c8979c print warnings if head position contains not-a-number 2018-01-26 09:49:21 -08:00
Seth Alves
dbe9fd290e comment out code that would set annotations after StartHandler is called 2018-01-26 09:23:29 -08:00
Atlante45
df62ba88cb Fix rebase error 2018-01-26 09:22:37 -08:00
Seth Alves
c02ab28c60 fix clang build 2018-01-26 09:22:28 -08:00
Atlante45
39f26e35f0 backtrace for rc-63 2018-01-26 09:22:14 -08:00
Seth Alves
6c04431636 call startCrashhandler from interface 2018-01-26 09:20:29 -08:00
Atlante45
ced5aad1d1 backtrace for rc-63 2018-01-26 09:20:07 -08:00
Thijs Wenker
08b712281f Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 2018-01-26 18:10:47 +01:00
Olivier Prat
6b0b17ff63 Working on better adaptive bias algorithm for shadow 2018-01-26 17:57:20 +01:00
Sam Gateau
51dac04374 Introducing the tag in lieu of the vsisiblity mask 2018-01-26 02:59:43 -08:00
Sam Gateau
23b99f04cd Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch 2018-01-25 18:33:37 -08:00
Anthony J. Thibault
1ad65b8da5 Bug fix for twisted knees on some avatars. 
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix.  The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale.  If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity.  To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.

(cherry picked from commit 991ba7f195)
 2018-01-25 18:31:41 -08:00
Anthony J. Thibault
21c1e32490 Bug fix for avatar neck cauterization 
The basic dual-quaternion skinning algorithm does not handle non-rigid transformations like scale well.
Because we only use scaling for head cauterization, we special case this by passing in a cauterization factor,
as well as a cauterization position to the vertex shader.  If a vertex is flagged as cauterized, we slam it to equal the cauterization position.
Although, not as smooth as the previous method, it seems to work well enough on the avatar's I've tested.

(cherry picked from commit faf8350369)
 2018-01-25 17:47:39 -08:00
samcake
2f4e61888f Making it work maybe 2018-01-25 16:57:35 -08:00
SamGondelman
78d72a1703 remove unnecessary invokeMethod from ResourceCache::getResource 2018-01-25 16:07:26 -08:00
Dante Ruiz
3c12ed3b75 Merge branch 'master' of github.com:highfidelity/hifi into entity-joints 2018-01-25 16:03:15 -08:00
Seth Alves
b6f7d2eb89 print warnings if head position contains not-a-number 2018-01-25 15:15:59 -08:00
ZappoMan
aea16fe071 add delete filter support 2018-01-25 15:01:29 -08:00
Thijs Wenker
45487a1e45 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 
# Conflicts:
#	interface/CMakeLists.txt
 2018-01-25 22:51:35 +01:00
Thijs Wenker
ce50380698 fix JSAPI typo 2018-01-25 22:47:35 +01:00
ZappoMan
dc35ecf0c2 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-25 13:21:05 -08:00
Brad Davis
bde5282541 Fix loading of the render config JSON 2018-01-25 12:43:49 -08:00
Bradley Austin Davis
00538c69cd
Merge pull request #12257 from jherico/source_tree_qml 
Fix resource loading from source tree
 2018-01-25 12:29:24 -08:00
ZappoMan
c96e395a46 fix warning 2018-01-25 12:13:32 -08:00
ZappoMan
4497302a2b Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-25 11:39:56 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription 
some settings cleanup
 2018-01-25 11:30:14 -08:00
Brad Davis
3915a2d4ba Fix resource loading from source tree 2018-01-25 11:07:39 -08:00
ZappoMan
cb01bd14b9 Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription 2018-01-25 10:39:43 -08:00
John Conklin II
1865432b47
Merge pull request #12180 from Zvork/locallights 
Local lights on translucent objects
 2018-01-25 09:36:58 -08:00
Seth Alves
7c09b210c6
Merge pull request #12253 from hyperlogic/bug-fix/avatar-eye-offset 
Bug fix for incorrect positioned eyes on other peoples avatars
 2018-01-25 07:51:35 -08:00
Anthony J. Thibault
58d3d8ef3d Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.

(cherry picked from commit a252e90f96)
 2018-01-24 21:14:29 -08:00
Anthony J. Thibault
a252e90f96 Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.
 2018-01-24 18:58:08 -08:00
samcake
ae6a95ec0d fixing my bugs on vissibility 2018-01-24 18:07:35 -08:00
John Conklin II
049cf43de0
Merge pull request #12242 from hyperlogic/bug-fix/twisted-knees 
Bug fix for twisted knees on some avatars.
 2018-01-24 16:19:49 -08:00
John Conklin II
1529fea983 Revert "Display both lasers on tablet and Web surfaces" 
(cherry picked from commit 455090d2b9)
 2018-01-24 14:51:42 -08:00
humbletim
e8f0df4363 switch to bool per CR feedback 2018-01-24 14:28:22 -05:00
Dante Ruiz
b7ba7862aa give animGrapgh loader a high priority 2018-01-24 11:18:42 -08:00
humbletim
3ebf322fcf switch to foreach per CR feeddback 2018-01-24 14:13:34 -05:00
humbletim
63a226f999 make fromScriptValue logic easier to follow for CR; eliminate extra QByteArray conversion 2018-01-24 13:49:58 -05:00
MiladNazeri
3da8e5249c
Merge pull request #12226 from kencooke/audio-options-pitch 
Add "pitch" property to allow pitch shifting an audio effect
 2018-01-24 10:38:24 -08:00
humbletim
c2ee13931e changes per CR feedback; additional jsdoc 2018-01-24 13:38:10 -05:00
Olivier Prat
95882e0cde Merged with master 2018-01-24 10:51:54 +01:00
Olivier Prat
d0f2138e87 Merged with master 2018-01-24 10:00:41 +01:00
Olivier Prat
c92a9975ba Merged with master 2018-01-24 09:53:38 +01:00
Anthony J. Thibault
991ba7f195 Bug fix for twisted knees on some avatars. 
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix.  The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale.  If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity.  To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.
 2018-01-23 16:05:43 -08:00
Seth Alves
1cbc2e31cf merge from upstream 2018-01-23 15:21:03 -08:00
Sam Gateau
7fe4f8480a
Merge pull request #12172 from highfidelity/android 
Android updates
 2018-01-23 14:41:35 -08:00
humbletim
9fb20bee80 remove extra space 2018-01-23 15:13:53 -05:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
humbletim
76cbc4ee55 separate getAsset fail/then handlers 2018-01-23 14:47:49 -05:00
Olivier Prat
55abaf33fb Added shaders to support normal maps on translucent objects 2018-01-23 17:35:01 +01:00
Olivier Prat
24692f13fd Added separate scribe function to evalGlobalLightingAlphaBlendedWithHaze to shorten shader C string 2018-01-23 14:19:39 +01:00
Olivier Prat
8985514a31 Merge branch 'master' of http://github.com/highfidelity/hifi into locallights 2018-01-23 09:51:17 +01:00
humbletim
97889b30d5 remove unnecessary lambda capture 2018-01-23 03:21:19 -05:00
humbletim
3a735c1fc7 CR feedback and code cleanup 2018-01-23 03:12:26 -05:00
Anthony J. Thibault
5926384076 Take defaultPoseFlag section into account when computing byteArraySize. 
(cherry picked from commit c13c9f301c)
 2018-01-22 16:02:35 -08:00
Dante Ruiz
2d70e76546 fix merge conflict 2018-01-22 15:15:11 -08:00
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
Anthony J. Thibault
c13c9f301c Take defaultPoseFlag section into account when computing byteArraySize. 2018-01-22 14:57:09 -08:00
Thijs Wenker
e8955fcd32 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 2018-01-22 23:37:24 +01:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703 
Revert "Display both lasers on tablet and Web surfaces"
 2018-01-22 12:27:00 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar 
Fix for avatars with crooked spine/head when exiting HMD mode
 2018-01-22 11:50:44 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master 
Fix lockup when no midi devices present.
 2018-01-22 11:25:46 -08:00
Anthony J. Thibault
52f1803ea8 code review feedback 2018-01-22 09:55:39 -08:00
Olivier Prat
43f7bb5f56 Fixed compilation error due to really long shader 2018-01-22 16:50:03 +01:00
Seth Alves
f6b4cf4c60 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-22 07:13:41 -08:00
Olivier Prat
a807e41ff4 Merge branch 'master' of http://github.com/highfidelity/hifi into locallights 2018-01-22 16:05:54 +01:00
Seth Alves
45a00bebc0
Merge pull request #12217 from luiscuenca/sortOrderFix 
Fix sortOrder param on tablet buttons
 2018-01-21 10:40:25 -08:00
ZappoMan
4ad5d34a10 more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel 2018-01-20 17:20:42 -08:00
luiscuenca
b0f21c6931 sorter variable names 2018-01-20 07:09:16 -07:00
ZappoMan
027a1e69f4 some settings cleanup, adding description to Send Data 2018-01-20 00:08:06 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Bruce Brown
cbc8698e9a Fix Bitwise operators. 2018-01-19 16:59:47 -08:00
Ken Cooke
e2e4e7f423 Re-implement collision sound pitch shifting 2018-01-19 16:03:59 -08:00
Anthony J. Thibault
cd4d9255bd Added defaultPoseFlags to avatar protocol 
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation.  Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
 2018-01-19 15:34:27 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces" 2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703 
Display both lasers on tablet and Web surfaces
 2018-01-19 15:15:44 -08:00
Ken Cooke
a421ba7649 Add "pitch" parameter to scriptable audio injector options. 
Used in playSound() to pitch-shift the audio when injector is created.
 2018-01-19 14:50:51 -08:00
Brad Davis
d53b8b38ac Merge remote-tracking branch 'upstream/master' into android 2018-01-19 14:35:20 -08:00
Seth Alves
c622cd8293 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-19 13:39:16 -08:00
luiscuenca
41f3b792b6 Fix warnings 2018-01-19 14:34:52 -07:00
Bruce Brown
fab13a111c Remove accidental - 2018-01-19 13:10:34 -08:00
David Rowe
24dcc8788c Code review 2018-01-20 10:07:23 +13:00
John Conklin II
c366ed42ab
Merge pull request #12202 from amantley/urlbug 
added a property check in renderableModelEntity for the animation url…
 2018-01-19 12:52:43 -08:00
David Rowe
94e6a68d41 Code review 2018-01-20 09:50:24 +13:00
humbletim
395cc663dd reuse same disk cache as AssetClient 2018-01-19 15:10:36 -05:00
Bruce Brown
39e938ccc7
Removed Tabs & CR/LF 2018-01-19 11:52:09 -08:00
Seth Alves
9be2c67f00 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-19 11:46:34 -08:00
Brad Davis
e2c4af05bd Don't process empty images 2018-01-19 11:42:31 -08:00
Brad Davis
104dbabee9 Infinite loop guard 2018-01-19 11:42:13 -08:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109 
FB11109 Preview disabled image swap (Commerce only)
 2018-01-19 11:40:05 -08:00
Sam Gateau
9a8246f2b9
Merge pull request #12215 from Zvork/brdf 
Normalized diffuse & specular for directional, point and spot lights
 2018-01-19 11:08:29 -08:00
Seth Alves
63cd472fca
Merge pull request #12185 from AndrewMeadows/physics-shouldnt-set-dirty-flags 
fix race condition whereby physics may incorrectly overwrite script/network property change
 2018-01-19 11:06:22 -08:00
Brad Davis
d6f7b23b2d Merge remote-tracking branch 'upstream/master' into android 2018-01-19 10:37:41 -08:00
luiscuenca
27ea74f5bf Fix sortOrder param on tablet buttons 2018-01-19 11:22:37 -07:00
Thijs Wenker
0f7f58417b JS scripting console auto-complete 2018-01-19 19:11:12 +01:00
Sam Gateau
ce550b4fa6
Merge pull request #12209 from SamGondelman/textures 
Watch for attachment texture loading
 2018-01-19 10:08:04 -08:00
Seth Alves
bce9b5f459 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-19 09:53:54 -08:00
Seth Alves
6aa389cad0 trying to now show overlays in mirrors 2018-01-19 09:53:41 -08:00
Olivier Prat
12c48a38f7 Normalized diffuse & specular of directional, point and spot lights such as a light intensity of 1 gives a perpendicular diffuse lighting of the same color as the albedo for dielectric materials. 2018-01-19 13:58:35 +01:00
Bruce Brown
3004ee08e1
Fix lockup when no midi devices present. 2018-01-18 21:18:36 -08:00
David Rowe
fb684909ce Merge branch 'master' into 21703 2018-01-19 17:25:12 +13:00
humbletim
31cdd5cca2 QueuedConnection per CR feedback 2018-01-18 22:20:28 -05:00
David Rowe
e0e6fc711b Replace Pointers API function setNonHoverItems() with setDoesHover() 2018-01-19 16:05:09 +13:00
humbletim
dfb1619dc6 CR feedback; using namespace AssetUtils => inline AssetUtils:: 2018-01-18 21:49:53 -05:00
humbletim
d2a3a71f00 trying JS_VERIFY on for size (instead of JS_ASSERT) 2018-01-18 21:48:41 -05:00
Alexander Ivash
67e816756c make gcc happy 2018-01-19 01:51:41 +00:00
Andrew Meadows
75b5635d2f less word salad 2018-01-18 17:43:22 -08:00
Andrew Meadows
3d3bfcf7a3 check dirty flags when harvesting physics results 2018-01-18 17:43:22 -08:00
Brad Davis
bdfa1273ba Merge remote-tracking branch 'upstream/master' into android 2018-01-18 17:33:10 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702 
Add Window.protocolSignature() as a replacement for location.protocolVersion()
 2018-01-18 15:20:03 -08:00
ZappoMan
8364f64d4d Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-18 15:08:27 -08:00
ZappoMan
25f5eb6b4f named property example 2018-01-18 15:08:13 -08:00
Elisa Lupin-Jimenez
42b8c293d6
Merge pull request #12201 from elisa-lj11/qscriptvalue_macro_name 
Fixed typo in macro name
 2018-01-18 14:44:43 -08:00
Brad Hefta-Gaub
61a5750b09
Merge pull request #12204 from druiz17/fix-dynamic-entities-not-colliding 
Fix dynamic entities not colliding with avatar when a grab action is removed
 2018-01-18 14:39:21 -08:00
Clément Brisset
956f45b5af
Merge pull request #11932 from birarda/bug/baking-folder-number 
fix sparse rectification for small textures, export for same model at diff URL
 2018-01-18 14:25:33 -08:00
Seth Alves
31c007d167 more backwards logic, added withViewVisibilityMask call in ItemKey 2018-01-18 14:15:30 -08:00
Seth Alves
7c32d3c536 flip logic back around 2018-01-18 13:49:17 -08:00
Seth Alves
0ad4cdc41b works now 2018-01-18 13:15:47 -08:00
amantley
961ed88fb0 fixed coding standards in RenderableModelEntityItem.cpp 2018-01-18 12:56:24 -08:00
SamGondelman
c8aded0688 watch for attachment texture loading 2018-01-18 12:40:02 -08:00
Alexander Ivash
50217726c0 remove extra qualification from DesktopPreviewProvider::getInstance() in .h 2018-01-18 23:26:43 +03:00
Alexander Ivash
be3789e70a show warning on attempt to force 'VSYNC' preview reason 2018-01-18 23:26:43 +03:00
Alexander Ivash
576ae227a8 move imagePaths into .h so simplify matching enum values to image files 2018-01-18 23:26:43 +03:00
Alexander Ivash
744da710a3 move VSYNC into 'PreviewDisabledReasons' enum 2018-01-18 23:26:43 +03:00
Alexander Ivash
a74b093b60 FB11109 Preview disabled image swap (Commerce only) 2018-01-18 23:26:43 +03:00
amantley
1c97272767 Cleaned up the code a bit so that there is no need for a new class variable for properties to verify the change of url 2018-01-18 12:09:28 -08:00
David Rowe
8c2427dd58 Rename Window.protocolVersion() to Window.protocolSignature() 2018-01-19 09:06:16 +13:00
Atlante45
482ca3f038 Make type name hash static const 2018-01-18 10:28:43 -08:00
Seth Alves
fb974b0b9c attempt to straighten out use of view-visibility masks 2018-01-18 10:09:23 -08:00
Dante Ruiz
92f8f9d2c0
Merge pull request #12200 from sethalves/fix-avatar-entity-delete-deadlock 
avoid a deadlock when clearing avatar entities
 2018-01-18 10:07:07 -08:00
Olivier Prat
902bfac380 Merged with master 2018-01-18 18:31:04 +01:00
Seth Alves
1c819c8422 formatting 2018-01-18 09:12:37 -08:00