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
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
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
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
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
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
825fc1cfa1
Merge pull request #9309 from kencooke/audio-hdr-volume
...
High Dynamic Range Audio injectors
2017-01-05 08:10:54 -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
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 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
