Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 15:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73099 commits 25 branches 0 tags 1.1 GiB
Commit graph

29961 commits

Author SHA1 Message Date
sabrina-shanman
e15a41c839 Fix model being loaded before dimensions are initialized 2018-10-08 09:26:35 -07:00
sabrina-shanman
c8cccc5ec7 Fix "good" collision not subdividing OBJ meshes by group 2018-10-08 09:24:33 -07:00
Anthony Thibault
335c60e6b8 Reduce the glitches of far away animating avatars 
Currently, the avatars that are further then 10 meters away have a
very aggressive 15 degree rotation threshold, used to reduce the
amount of rotation joint changes sent over the network.

This PR tunes both the distances and rotation thresholds used for
this LOD culling.
 2018-10-05 17:29:25 -07:00
Stephen Birarda
82170a66ed avoid backwards seek for skipped trait deletes 2018-10-05 15:07:54 -07:00
Andrew Meadows
c3478dc018 remove expired avatarEntities from their avatars 2018-10-05 13:48:35 -07:00
Stephen Birarda
88f76ac760 suppress traits larger than INT16_MAX bytes 2018-10-05 09:46:55 -07:00
David Rowe
2ba8dc37d0 Miscellanous JSDoc fixes for issues noticed in passing 2018-10-05 16:57:29 +13: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
David Rowe
539c280281 Fill in missing JSDoc stubs in AvatarList and AvatarManager 2018-10-05 15:13:13 +13:00
Simon Walton
0ca112f7b9 Restore missing abs() to quaternion dot-product 
See https://github.com/highfidelity/hifi/pull/14138
 2018-10-04 16:40:44 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -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
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
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Wayne Chen
d6af09ca62 ignoring entities in interstitial/saving address on 404 error 2018-10-03 17:40:42 -07:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3 2018-10-03 17:14:15 -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
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
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
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -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
sam gateau
680f5f5703 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-02 15:25:19 -07: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
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 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
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
Sam Gateau
c95c736b1f FOUnd a working path for gl41 2018-10-01 22:50:29 -07:00
Sam Gateau
d1d4920c35 Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport 2018-10-01 21:35:18 -07: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
2f3a9412f3 Make highlight occlusion match overlay occlusion 2018-10-02 15:36:18 +13:00
Sam Gateau
c593f00839 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-01 19:10:18 -07:00
sam gateau
392e2ff535 trying and failing andad trying and rince and repeat 2018-10-01 17:45:16 -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
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan 
fix several uninitialized reads
 2018-10-01 16:48:54 -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
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
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit 
Simple avatar transit
 2018-10-01 16:24:46 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities 
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
 2018-10-01 16:16:48 -07:00
Wayne Chen
8f36bc0850
Merge pull request #4 from danteruiz/interstitialMerged 
Interstitial screen updates
 2018-10-01 15:43:04 -07:00
