Commit graph

3326 commits

Author SHA1 Message Date
ZappoMan
f1bd06cfa0 cleanup some unneeded class 2017-05-12 18:33:28 -07:00
ZappoMan
89b6a79f68 make sure to exit early if box intersection is already larger than best triangle intersection 2017-05-12 17:56:45 -07:00
ZappoMan
eb3b27849c only keep one copy of Triangles 2017-05-12 17:07:47 -07:00
ZappoMan
ea8330e4e3 Merge branch 'master' of https://github.com/highfidelity/hifi into TriangleSetOptimizations 2017-05-12 13:00:14 -07:00
Brad Hefta-Gaub
a88f72024d Merge pull request #10243 from birarda/bake-textures
Add an internal tool for domain/model/skybox KTX texture baking
2017-05-12 12:26:33 -07:00
Clément Brisset
1658ced671 Merge pull request #10437 from Atlante45/feat/faster-startup
Use baked default skybox
2017-05-12 11:35:51 -07:00
Seth Alves
4aa683363c back out previous changes, do compressionOptions.setPitchAlignment(4) instead 2017-05-11 16:22:12 -07:00
Atlante45
6378b96b4c CR 2017-05-11 14:41:02 -07:00
Seth Alves
ac2bc39a27 try, try again 2017-05-11 14:10:03 -07:00
Seth Alves
a26f9c7887 make _size const 2017-05-11 13:36:05 -07:00
Atlante45
e0863aa50f Only open files for write if necessary 2017-05-11 11:54:52 -07:00
Seth Alves
dfb9fecf17 pad MemoryStorage size to multiple of 4 rather than using a vector of uint32_t -- this gets the same alignment without needs casts 2017-05-11 07:11:40 -07:00
Seth Alves
c9868640c1 force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D 2017-05-10 18:14:50 -07:00
ZappoMan
a15c5999b5 first cut at octree storage of Triangle Set 2017-05-10 16:58:51 -07:00
trent
a3545661dc Merged hifi/master into this PR and resolved merge conflicts. 2017-05-09 15:09:53 -04:00
Andrew Meadows
2835a73c6b Merge pull request #10071 from AndrewMeadows/walk-up-steps
avatar can walk up steps
2017-05-08 18:17:16 -07:00
Andrew Meadows
a31a861e19 fix typo: physcis --> physics 2017-05-05 09:33:50 -07:00
Seth Alves
92966377fb Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 19:05:57 -07:00
Seth Alves
51cb579773 function to turn nestable-type into a string 2017-05-04 19:05:01 -07:00
Seth Alves
960bab6e4e Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 16:42:57 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Seth Alves
69944cc76d add a way to get a SpatiallyNestable's name without knowing what its type is 2017-05-03 21:32:49 -07:00
trent
557a8fffd7 Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D 2017-05-02 19:56:47 -04:00
Brad Davis
425405f72d Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
Anthony J. Thibault
2120e63e3a Merge branch 'master' into feature/head-standard-action 2017-04-27 17:51:13 -07:00
Andrew Meadows
75b563d598 restore rendering of avatar receive stats 2017-04-27 13:16:50 -07:00
Andrew Meadows
442080dec7 remove unused RenderArgs::_cameraMode hack 2017-04-27 13:16:50 -07:00
Stephen Birarda
49e7ae6dbc call image library for texture baking 2017-04-26 18:37:35 -07:00
Stephen Birarda
425385d982 leverage settings to remember paths used before 2017-04-26 18:37:35 -07:00
Ryan Huffman
60ba874e2e Fix implementation of mutableData in non-File Storage classes 2017-04-26 18:02:23 -07:00
Ryan Huffman
8d03d50d35 Cleanup progressive ktx debugging 2017-04-26 10:48:57 -07:00
Ryan Huffman
20f4d14e07 Add compressed KTX size evaluation 2017-04-26 10:48:23 -07:00
Ryan Huffman
b20fcbfcdb Add a way to write data to a storage object 2017-04-26 10:45:50 -07:00
Ryan Huffman
00cbfa0f70 Add start of progressive ktx-loading 2017-04-26 10:45:50 -07:00
Anthony J. Thibault
dc19f37726 input/controller routing thru skeleton model and rig. 2017-04-25 15:04:47 -07:00
Andrew Meadows
5a458c9923 remove last qApp usage from Avatar class 2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c remove Camera argument from Avatar::render() 2017-04-18 11:52:21 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Andrew Meadows
e64e2614e3 Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter
Kinect hand filter
2017-04-12 14:27:05 -07:00
Al Bernstein
c628b23895 removed whitespace 2017-04-06 17:21:58 -07:00
Al Bernstein
e737456dcd used thread safe moving average for the quaternions 2017-04-06 16:56:03 -07:00
Al Bernstein
de1fdfacca made requested changes in PR10147 2017-04-06 16:18:40 -07:00
samcake
5629cf425e Cleaning up the files updated 2017-04-05 13:49:07 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Stephen Birarda
c7a28a527a cleanup Agent recording handling, make loadRecording async 2017-04-04 10:56:25 -07:00
David Rowe
405e8cfc9e Fix typo noticed in passing 2017-04-02 12:58:24 +12:00
Seth Alves
4516ddf855 Merge pull request #9847 from highfidelity/tablet-ui
Tablet ui
2017-03-28 14:48:02 -07:00
Seth Alves
1cf6945bf2 pass radials argument to AABox::touchesAAEllipsoid as const reference 2017-03-28 11:12:00 -07:00
Seth Alves
9789476a73 handle case where AAEllipsoid is entirely inside the AABox 2017-03-28 10:57:03 -07:00
Seth Alves
9e675d4c93 Merge pull request #9990 from hyperlogic/bug-fix/sliders
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Seth Alves
59da607d07 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-24 15:08:23 -07:00
Seth Alves
8f7f5efade new javascript call: Model.newMesh() 2017-03-24 12:51:00 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay.
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
2017-03-23 13:54:18 -07:00
Seth Alves
f5680def55 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-23 09:55:41 -07:00
Seth Alves
ff3fc244d1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:53 -07:00
Seth Alves
df875ab504 make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches 2017-03-22 16:21:45 -07:00
Triplelexx
b7980569cc change all references of IDENTITY_FRONT to IDENTITY_FORWARD 2017-03-21 22:13:33 +00:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Brad Davis
14c8c3f4db Return existing textures when matching hash for a previously found live texture 2017-03-20 09:39:29 -07:00
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3
CR 21114 -- Implement modules/require support into hifi
2017-03-20 06:22:35 -07:00
Seth Alves
424af2255b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-19 21:17:30 -08:00
humbletim
758c07c7d4 Merge branch 'master' into 21114-part3 2017-03-16 14:29:17 -04:00
humbletim
366c90ef6a add Q_ASSERT to IS_THREADSAFE_INVOCATION 2017-03-16 01:28:50 -04:00
samcake
0399249a03 Expeand the wireframe to the primitive entities and the polyvox 2017-03-15 16:58:31 -07:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
Brad Davis
eab91d061d Merge pull request #9868 from zzmp/ktx/local-not-roaming
Use Local for WIN32 FileCache
2017-03-13 15:52:11 -07:00
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
Andrew Meadows
546f32431d Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
Various noise gate, scope, and audio stats improvements
2017-03-13 11:52:16 -07:00
Brad Hefta-Gaub
a38965d628 add more audio stats 2017-03-11 09:50:30 -08:00
Brad Davis
399270d243 Still trying to fix OSX build 2017-03-08 09:03:59 -08:00
Bradley Austin Davis
62fcd238ae Fix shared pointer usage in storage abstraction 2017-03-08 09:03:58 -08:00
Brad Davis
e94f803b84 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-08 09:03:21 -08:00
Seth Alves
509ce3f2d2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 18:41:36 -08:00
Brad Hefta-Gaub
8ae6f2727d add support for double click messages to overlays and entities 2017-03-07 17:52:55 -08:00
Seth Alves
71c2b4215d Merge pull request #9811 from ZappoMan/triangleSet
Cleanup how Models do ray-picking and determination of point inside of convex hull
2017-03-07 14:12:56 -08:00
humbletim
40ba8185a0 * Update per 21114-part2 changes.
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
2017-03-07 16:36:07 -05:00
humbletim
9b09651337 Move BaseScriptEngine from script-engine to shared. 2017-03-07 16:34:24 -05:00
Ryan Huffman
a744e0d11c Merge pull request #9685 from humbletim/21114-part2
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
2017-03-07 13:25:25 -08:00
Brad Hefta-Gaub
f7e824e47c Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-07 12:18:36 -08:00
Seth Alves
b938579598 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 11:42:44 -08:00
Brad Hefta-Gaub
87934ee82d fix bugs in some meshes 2017-03-06 21:50:32 -08:00
Brad Davis
8782fe1d93 Merge branch 'master' into smarter_textures
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
2017-03-06 15:29:41 -08:00
Andrew Meadows
10b3e7fc67 sphere shapeType for models means 'sphere' 2017-03-06 15:14:51 -08:00
Brad Hefta-Gaub
f27475613f Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-06 12:53:59 -08:00
ZappoMan
faba160331 more CR feedback 2017-03-06 11:10:04 -08:00
ZappoMan
af97e9bdd9 CR feedback 2017-03-06 10:49:38 -08:00
Seth Alves
93246b24b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-06 08:54:49 -08:00
ZappoMan
87bcced409 cleanup use of triangleSet for picking 2017-03-05 19:23:55 -08:00
Ken Cooke
0bababf1f5 Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128 2017-03-04 14:53:07 -08:00
ZappoMan
9908723bb9 fist cut at basic TriangleSet class 2017-03-03 22:27:38 -08:00
Anthony J. Thibault
bc256f3e8f Fix for multi-threaded access to maps in DebugDraw. 2017-03-02 14:42:06 -08:00
Seth Alves
cf37845f9e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-02 10:06:38 -08:00
Bradley Austin Davis
fa5b315e09 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-01 15:16:18 -08:00
Anthony J. Thibault
01abb4bdb6 Exposed DebugDraw interface to Java Script 2017-03-01 13:14:29 -08:00
Seth Alves
88c850afa2 voxel-paint paints with capsules rather than spheres 2017-02-26 12:56:17 -08:00
samcake
e8835b34f4 fix issues while testing the ktxStorage 2017-02-22 19:05:20 -08:00
samcake
262d7c3b79 Merging with upstream smarter_textures and Austin's pr 2017-02-22 17:54:38 -08:00
Brad Davis
c6b72dfe3c Make memory storage mutable 2017-02-22 13:29:08 -08:00
Seth Alves
a6b4f07674 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-22 12:07:31 -08:00
samcake
6938948501 Merge branch 'master' of https://github.com/highfidelity/hifi into texmex 2017-02-22 12:00:11 -08:00
Seth Alves
84b93826d0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-22 09:30:16 -08:00
Brad Hefta-Gaub
a526db1779 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-21 14:18:36 -08:00
Brad Davis
27e8750b9b Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
Brad Davis
285222d490 Add view storage 2017-02-17 12:49:55 -08:00
Brad Davis
d1b91cb436 Adding abstracted storage for in-memory or file backed data 2017-02-17 10:13:08 -08:00
Stephen Birarda
78301fd947 call getParentPointer when parent ID changes to update children 2017-02-16 16:46:09 -08:00
Seth Alves
21b0e45b0f don't show keyboard in edit.js unless HMD is being worn 2017-02-16 09:56:50 -08:00
humbletim
b15956278c separate out supporting changes into 21114-part2 branch 2017-02-16 07:40:19 -05:00
Brad Hefta-Gaub
faa8e629a0 checkpoint 2017-02-15 20:28:32 -08:00
Seth Alves
1038e97c7f fix windows build 2017-02-15 11:14:23 -08:00
Seth Alves
792c7ff51f PointerEvent will now relay keyboard modifiers 2017-02-15 10:41:56 -08:00
Seth Alves
bc5f563f57 make _parentID and _parentJointIndex private to avoid accidental direct access 2017-02-12 11:37:29 -08:00
Atlante45
2962dd6dc2 Factor LogDialog 2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
74f10a1e7f Merge pull request #9603 from huffman/feat/trace-thread-script
Add thread names and scripts to chrome traces
2017-02-09 13:00:05 -08:00
Andrew Meadows
a871613f84 make Settings::remove() work for groups 2017-02-08 11:49:40 -08:00
Anthony Thibault
caefb6c711 Merge pull request #9620 from hyperlogic/bug-fix/find-entity-bug
Fix for findEntities not returning some entities that are within range.
2017-02-06 20:22:34 -08:00
Anthony J. Thibault
a14dcbd513 Fix for findEntities not returning some entities that are within range.
This bug has been around a long time... introduced by commit 39ed7f7b in 2014.
This became apparent to me when testing the tablet-ui, there was a case where the
hand styluses were not appearing when close to a web entity.  Because findEntities
is such a fundamental feature used by handControllerGrab, this fix should make all
grabbing feel more consistent and predictable.

