Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 10:25:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72402 commits 67 branches 56 tags 1.2 GiB
Commit graph

72402 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gabriel Calero
1719f4a474 Build libplugins_libhifiCodec.so 2018-10-05 23:49:06 -03:00
Brad Hefta-Gaub
4d4a67cba0
Merge pull request #14088 from roxanneskelly/sysTraySetup 
Sys tray setup
 2018-10-05 09:39:47 -07:00
Sam Gateau
46a50b04ea
Merge pull request #14034 from samcake/black-bis 
Refactor Deformed mesh rendering pipeline for better scalability and performances at runtime
 2018-10-04 20:41:28 -07:00
Roxanne Skelly
265bafecba More CR Fixes 2018-10-04 15:36:31 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates 
update soft entities and fix deadlock from qml.
 2018-10-04 13:33:34 -07:00
John Conklin II
84178faee3
Merge pull request #14137 from hyperlogic/bug-fix/glitchy-movement-for-avatars 
Bug fix for rotation culling in AvatarData::toByteArray()
 2018-10-04 13:12:28 -07:00
divya
7aa715c383
Merge pull request #14141 from luiscuenca/transitFirstPacketFix 
Fix avatars transit on domain enter
 2018-10-04 13:08:59 -07:00
John Conklin II
48242534df
Merge pull request #14000 from sabrina-shanman/stt_parenting2 
New Pick Parenting for Ray Picks and Parabola Picks
 2018-10-04 12:39:45 -07:00
Roxanne Skelly
f74d9ada20 Code review fix 2018-10-04 12:38:34 -07:00
Dante Ruiz
613a6ab8cd removing unneeded code 2018-10-04 12:18:18 -07:00
sam gateau
ddbaa96fd1 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-10-04 11:49:36 -07:00
sam gateau
8a05cc2ede FIx the bad world position evaluation in the new all in one call 2018-10-04 11:49:11 -07:00
Roxanne Skelly
442171e007 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTraySetup 2018-10-04 11:33:39 -07:00
Roxanne Skelly
ee3fd81070 Code review fixes from birarda 2018-10-04 11:33:01 -07:00
luiscuenca
a05e493e06 Long distance avatars should not be new 2018-10-03 17:09:51 -07:00
luiscuenca
bb98457d09 Fix avatars transit on domain enter 2018-10-03 16:23:09 -07:00
Dante Ruiz
676293c880 trying another fix 2018-10-03 16:19:47 -07:00
Sam
87efeb1a70 make sure that we compile, dah 2018-10-03 16:15:07 -07:00
sam gateau
81e0d5ced0 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-10-03 16:03:33 -07:00
sam gateau
702d26d2bd Addressing the bug on Mac AMD 2018-10-03 16:03:09 -07:00
Roxanne Skelly
397fe2a534 Code Review Fixes 2018-10-03 13:53:46 -07:00
Dante Ruiz
5734c24af4 another PR fix 2018-10-03 13:52:40 -07:00
Sam Gateau
b1883ac1c4 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-03 13:43:48 -07:00
John Conklin II
4d7b2bb429
Merge pull request #14113 from Atlante45/feat/audio-mixer-throttle-equation 
Audio Mixer Scaling
 2018-10-03 13:17:28 -07:00
Anthony Thibault
c0ae95f853 Bug fix for rotation culling in AvatarData::toByteArray() 
The commit 5a0de0f103 inadvertently introduced a regression in how the AvatarMixer and clients encode AvatarData packets.
When encoding packets that with the cullSmallChanges flag set to true, we only include rotations that have changed significantly from the previous packet.
A bug was introduced that incorrectly preformed the comparison to detect changed rotations, this needs to handle the case when
two quaternions are almost equal but have negative signs.  Previously, this was preformed with an absolute value after the 4-component dot product.
In commit 5a0de0f103, this absolute value was removed, causing the culling to happen much more frequently.

This PR re-introduces that absolute value.
 2018-10-03 12:54:49 -07:00
Sam Gateau
c194e795ac Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-03 12:12:15 -07:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586 
Teleport with play area
 2018-10-03 11:02:33 -07:00
John Conklin II
9a614d7523
Merge pull request #13977 from dback2/newEntityListView 
New optimized entity list view
 2018-10-03 09:23:11 -07:00
John Conklin II
05609384b7
Merge pull request #14111 from zfox23/newConnectionsQuery 
Fix MS18608: Use new connections api endpoint
 2018-10-03 09:04:58 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -07:00
Brad Hefta-Gaub
bb78a8dd5c
Merge pull request #14134 from jherico/fix/fb19088 
Fix avatar thumbnails
 2018-10-03 09:01:33 -07:00
sam gateau
da6e399161 INtroduce a safe destruction of the TBO defined when using a gpu::Buffer as REsourceBuffer in gl41 backend 2018-10-02 17:15:07 -07:00
Brad Davis
ffbb144a7c Fix avatar thumbnails 2018-10-02 16:31:24 -07:00
Brad Hefta-Gaub
6b9842d4da
Merge pull request #14131 from Atlante45/feat/deadlock-backtrace 
Better deadlock crash
 2018-10-02 16:03:20 -07:00
sam gateau
680f5f5703 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-02 15:25:19 -07:00
David Rowe
2bdd8bfdc7 Update play area and sensor overlay models and raise a little 2018-10-03 11:09:04 +13:00
John Conklin II
658c74a1c6
Merge pull request #14080 from huffman/fix/111-models-not-being-resized 
Fix models with 1^3 dimensions never being resized
 2018-10-02 14:11:45 -07:00
David Rowe
488599dbb0 Update teleport play area FBX model to be visible from below 2018-10-03 09:31:11 +13:00
David Rowe
c0231057f8 Revert foot calc scaling change 2018-10-03 09:28:19 +13:00
sam gateau
5d0f2e3035 And more changes for better syntax and less useless stuff 2018-10-02 13:09:04 -07:00
sam gateau
e5df356774 Fixing warnings from jenkins 2018-10-02 12:38:14 -07:00
Sam Gondelman
cd947f0a66
Merge pull request #14054 from gcalero/android_signup 
Android signup
 2018-10-02 12:37:57 -07:00
Clement
3c4e543b3c Better deadlock crash 2018-10-02 11:51:15 -07:00
John Conklin II
898ba20f1c
Merge pull request #14068 from hyperlogic/bug-fix/bad-avatar-pointer-static-cast 
Fix for bad static_pointer_cast on exit.
 2018-10-02 11:31:47 -07:00
Dante Ruiz
182c92b951 fix mac issue 2018-10-02 11:24:09 -07:00
John Conklin II
27f75abb3f
Merge pull request #14076 from hyperlogic/bug-fix/better-hands-and-feet-calibration 
Bug fix for Vive puck calibration of hands and feet
 2018-10-02 11:20:12 -07:00
sam gateau
ff24a99032 Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform 2018-10-02 11:18:20 -07:00
John Conklin II
2cd9e565b0
Merge pull request #14101 from dback2/editHandlePickPlaneImprovements 
Edit handle pick plane improvements
 2018-10-02 10:42:46 -07:00
Roxanne Skelly
35f662d767 Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTraySetup 2018-10-02 10:02:40 -07:00