SamGondelman
1ec481922c don't render particles without textures 2018-10-01 14:54:34 -07:00
David Rowe
6ccd73ea47 Merge branch 'master' into M18586 2018-10-02 10:17:24 +13:00
SamGondelman
49553e0285 bake default skybox 2018-10-01 14:05:15 -07:00
Dante Ruiz
652ec2210d fixing loading issues 2018-10-01 13:58:14 -07:00
luiscuenca
f3c89dd9d7 Same mutex 2018-10-01 13:08:14 -07:00
luiscuenca
c1aa5e9308 Add mutex to setter 2018-10-01 12:54:47 -07:00
sam gateau
c12115bfda Addressing the 4.1 pass and make sure it works on windows pc and mac 2018-10-01 11:51:46 -07:00
luiscuenca
2c6003e40b Add mutex 2018-10-01 11:44:08 -07:00
SamGondelman
de90ce5f2b move stage frames to varyings 2018-10-01 11:26:02 -07:00
Clement
073b3ae57d Merge branch 'master' of github.com:highfidelity/hifi into feat/audio-mixer-throttle-equation 2018-10-01 10:50:28 -07:00
luiscuenca
5ccbc5c029 Disable Hand Touch when Leap Motion is running 2018-10-01 10:47:06 -07:00
Wayne Chen
5f05be554f check for hard refusal to 404 2018-10-01 10:06:13 -07:00
Dante Ruiz
31baa46ee0 merging from master 2018-10-01 09:44:54 -07:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
sabrina-shanman
0cf7e954cc Simplify a RayPick and StylusTip constructor 2018-10-01 09:20:59 -07:00
sam gateau
305ea80a18 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-01 08:37:19 -07:00
Sam Gateau
5842416ae6 Exploring the possible packing schemes and trying to debug the tangent 2018-09-30 23:11:36 -07:00
Seth Alves
90d9af35b5 minimize diff 2018-09-30 16:05:08 -07:00
Seth Alves
e30497595c static_cast can be used here rather than dynamic 2018-09-30 15:49:42 -07:00
Seth Alves
f784b33eed get asan to not complain about invalid downcast of EntityRenderer UpdateFunctor 2018-09-30 15:25:21 -07:00
Seth Alves
749b02cfb8 get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctor 2018-09-30 15:12:49 -07:00
amantley
bdd6befef9 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-09-29 15:39:36 -07:00
Simon Walton
4534b87ea0 Fix error passing rvalue ref as lvalue 2018-09-28 18:24:59 -07:00
Simon Walton
18c1371321 Process multiple avatars in an AvatarIdentity message 2018-09-28 17:53:06 -07:00
sam gateau
1ff4c54c1c Packing normal and tangents 2018-09-28 17:49:52 -07:00
John Conklin II
1135228b3b
Merge pull request #14095 from kencooke/audio-hrtf-reset 
Audio-mixer optimizations
 2018-09-28 16:34:38 -07:00
John Conklin II
11492ce8ee
Merge pull request #14045 from sethalves/enterEntity-wait-for-script 
don't call enterEntity before the entity's script is loaded
 2018-09-28 16:07:08 -07:00
Seth Alves
bbe9b5c26f code review, remove some unneeded automoc includes 2018-09-28 16:04:40 -07:00
Clement
585c278400 streamline mix operation 2018-09-28 15:45:56 -07:00
Ken Cooke
ac6dd57a30 HRTF starts in silent state 2018-09-28 15:00:52 -07:00
Ken Cooke
2dc89f81a5 Add HRTF reset() 2018-09-28 15:00:52 -07:00
Stephen Birarda
88fd42010d make sure the audio stream stats size is right 2018-09-28 14:54:50 -07:00
Stephen Birarda
dacf343e9a reduce codec mismatch and starve log spam 2018-09-28 14:54:50 -07:00
Stephen Birarda
7d8b15ed75 move valid position check to packet processing 2018-09-28 14:54:50 -07:00
Stephen Birarda
371de312cc enumerate a vector of mixable streams for each listener 2018-09-28 14:54:50 -07:00
Stephen Birarda
aed79b3b17 use a vector for ignored node IDs 2018-09-28 14:54:49 -07:00
Seth Alves
cb04894e33 try another way of fixing _spare warning 2018-09-28 14:53:05 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
John Conklin II
5d00aa0bdb
Merge pull request #14009 from sethalves/fix-worn-shape-double-scale 
fix scaling of worn shape entities
 2018-09-28 13:08:46 -07:00