I added a unit test that reproduces the issue.
2017-02-06 15:13:25 -08:00
Seth Alves
ad83f20199 make findAncestorOfType understand AVATAR_SELF_ID 2017-02-03 16:43:36 -08:00
Seth Alves
c7200d2d3a make hasAncestorOfType understand AVATAR_SELF_ID 2017-02-03 16:14:15 -08:00
Ryan Huffman
55df6f8f76 Add tracing to ScriptEngine and EntitiesScriptingInterface 2017-02-03 09:45:33 -08:00
Ryan Huffman
a5e61184bf Add support for adding thread names to a trace 2017-02-03 09:18:51 -08:00
Brad Hefta-Gaub
3bbb57599b Merge pull request #9565 from kencooke/cpudetect-gcc-bugfix
Fix bug that causes GCC not to detect AVX2
2017-01-31 11:11:35 -08:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue
Adding support for disabling texturing from the material
2017-01-31 10:39:44 -08:00
Seth Alves
7c2957cfa7 merge from upstream 2017-01-31 08:57:36 -08:00
Ken Cooke
2ce357db3a Fix bug that causes GCC not to detect AVX2 2017-01-30 17:11:48 -08:00
samcake
3c56bd2960 Adding support for disabling texturing from the material 2017-01-30 15:03:04 -08:00
Andrew Meadows
8cf7aee009 fix bug: second collision event with bad data 2017-01-30 13:21:23 -08:00
Seth Alves
fa61bbe2a6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 18:21:39 -08:00
ZappoMan
4c80422a73 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 14:34:58 -08:00
Seth Alves
db38503d57 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 13:48:59 -08:00
samcake
19858bda78 Merge pull request #9493 from AndrewMeadows/otherAvatars
optimize, prioritize, and timebox processing of avatar updates
2017-01-26 13:30:51 -08:00
Seth Alves
0b51b1d566 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub
0c9e42e2d9 Merge pull request #9486 from huffman/fix/overlay-parent-reg-point
Fix Overlay-as-child of model entity with reg point
2017-01-26 10:59:01 -08:00
Andrew Meadows
d8a10320d1 fix warning about implicit cast 2017-01-26 08:35:25 -08:00
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
ZappoMan
cb812ca506 CR feedback 2017-01-24 12:06:31 -08:00
Ryan Huffman
f0f5f8871c Fix Overlay-as-child of model entity with reg point
This fixes as issue where when you set the parent of an overlay to be a
model entity with a non-(0.5, 0.5, 0.5) registration point, the overlay would
still be positioned relative to the center of the model. The issue is
that the default parent joint index was 0, which is the center of the
model.

