Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 23:13:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
72300 commits 71 branches 56 tags 1.2 GiB
Commit graph

72300 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
ea8e02a84a Fix and fill in JSDoc for MyAvatar flying-related functions 2018-10-05 14:05:33 +13: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
Dante Ruiz
613a6ab8cd removing unneeded code 2018-10-04 12:18:18 -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
Dante Ruiz
5734c24af4 another PR fix 2018-10-03 13:52:40 -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
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
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
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 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
John Conklin II
2cd9e565b0
Merge pull request #14101 from dback2/editHandlePickPlaneImprovements 
Edit handle pick plane improvements
 2018-10-02 10:42:46 -07:00
Gabriel Calero
13e2b99dfa Merge remote-tracking branch 'upstream/master' into android_signup 2018-10-02 09:24:09 -03:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
David Rowe
84a06fbe64 Don't immediately hide occlusion highlights after teleporting 2018-10-02 16:11:01 +13:00
David Rowe
2f3a9412f3 Make highlight occlusion match overlay occlusion 2018-10-02 15:36:18 +13:00
Anthony Thibault
b62ca2b75c Better configuration, i.e. which puck is associated with which limb. 
Previously we where incorrectly sorting the pucks along the x axis.
This could cause the order to be wrong if you were not standing along the z axis w.r.t the vive tracked volume.
 2018-10-01 18:43:19 -07:00
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack 
Remove UndoStack API
 2018-10-01 17:13:48 -07:00
John Conklin II
0ef407a45c
Merge pull request #14116 from sethalves/fix-bad-render-downcasts 
get asan to not complain about invalid downcasts during transaction.updateItem
 2018-10-01 16:57:03 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
John Conklin II
3bbc01477e
Merge pull request #14055 from davidkelly/dk/18147 
Do not have active buy button on invalidated items
 2018-10-01 16:50:53 -07:00
John Conklin II
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan 
fix several uninitialized reads
 2018-10-01 16:48:54 -07:00
John Conklin II
dd5cd5de82
Merge pull request #14091 from gcalero/fix-case-18465 
Fix case 18465: redirect to domain after login
 2018-10-01 16:48:27 -07:00
Brad Hefta-Gaub
e5d9c0d442
Merge pull request #14083 from sethalves/fix-recording-upload-crash 
call saveRecordingToAsset callback on correct thread
 2018-10-01 16:46:36 -07:00
Brad Hefta-Gaub
d8959367c6
Merge pull request #14104 from birarda/bug/zone-ordering 
fix for row re-ordering causing no change alone
 2018-10-01 16:45:50 -07:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2 
Account-managed wallet flow improvements
 2018-10-01 16:43:01 -07:00
John Conklin II
8ad5ca5a67
Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix 
Fix avatar warp into floor when navigating to a saved bookmark
 2018-10-01 16:36:31 -07:00
David Back
b5edf42fd0
Merge branch 'master' into editHandlePickPlaneImprovements 2018-10-01 16:36:30 -07:00
Gabriel Calero
1422c178a4 Merge remote-tracking branch 'upstream/master' into android_signup 2018-10-01 20:36:27 -03:00
John Conklin II
87b39f690c
Merge pull request #14106 from jherico/fix/mac_gl1 
Fix some Mac rendering issues
 2018-10-01 16:35:57 -07:00
Seth Alves
c144671c97
Merge pull request #14110 from sethalves/fix-clang-7-build 
get interface building and working with clang-7 on ubuntu 18
 2018-10-01 16:32:39 -07:00