Sam Gateau
faf489855c Packing the offsets and catching up performances 2018-09-28 02:13:08 -07:00
David Rowe
1c4bde3e84 Fix build warnings 2018-09-28 18:38:38 +12:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
Bradley Austin Davis
3dea4fd10a Fix some Mac rendering issues 2018-09-27 19:21:50 -07:00
Sam Gateau
97de12fcbc Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-09-27 19:01:55 -07:00
sabrina-shanman
bc861c1368 Make path pointers use scaleWithParent behind the scenes instead of scaleWithAvatar 2018-09-27 17:29:37 -07:00
sam gateau
eb97f0d193 Bringing back packed normal and tangents for static mesh! 2018-09-27 17:27:55 -07:00
sam gateau
215818e313 adjusting page size but still seeing a perf drop 2018-09-27 17:18:43 -07:00
amantley
52355e53f1 adding the menu item to the avatar app for the sit state. 2018-09-27 16:44:55 -07:00
Dante Ruiz
c1c853790b update soft entities and fix deadlock 2018-09-27 14:53:28 -07:00
sabrina-shanman
74937a1979 Serialize PickRay according to its variables 2018-09-27 14:41:38 -07:00
sabrina-shanman
c3df710396 Use bracket default initialization for PickQuery::_jointState 2018-09-27 14:34:36 -07:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-27 12:05:21 -07:00
sabrina-shanman
3ac9478101 Assign _mathPick in the Pick constructor 2018-09-27 11:30:57 -07:00
sam gateau
85b3b883f9 REmove cruft 2018-09-27 11:11:14 -07:00
Wayne Chen
9079c8a6b7 adding log for redirect cases 2018-09-27 10:42:21 -07:00
Wayne Chen
03d2fa2787 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-09-27 09:47:08 -07:00
Olivier Prat
9bc85b3e5d Fixed android build 2018-09-27 15:43:37 +02:00
Olivier Prat
9cd963af95 Added generateTextureMipsWithPipeline function in batch 2018-09-27 10:26:51 +02:00
Sam Gateau
8923055e91 Exploring the bad peroformances 2018-09-27 00:15:34 -07:00
Ken Cooke
9dc0aa5c8d HRTF starts in silent state 2018-09-26 18:23:26 -07:00
Ken Cooke
a8f7ff7d8a Add HRTF reset() 2018-09-26 18:18:20 -07:00
sam gateau
4078be3df5 Better naming and simpler template maybe 2018-09-26 17:58:06 -07:00
sam gateau
34203c67b0 Addressing the merge with master 2018-09-26 15:42:13 -07:00
John Conklin II
b02e2c8123
Merge pull request #14081 from SamGondelman/blendshapes 
Improve ModelBlender queuing
 2018-09-26 15:10:02 -07:00
Ryan Huffman
09b2565e76 Remove UndoStack API 
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
 2018-09-26 14:43:11 -07:00
Simon Walton
1e79329e83 Access joint data via C pointer instead of operator[] 
QVector::detach() was showing up in the linux profiles - it's
related to the copy-on-write capability. Const QVectors
don't use it though.
Also a bug fix for the minimum joint space needed.
 2018-09-26 14:23:52 -07:00
sam gateau
1e112d3c84 bringing back a bug fix from samuel 2018-09-26 14:15:42 -07:00
sam gateau
b5a47b2e76 Finalizing the renaming from Skinned to Deformed 2018-09-26 14:11:22 -07:00
Wayne Chen
db41a1c16b error state signal for 404/interstitial 2018-09-26 13:48:15 -07:00
sam gateau
09dae5aee3 Addressing merge conflict in HighlightEffect.cpp 2018-09-26 13:24:21 -07:00
John Conklin II
c1dc0ff2ec
Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only 
Prevent thread issues with PickResults modified by Pointers
 2018-09-26 12:12:58 -07:00
John Conklin II
6c47ba0dc7
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps 
Use C++ chrono system_clock for timestamps
 2018-09-26 11:22:49 -07:00
sabrina-shanman
4011660435 Merge branch 'master' into stt_parenting2 2018-09-26 10:17:45 -07:00
John Conklin II
0de433c7c7
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master 
fix for deadlock in other avatar entity removal from tree
 2018-09-26 09:58:26 -07:00
Simon Walton
13890f1d16 Use local ID in place of UUID in a couple more cases 2018-09-26 09:47:26 -07:00
Seth Alves
ff2a47e7e6 fix several uninitialized reads 2018-09-26 09:33:12 -07:00
David Rowe
b98bd741b8 Indent and reword jumping and flying checkbox 2018-09-26 18:14:02 +12:00
Wayne Chen
de5614500a Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements 2018-09-25 21:52:01 -07:00
John Conklin II
c5ff72bd20
Merge pull request #14024 from wayne-chen/toggle404Redirect 
Toggle going to 404 redirect domain
 2018-09-25 20:44:57 -07:00