Entities had a default parent joint index of -1 (technically 65535
because it is a uint16). Avatars previously defaulted to 0, and that is
maintained here.
2017-01-23 16:08:01 -08:00
ZappoMan
6801099cd9 more cleanup 2017-01-23 16:03:07 -08:00
ZappoMan
29fff2e556 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-23 13:09:59 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
Stephen Birarda
5c5c69fff3 setup the repeated message flusher on LogHandler thread 2017-01-20 11:20:48 -08:00
Andrew Meadows
10cdea9cd8 cleanup model fade logic 2017-01-19 14:17:50 -08:00
Seth Alves
b57803057d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 06:38:44 -08:00
Brad Davis
a593a2116a Removing magic numbers 2017-01-17 18:15:40 -08:00
Brad Davis
cbc89e77ab Consume fewer resources in AssetServer when interface is running locally 2017-01-17 18:15:39 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
Stephen Birarda
1993e358d6 Merge pull request #9318 from birarda/ovr-platform-entitlement
handle OVR Platform entitlement checks
2017-01-16 11:16:31 -08:00
ZappoMan
fe06dfdca7 tweak audioLoudness packing 2017-01-11 18:58:43 -08:00
ZappoMan
0661531e3a try another version of an 8bit audio loudness 2017-01-11 17:51:12 -08:00
ZappoMan
5b76eaaf52 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-11 10:22:14 -08:00
Seth Alves
bacc796730 Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again 2017-01-11 09:54:26 -08:00
Brad Davis
1dd2747ef9 Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking. 2017-01-10 10:44:04 -08:00
Seth Alves
eb4a2b0af5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-10 09:13:34 -08:00
Seth Alves
4a29cce584 adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled 2017-01-10 06:17:40 -08:00
samcake
8c7ec8b0c5 Add profiling in COntext batch execution and shortcuts for trace names 2017-01-09 18:05:02 -08:00
Seth Alves
45a26d599f if something is a child of the local avatar, never let it collide with MY_AVATAR 2017-01-09 16:40:28 -08:00
ZappoMan
636ade9eb7 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 11:29:54 -08:00
Ryan Huffman
39070fe0d1 Merge pull request #9065 from huffman/fix/script-engine-abuse
Fix deleteLater() vulnerability in scripts
2017-01-09 11:02:28 -08:00
Chris Collins
30d5f70e11 Merge pull request #9278 from jherico/cpu_opt_scene
More low level optimizations
2017-01-09 10:10:40 -08:00
Stephen Birarda
46086cdcce set the OCULUS_STORE property with oculus store arg 2017-01-05 14:02:35 -08:00
Brad Hefta-Gaub
5242375215 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-05 08:57:10 -08:00
Brad Hefta-Gaub
825fc1cfa1 Merge pull request #9309 from kencooke/audio-hdr-volume
High Dynamic Range Audio injectors
2017-01-05 08:10:54 -08:00
Brad Hefta-Gaub
acca9dbe87 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
2017-01-04 18:07:22 -08:00
Ken Cooke
afacb59999 Use logarithmic quantization of injector "volume" over the wire.
Allow gains > 1.0 (up to +30dB)
Better quantization at low levels (uniform steps in dB)
2017-01-04 15:38:26 -08:00
Atlante45
56a25dfdee Check setting value changed 2017-01-04 11:56:24 -08:00
Ryan Huffman
601aa51392 Merge branch 'master' into fix/script-engine-abuse 2017-01-04 08:09:06 -08:00
Brad Hefta-Gaub
60d48bcd49 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-03 14:42:59 -08:00
Brad Hefta-Gaub
84eca0159e Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval
Conflicts:
	tests/networking/src/ResourceTests.cpp
