Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 16:08:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49580 commits 25 branches 0 tags 1.1 GiB
Commit graph

5577 commits

Author SHA1 Message Date
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -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
Atlante45
f79c6e08f5 Track dropped frames as reported by the Oculus SDK 2016-12-28 14:18:23 -08:00
Andrew Meadows
2209c0ebba remove debug hook for dumping stats to logs 2016-12-21 10:55:59 -08:00
Andrew Meadows
8ab6974233 optimizations for processing avatar joint data 2016-12-21 10:55:59 -08:00
Brad Hefta-Gaub
be62df2001 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-21 08:59:29 -08:00
David Kelly
50554e934e Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn 2016-12-20 16:30:10 -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
David Kelly
7750e86c13 Only send machine fingerprint when not logged in 
While at it, no longer grabbing it at all when starting up, as that
was just a dev thing.  Should consider not sending MAC address too, but
we may revisit that later.
 2016-12-20 13:47:58 -08:00
Brad Hefta-Gaub
2079b1ff7e cleanup comments 2016-12-20 10:45:36 -08:00
Seth Alves
ab3c833dd5 diff minimization 2016-12-20 09:23:21 -08:00
Seth Alves
36e843178a diff minimization 2016-12-20 09:21:41 -08:00
Brad Hefta-Gaub
6a7fa63327 classify ScriptEngine errors better, and send them as signal to JS 2016-12-20 09:00:01 -08:00
Seth Alves
d8ee4d86b0 merge from upstream 2016-12-20 08:43:19 -08:00
Seth Alves
dc996bee95 merge from upstream 2016-12-20 08:06:01 -08:00
Brad Davis
bfc4a6e038 Fix stat tracker missing in agents 2016-12-20 07:45:35 -08:00
Ryan Huffman
9a517d7257 Update req tutorial version for Oculus Touch 2016-12-20 07:45:35 -08:00
Ryan Huffman
a72f8cac0e Update to only send users to tutorial if they have Vive or Touch 2016-12-20 07:45:35 -08:00
Ryan Huffman
4e29d7a2b8 Add send-to-tutorial logic for Oculus Touch 2016-12-20 07:45:35 -08:00
Brad Davis
d0d6b1f87e tracing polish 2016-12-20 07:45:35 -08:00
Andrew Meadows
e03e57a480 adding profile stats relating to avatar CPU costs 2016-12-20 07:45:35 -08:00
Ryan Huffman
21bab49f79 Add chrome tracing support 2016-12-20 07:45:35 -08:00
David Rowe
898372e841 Fix crash after manually closing Clara download status message box 2016-12-20 07:45:35 -08:00
David Rowe
6d0bb3bdc7 Make manually closing message box code more correct 2016-12-20 07:45:35 -08:00
Zach Pomerantz
13d3ffd47c change render forward flag to HIFI_... 2016-12-20 07:45:35 -08:00
David Rowe
3ebfc130c0 Scale all imported Clara models to have max dimension of exactly 1m 2016-12-20 07:45:35 -08:00
David Rowe
d933b3506f Fix Clara download status message box not auto-closing 2016-12-20 07:45:35 -08:00
David Rowe
fa9aef8b22 Fix crashing if manually close Clara download status message box 2016-12-20 07:45:35 -08:00
David Rowe
7a9cf498dc Increase resize timeout to 5 mins to improve the odds of model rezzing 
Model needs to rez in order for its initial dimensions to be obtained
from FBX.
 2016-12-20 07:45:35 -08:00
David Rowe
a63beedff4 Rescale models if necessary to have their largest dimension be 1m 
Models are still rescaled beforehand if thought to be in cm.
 2016-12-20 07:45:35 -08:00
David Rowe
e9dbb32277 Handle unzip failure 2016-12-20 07:45:35 -08:00
David Rowe
0ec1dc6c85 Log requested ATP mapping of model upload 2016-12-20 07:45:35 -08:00
David Rowe
d02e217b49 Don't make downloaded Clara.io models dynamic 2016-12-20 07:45:35 -08:00
David Rowe
932b05c1ba Rework Clara.io download user messaging to have no user interaction 2016-12-20 07:45:35 -08:00
David Rowe
c4ff129f86 Inform user if can't do Clara.io download because can't write to ATP 2016-12-20 07:43:48 -08:00
David Rowe
f3899736e8 Auto-close Clara model download progress box when model added to world 2016-12-20 07:43:48 -08:00
David Rowe
825225fcb2 Make Clara.io models grabbable and dynamic by default 2016-12-20 07:43:48 -08:00
David Rowe
591bc245bd Fix model being left invisible if not auto-resized 2016-12-20 07:43:48 -08:00
David Rowe
a4ff4f61b9 Increase auto-resize timeout for Clara.io asset download from ATP 2016-12-20 07:43:48 -08:00
David Rowe
5b8a9c0bcd Add extra logging for Clara.io asset resizing 2016-12-20 07:43:48 -08:00
howard-stearns
8d300eac76 pal prototype 2016-12-20 07:43:48 -08:00
David Rowe
25651800dd Code review 2016-12-20 07:43:48 -08:00
David Rowe
9f4df9bd07 Fix model auto-scaling to 1% not being seen by observers take 2 2016-12-20 07:43:48 -08:00
David Rowe
58edbf4eaf Fix model auto-scaling to 1% not being seen by observers 2016-12-20 07:43:48 -08:00
Seth Alves
67093dc519 don't flutter tablet when menu button is pressed. start on a stylus 2016-12-20 07:43:48 -08:00
David Rowe
7a36e4eed8 Fix keyboard focus when switch highlight between overlays and entities 2016-12-20 07:42:21 -08:00
David Rowe
d13e990ebe Rescale large Clara.io models to 1% instead of 10% 2016-12-20 07:42:21 -08:00
David Rowe
f749c76ced First pass at controller interaction with 3D Web overlay 2016-12-20 07:42:21 -08:00
David Rowe
367e758dc6 Fix compiler warning 2016-12-20 07:42:21 -08:00