Wayne Chen
e552b69f4c Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements 2018-09-25 20:27:31 -07:00
Wayne Chen
26b6967ba6 adding overlays to redirect domain 2018-09-25 18:16:18 -07:00
sam gateau
efa1dd0274 rename the files from skin to deformed 2018-09-25 17:32:04 -07:00
John Conklin II
3d71dfc467
Merge pull request #14072 from SamGondelman/highlight 
Fix avatar highlighting
 2018-09-25 16:13:14 -07:00
Seth Alves
87a67a3f0c call saveRecordingToAsset callback on correct thread 2018-09-25 15:50:47 -07:00
John Conklin II
19438d143e
Merge pull request #14073 from jherico/fix/18069_test 
Working on Vive shutdown issues
 2018-09-25 15:41:32 -07:00
Roxanne Skelly
cbb4bff2db Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-25 14:16:43 -07:00
sam gateau
cc0019479a fixing review comments 2018-09-25 14:07:07 -07:00
sam gateau
e41b8f06e1 Cleaning up the pipeline and checking that it is working for all cases 2018-09-25 13:57:50 -07:00
Thijs Wenker
80beb6c444 addressed CR feedback 2018-09-25 22:43:58 +02:00
Brad Davis
15de0590e8 Cleaning up commented out code 2018-09-25 13:18:49 -07:00
Brad Davis
5adc4c2290 Protect against null pointer usage in sound scripting wrapper 2018-09-25 13:17:49 -07:00
Simon Walton
91187ad7eb Merge remote-tracking branch 'origin/avatar-mixer-improvements' into avatar-mixer-improvements 2018-09-25 12:10:01 -07:00
Simon Walton
f95ab1b040 Clean-up & other small changes 2018-09-25 12:07:59 -07:00
SamGondelman
21cd3948ae improve blender queuing 2018-09-25 12:07:05 -07:00
sabrina-shanman
8dd36e465b Merge branch 'master' into crash_ray-pick-dtor_pointer-only 2018-09-25 09:22:30 -07:00
sabrina-shanman
eca31e7a99 Fix instantiating abstract class when creating visual pick result for pointers 2018-09-25 09:20:57 -07:00
Ryan Huffman
af897bdef2 Fix models with 1^3 dimensions never being resized 2018-09-25 09:13:59 -07:00
sam gateau
9f16024616 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-25 08:27:38 -07:00
luiscuenca
80daf35e77 Animation and particles clean up 2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0 API to configure animation and particle effect 2018-09-25 06:03:29 -07:00
David Rowe
af1b4fef5d Modify layout of rotation mode settings options 2018-09-25 18:03:57 +12:00
Sam Gateau
69734ce21b Getting better' 2018-09-24 22:34:43 -07:00
Simon Walton
07bdaeede7 Split avatar joint-data across multiple packets if necessary 2018-09-24 18:23:49 -07:00
sabrina-shanman
5dbebd4aae Add comment explaining why visualPickResult is a copy 2018-09-24 17:36:24 -07:00
sam gateau
7cf7eaa7c8 Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape 2018-09-24 17:34:42 -07:00
John Conklin II
be23d07621
Merge pull request #14010 from sethalves/thread-safe-settings 
make settings thread safe
 2018-09-24 17:24:50 -07:00
sabrina-shanman
7f189e4d10 Make visualPickResult used by Pointers a private copy 2018-09-24 17:15:56 -07:00
David Rowe
90ef109476 Remove superseded Pointers API functions 2018-09-25 11:11:53 +12:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Brad Davis
72fc686ec1 Fix timer managmement during shutdown 2018-09-24 14:52:13 -07:00
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity 
fix bug that caused localAngularVelocity to get zeroed out
 2018-09-24 14:32:57 -07:00