2016-12-29 16:42:52 -08:00
Brad Hefta-Gaub
a72f60152b audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate 2016-12-29 08:53:37 -08:00
Andrew Meadows
be0ca41eb3 make implicit cast explicit 2016-12-28 18:27:34 -08:00
Brad Davis
694c8b5690 Further reduce cost of Duration class when tracing is inactive 2016-12-28 12:37:47 -08:00
Brad Davis
d2179b1acf Reduce tracing impact if tracing isn't active 2016-12-28 12:11:26 -08:00
Brad Hefta-Gaub
73bfc069da more work on only sending changes 2016-12-27 17:19:55 -08:00
Brad Davis
901c020aae Optimizations, SIMD and const correctness 2016-12-27 15:39:38 -08:00
Seth Alves
1cb330057e fix a crash and a memory leak in vhacd-util 2016-12-23 13:05:57 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
2016-12-20 16:25:12 -08:00
Brad Hefta-Gaub
c2320d317c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 2016-12-20 14:34:57 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Brad Davis
9b0d0b3e7a Updates to tracing, removing log spam 2016-12-19 15:12:48 -08:00
Brad Davis
2d73588361 Fix stat tracker missing in agents 2016-12-16 17:34:00 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Brad Davis
a12b8b4b62 Cleanup dead code 2016-12-16 09:21:41 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Brad Hefta-Gaub
8497ad1e29 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-15 16:42:41 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
Brad Hefta-Gaub
7189f766a2 more hacking 2016-12-13 20:56:41 -08:00
Brad Hefta-Gaub
a7750501c6 first cut at adding view frustum support to avatar mixer 2016-12-13 18:58:11 -08:00
samcake
9155f11b3d Merge pull request #9190 from jherico/test_mode
Add test mode to interface
2016-12-12 15:37:05 -08:00
Brad Davis
2a43f5fbef Add test mode to interface 2016-12-12 14:51:11 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142)
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Bradley Austin Davis
3fcd45a236 Optimized method for transforming axis aligned bounding boxes 2016-12-08 10:59:14 -08:00
Brad Hefta-Gaub
b97012fc97 Merge pull request #9137 from jherico/msvc2015
Fixes for building on MSVC 2015 / Qt 5.8
2016-12-06 10:25:16 -08:00
Anthony J. Thibault
89ae3b3d6e Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
This reverts commit efe9571ab8, reversing
changes made to 333e9ec7f4.
2016-12-05 15:18:03 -08:00
Brad Davis
5cbf7588ac Fixes for building on MSVC 2015 / Qt 5.8 2016-12-02 14:58:09 -08:00