SamGondelman
ad73cb3996 fix avatar highlighting 2018-09-24 14:02:35 -07:00
Wayne Chen
ac5814a1f8 Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect 2018-09-24 13:57:23 -07:00
John Conklin II
a602bff217
Merge pull request #13981 from gcalero/android_settings 
Android settings (AEC)
 2018-09-24 13:55:30 -07:00
Roxanne Skelly
6f4c376d9f Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-24 13:45:24 -07:00
Simon Walton
d5977612a1
Merge branch 'master' into avatar-mixer-improvements 2018-09-24 13:29:45 -07:00
John Conklin II
45b206d748
Merge pull request #14065 from SamGondelman/blendshapeCrash 
Fix blendshape crash on avatar removal
 2018-09-24 12:39:52 -07:00
John Conklin II
d520152a95
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements 
Small Improvements to Anim Stats
 2018-09-24 11:56:01 -07:00
Simon Walton
82b81c9076 Limit no. of joints sent per avatar to prevent lock-up 
With this the avatar mixer will sent the full bit-vector
but only the first 111 actual joints.
 2018-09-24 11:54:03 -07:00
luiscuenca
012cd207b3 No data sent during basic transit 2018-09-24 11:39:10 -07:00
Stephen Birarda
b31837168d fix bad lock, optimize some operations, clarify comment 2018-09-24 11:27:20 -07:00
SamGondelman
d772cdb34a please 2018-09-24 10:16:35 -07:00
Sam Gateau
4210ce46aa bringing the tex corrd transform in the Material struct and shaving one ubo 2018-09-23 23:10:56 -07:00
David Rowe
e29b403abc Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/raypick/PointerScriptingInterface.cpp
#	interface/src/raypick/PointerScriptingInterface.h
#	interface/src/raypick/StylusPointer.h
#	libraries/pointers/src/Pointer.h
#	scripts/system/controllers/controllerModules/teleport.js
 2018-09-24 11:44:28 +12:00
Sam Gateau
b3112f898a Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-09-22 18:04:24 -07:00
luiscuenca
82b14b6e9b Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport 2018-09-22 05:47:05 -07:00
luiscuenca
01f87a0645 lerp myavatar 2018-09-22 05:34:17 -07:00
sam gateau
d8984dafa0 ui allows to enable/disable the deformer componenets 2018-09-21 16:45:21 -07:00
Seth Alves
86e502637e Make Settings thread safe 2018-09-21 15:46:35 -07:00
Roxanne Skelly
61cbee72af Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-21 12:31:36 -07:00
John Conklin II
428ace17e1
Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall 
Fixing double loginFailed
 2018-09-21 11:36:06 -07:00
Seth Alves
6eb3fa251d guard against null deref 2018-09-21 10:39:41 -07:00
Seth Alves
f6e57f54b0 don't call enterEntity until script preload has finished 2018-09-21 10:26:55 -07:00
Seth Alves
d5c0c05ab2 wait for an entity's script to load before adding it to the contain-avatar list. do this so the script doesn't miss the 'enterEntity' entity-method due to not being loaded. 2018-09-21 10:26:55 -07:00
John Conklin II
9c2a7931fb
Merge pull request #14036 from AndrewMeadows/crowd-update-tuning 
tweak avatar update priority coefficients for load tests
 2018-09-21 09:44:15 -07:00
sam gateau
aa02dcb087 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-21 08:19:50 -07:00
luiscuenca
a7a128f1f1 Particle effect and ease movement 2018-09-20 18:37:42 -07:00
Simon Walton
f2e69d5c81 Make default bubble-box AvatarData property for efficiency 
Also a use of getClientGlobalPosition(), etc
 2018-09-20 17:37:39 -07:00
sam gateau
d3ff4b8630 Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off 2018-09-20 17:26:26 -07:00
John Conklin II
0560b8678c
Merge pull request #14022 from jherico/fix/amd_highlight 
Fix AMD highlighting effect
 2018-09-20 16:17:10 -07:00