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

16801 commits

Author SHA1 Message Date
David Kelly
9b1aaf3bfe CR feedback 2017-01-17 12:09:47 -08:00
Stephen Birarda
1e04aebb8d add --fast-hearbeat command line switch for 1s stats 2017-01-17 11:25:40 -08:00
samcake
69f9053e61 Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-17 10:55:10 -08:00
David Kelly
2460e89a57 CR feedback 2017-01-17 09:53:04 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
David Kelly
6c701bb0f0 remove ignored avatars from PAL when they disconnect 2017-01-16 18:22:53 -08:00
Seth Alves
f900629cdb Merge pull request #9390 from sethalves/load-models-in-keyhole 
fix physics not starting up when a model is close behind
 2017-01-16 18:06:23 -08:00
samcake
83d1c3ad01 Adding support for the meta rendering 2017-01-16 17:47:58 -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
bd67715cd2 don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed 2017-01-16 08:54:56 -08:00
Chris Collins
2557c797af Merge pull request #9300 from zzmp/graphics/forward-opaque 
Add opaques/skinned to forward rendering path
 2017-01-16 08:48:18 -08:00
ZappoMan
c9c311e275 checkpoint for distance joints 2017-01-15 11:47:48 -08:00
Seth Alves
36fdaa6350 avoid a little pop when grabbing something with ignore-ik as true 2017-01-15 10:10:54 -08:00
ZappoMan
c884b276e2 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-14 22:15:22 -08:00
Seth Alves
9de8144f0d merge from upstream 2017-01-13 10:17:03 -08:00
Seth Alves
f9a36d68ad Merge pull request #9363 from ctrlaltdavid/21127 
Make Clara.io downloads convert textures to PNG
 2017-01-13 10:14:43 -08:00
Seth Alves
481cc47f79 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-13 09:28:18 -08:00
ZappoMan
aed1b69ee0 make the avatar bounding box be avatar local and only change when it actually changes 2017-01-12 17:19:06 -08:00
Seth Alves
cc4f4ac506 fix merge from upstream 2017-01-12 17:08:14 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
Brad Davis
659badd8bf Change minimum threadpool size 1 2017-01-12 14:43:31 -08:00
samcake
ca53235d54 Merge pull request #9358 from AndrewMeadows/model-cleanup 
minor cleanup for Model rendering code
 2017-01-12 14:30:16 -08:00
samcake
b9e8f7ee14 Merge pull request #9359 from jherico/cached_qml_surfaces 
Eagerly cache QML surfaces for Web3D overlays
 2017-01-12 14:28:35 -08:00
Dante Ruiz
7d84aae670 closing tablet when taking snapshot 2017-01-12 17:29:38 +00:00
Brad Davis
2de83d42bc Add process and system CPU usage to traces 2017-01-12 09:19:08 -08:00
David Rowe
8cd7e1b377 Improve user messages 2017-01-12 15:48:25 +13:00
David Rowe
b41f8c754d Add updateable message box to JavaScript API 2017-01-12 15:46:53 +13:00
Andrew Meadows
b3e336de3d remove cruft: unused function arguments 2017-01-11 15:02:18 -08:00
Brad Davis
f235a52a6d Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet 2017-01-11 14:21:29 -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
31f39d7eef Allow scripts to inject tracing events 2017-01-10 14:06:39 -08:00
Anthony J. Thibault
3f0860f9c3 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-10 13:35:29 -08:00
Anthony Thibault
e7a88b5a3c Merge pull request #9343 from druiz17/menuApp 
Moved the context menu to the tablet
 2017-01-10 13:34:44 -08:00
Anthony J. Thibault
9db6806026 In desktop mode, tablet is in front of camera. 
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
  this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
  to move the tablet appropriately.

There's a known bug with the tablet entity position lagging the camera by one frame.
 2017-01-10 11:31:45 -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
Faye Li
c98a8168ee uncheck "show meter level" by default 2017-01-10 09:53:55 -08:00
Dante Ruiz
2fc76d64fd clean up unused code and files 2017-01-10 09:13:46 -08:00
druiz17
28c8d527df Merge pull request #9340 from fayeli/tablet-hide-yellow 
Ability to disable yellow highlight around Web Overlays
 2017-01-10 09:11:51 -08:00
ZappoMan
13198fd949 add datarate 2017-01-09 13:57:59 -08:00
ZappoMan
636ade9eb7 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 11:29:54 -08:00
Faye Li Si Fi
93e4f9126f disable drawing highlight if "showKeyboardFocusHighlight" flag is false 2017-01-09 11:01:15 -08:00
Anthony J. Thibault
6794ed7cc4 Merge remote-tracking branch 'upstream/master' into tablet-ui 2017-01-09 10:37:46 -08:00
Faye Li Si Fi
2fa17ea6a7 fix missing parenthesis 2017-01-09 10:23:31 -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
Brad Hefta-Gaub
ef7b9bfde0 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 10:07:05 -08:00
Faye Li Si Fi
d0d89e216d Add showKeyboardFocusHighlight in constructor 2017-01-09 09:54:41 -08:00
Brad Hefta-Gaub
1a7b5ab520 Merge pull request #9326 from jherico/oculus_budget_stats 
Adding tracking of Oculus renders, submits, and frames that are over budget
 2017-01-06 18:18:16 -08:00
Howard Stearns
b432ffa78d Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction 
Fix the PAL & Space Bubble interaction
 2017-01-06 16:47:43 -08:00
Seth Alves
ad6175857d Merge pull request #9328 from hyperlogic/tablet-ui 
Allow Hifi.SoundEffect to be used in all qml
 2017-01-06 15:21:08 -08:00
Anthony J. Thibault
0860c50a49 Allow Hifi.SoundEffect to be used in all qml 
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
 2017-01-06 14:01:13 -08:00
Zach Fox
dec41f67cc Fix bugs and generally fix behavior 2017-01-06 13:58:23 -08:00
Seth Alves
668bc35227 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge 2017-01-06 13:31:13 -08:00
Brad Davis
15b9e750f9 Adding tracking of Oculus renders, submits, and frames that are over budget 2017-01-06 10:51:26 -08:00
Atlante45
428a7f3bf8 Log Dialog doesn't float on top 2017-01-05 17:49:39 -08:00
Zach Fox
495925a017 This behavior was harder to change than expected... 2017-01-05 16:58:32 -08:00
Faye Li Si Fi
e7d14b9381 Adding new property "showKeyboardFocusHighlight" to Web3DOverlay 2017-01-05 16:49:55 -08:00
Seth Alves
d072b1524a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-05 15:27:11 -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
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
Clément Brisset
e34ecac843 Merge pull request #9299 from Atlante45/settings 
Fix settings hitch
 2017-01-04 17:19:44 -08:00
Brad Hefta-Gaub
f9ca41e89c Merge pull request #9302 from jherico/expose_dropped_count 
Expose dropped frames count to stats UI
 2017-01-04 16:12:35 -08:00
Howard Stearns
3d8da683db Merge pull request #9290 from zfox23/PersonalMute 
Personal mute; Quasi-ignore; Reversible PAL actions
 2017-01-04 14:37:09 -08:00
Brad Davis
3f2fdd1915 Expose dropped frames count to stats UI 2017-01-04 13:20:58 -08:00
Atlante45
56a25dfdee Check setting value changed 2017-01-04 11:56:24 -08:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Anthony J. Thibault
3c2f9acd39 Hooked up EventBridge to TabletScriptingInterface. 2017-01-03 15:43:21 -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
Zach Pomerantz
01cf48807c change Render.RenderForwardTask to Render.Forward 2017-01-03 14:47:48 -05:00
Zach Pomerantz
26cfc83e20 Merge branch 'master' into graphics/fetch-cull-sort 2017-01-03 14:04:39 -05:00
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
0c22fcb5c4 better handling of timers 2016-12-29 16:41:14 -08:00
Zach Pomerantz
0e9da87549 FetchSortCull->FetchCullSort 2016-12-29 19:27:37 -05: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
Zach Fox
800389cf20 Remove HRS logging 2016-12-28 14:37:19 -08:00
Atlante45
f79c6e08f5 Track dropped frames as reported by the Oculus SDK 2016-12-28 14:18:23 -08:00
Brad Davis
e5e9ab42ea Encapsulate AnimPose members for easier optimizations 2016-12-28 12:11:24 -08:00
Brad Hefta-Gaub
73bfc069da more work on only sending changes 2016-12-27 17:19:55 -08:00
howard-stearns
7faa689d1d avatar body goes away when ignored, and comes back when unignored 2016-12-27 10:17:39 -08:00
howard-stearns
768b747b3a Make avatar go away when ignored, even when pal is up. (But currently, it 
comes back!)
 2016-12-27 10:17:39 -08:00
Anthony Thibault
9128d4b140 Merge pull request #9255 from AndrewMeadows/benji-002 
optimization of incoming avatar joint data in interface client
 2016-12-26 11:34:15 -08:00
Zach Pomerantz
ca1a14e5b0 add RenderFetchSortCull task 2016-12-23 15:54:22 -05:00
Andrew Meadows
fc4763be03 use PROFILE_COUNTER not SAMPLE_PROFILE_COUNTER 2016-12-22 15:55:17 -08:00
Andrew Meadows
a5efc08473 use PROFILE_COUNTER not SAMPLE_PROFILE_COUNTER 2016-12-22 15:32:30 -08:00
samcake
b5e964f6ec Merge pull request #9260 from jherico/chrome_tracing 
Working on test/trace script interface
 2016-12-22 15:23:26 -08:00
Brad Davis
be6b098e1b Implement test scene loading 2016-12-22 13:12:59 -08:00
Brad Davis
e58623bcc0 Working on test/trace script interface 2016-12-22 11:46:40 -08:00
Andrew Meadows
b3be7f0f3e restore expensive version of Avatar::updatePalms() 2016-12-22 10:42:05 -08:00
Brad Hefta-Gaub
e6a20102d4 debug window enhancements 2016-12-21 11:31:34 -08:00
Andrew Meadows
2209c0ebba remove debug hook for dumping stats to logs 2016-12-21 10:55:59 -08:00
Andrew Meadows
3830649990 remove debugging and profiling 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
08cfd8a40e Merge pull request #9208 from ZappoMan/addViewFrustumToAvatarMixer 
Optimize avatar-mixer bandwidth for out of view avatars
 2016-12-21 10:22:56 -08:00
samcake
909f24c3e1 Merge pull request #9245 from AndrewMeadows/avatars-per-second 
measure avatar processing stats in Chrome trace framework
 2016-12-21 09:13:41 -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
Brad Hefta-Gaub
5e65e3991c CR feedback 2016-12-20 21:03:10 -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
Andrew Meadows
e43efa74de use sampled counter 2016-12-20 16:16:31 -08:00
Andrew Meadows
fa18d548f7 use proper category for NumAvatarsPerSec trace 2016-12-20 15:28:25 -08:00
Andrew Meadows
4d711d869c cleanup 2016-12-20 14:45:11 -08:00
Anthony J. Thibault
01a96347a5 Updated Web3dOverlay.cpp to work with TabletRoot.qml 2016-12-20 14:40:29 -08:00
Andrew Meadows
991a61b722 fix data collection for AvatarsPerSec 2016-12-20 14:01:03 -08:00
Andrew Meadows
1788d19260 remove some debug code 2016-12-20 14:00:25 -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
Anthony J. Thibault
84db58dbc6 Make tablet.qml work on Web3DOverlay 2016-12-20 12:16:11 -08:00
Andrew Meadows
03114fa610 add AvatarsPerSec trace stats 2016-12-20 11:45:21 -08:00
Brad Hefta-Gaub
9b11c7cc9c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/networking/src/NodeList.cpp
 2016-12-20 10:46:57 -08:00
Brad Hefta-Gaub
2079b1ff7e cleanup comments 2016-12-20 10:45:36 -08:00
Howard Stearns
9aad93465d Merge pull request #9227 from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -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
samcake
28ed61cc97 Introducing a fix for the overlayered model drawn in front 2016-12-20 07:45:35 -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
b6759fb1d1 Extend HMD scripting interface to check subdevices 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
1b8108bfba Update from Seth 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
77676436a2 Missing comment close 2016-12-20 07:45:35 -08:00
David Rowe
5bb497d258 Initial fix for detaching tablet UI 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
6680395e97 Add scriptEvent message to web3d overlay event bridge 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
0accdddc8f Fix Web overlay x, y coordinate calcs 2016-12-20 07:42:21 -08:00
David Rowe
17831e3b6a Fix Overlays.getProperty method not returning value to script 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
David Rowe
d06a0ce9f5 Auto-resize Clara.io models if larger than 10m as likely in cm or mm 2016-12-20 07:42:21 -08:00
David Rowe
527757cd22 Add further user feedback on Clara download progress 2016-12-20 07:40:28 -08:00
David Rowe
4cbd64b75e Improve temporary download directory robustness 2016-12-20 07:40:28 -08:00
David Rowe
73df11bddf Fix build warnings 2016-12-20 07:40:28 -08:00
David Rowe
5843185683 Tidying 2016-12-20 07:40:28 -08:00
David Rowe
5fbdd64fff Handle Clara marketplace downloads 2016-12-20 07:40:28 -08:00
David Rowe
bebedd8e51 Add JavaScript event bridge for Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
767b3ea8e9 Add script injection to Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
e85bc50333 Tidying 2016-12-20 07:38:25 -08:00
David Rowe
44f36a9dae Highlight Web overlay with focus 2016-12-20 07:38:25 -08:00
David Rowe
92b72af71c Direct keyboard input to Web overlay when has focus 2016-12-20 07:38:25 -08:00
David Rowe
5a550e5fc9 Refactoring 2016-12-20 07:38:25 -08:00
David Rowe
aca0e15503 Add mouse hover handling to Web overlay 2016-12-20 07:38:25 -08:00
David Rowe
e3444e1861 Add mouse press, move, and release handling to Web overlay 2016-12-20 07:38:25 -08:00
David Rowe
5db2fad6ec Fix Web 3D overlay ray intersection then comment out for performance 
Per Image3DOverlay.
 2016-12-20 07:38:25 -08:00
David Rowe
1987719cfd Display Clara.io download information 2016-12-20 07:33:55 -08:00
David Rowe
9c2252bd7e Fix typo 2016-12-20 07:33:55 -08:00
David Rowe
43ebdf97cb Tidy UI text 2016-12-20 07:33:55 -08:00
David Rowe
6329b670c9 Improve error handling for case that don't have permissions 2016-12-20 07:33:55 -08:00
David Rowe
bf2bcc0b80 Add user feedback on download process 2016-12-20 07:33:55 -08:00
David Rowe
e41d178534 Default collision shap to hull per submesh instead of static 2016-12-20 07:33:55 -08:00
David Rowe
e1a135591f Code tidying 2016-12-20 07:33:55 -08:00
David Rowe
4cabf49b23 Handle duplicate Clara download asset names 2016-12-20 07:33:55 -08:00
David Rowe
0ccff32365 Delete temporary directory after content has been used 2016-12-20 07:33:55 -08:00
David Rowe
7e8fc12258 Automatically download Clara model to ATP and add to world 2016-12-20 07:33:55 -08:00
David Rowe
467741f348 Add parameter that enables automatically adding download model to world 2016-12-20 07:33:55 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
0c9ff87feb add support for an HMD script debug log window 2016-12-19 19:34:14 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
Brad Hefta-Gaub
df954cab10 remove some log spam, recatargorize script logs to allow fine grain filtering 2016-12-19 16:15:10 -08:00
samcake
c435afb728 Introducing a fix for the overlayered model drawn in front 2016-12-19 13:17:56 -08:00
howard-stearns
9d9345cb65 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 09:19:14 -08:00
Brad Davis
ee3c8e6efd Merge pull request #9225 from jherico/chrome_tracing 
Additional work on tracing
 2016-12-16 17:53:55 -08:00
Brad Davis
2d73588361 Fix stat tracker missing in agents 2016-12-16 17:34:00 -08:00
Ryan Huffman
217d46704d Update req tutorial version for Oculus Touch 2016-12-16 15:41:04 -08:00
Ryan Huffman
b9598a28f3 Update to only send users to tutorial if they have Vive or Touch 2016-12-16 15:05:17 -08:00
Ryan Huffman
90e121ba47 Extend HMD scripting interface to check subdevices 2016-12-16 15:05:17 -08:00
Ryan Huffman
c953ceb58b Add send-to-tutorial logic for Oculus Touch 2016-12-16 15:05:17 -08:00
samcake
1ded581895 Merge pull request #9217 from zzmp/feat/render-forward-bounds 
Render bounds in Forward Render Task
 2016-12-16 14:57:14 -08:00
howard-stearns
3adc78fecc Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de sessionDisplayName set at server and passed to all clients (including 
oneself)
 2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506 adding profile stats relating to avatar CPU costs 2016-12-16 13:41:31 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
David Rowe
9bf8f25ed0 Update from Seth 2016-12-16 16:11:27 +13:00
Brad Hefta-Gaub
8497ad1e29 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-15 16:42:41 -08:00
David Rowe
9aaf55e6a3 Fix crash after manually closing Clara download status message box 2016-12-16 12:49:26 +13:00
Brad Hefta-Gaub
ed19b4b592 remove compression at the per avatar data buffer for now, since it gave no benefit 2016-12-15 14:13:38 -08:00
Howard Stearns
ba8b585368 Merge pull request #9202 from howard-stearns/pal-proto 
People Action List prototype
 2016-12-15 13:56:12 -08:00
Anthony J. Thibault
8b99fa90e8 Merge branch 'master' into tablet-ui 2016-12-15 13:28:23 -08:00
David Rowe
b8114b29b2 Make manually closing message box code more correct 2016-12-16 09:47:11 +13:00
Zach Pomerantz
41f6990051 change render forward flag to HIFI_... 2016-12-15 14:53:51 -05:00
samcake
7a29dbe7d4 Merge pull request #9207 from zzmp/feat/render-forward-empty 
Forward render task (empty and only used with RENDER_FORWARD set)
 2016-12-15 09:57:18 -08:00
Seth Alves
4494edae33 Merge pull request #9210 from zfox23/FB_2591 
FB 2591: Taking simultaneous GIF snapshots crashes Interface
 2016-12-15 07:01:58 -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
David Rowe
16418d52d2 Scale all imported Clara models to have max dimension of exactly 1m 2016-12-15 20:11:29 +13:00
David Rowe
349765ad74 Fix Clara download status message box not auto-closing 2016-12-15 16:00:07 +13:00
howard-stearns
ae4064f445 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-14 17:04:52 -08:00
David Rowe
23b8bf7aab Fix crashing if manually close Clara download status message box 2016-12-15 13:35:58 +13:00
Atlante45
bfc789f072 CR - CLI text 2016-12-14 15:44:00 -08:00
Atlante45
0dec97fc03 Make Steamworks a plugin 2016-12-14 15:37:49 -08:00
David Rowe
eb293fb579 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-15 12:26:53 +13:00
David Rowe
c82cceccac Rescale models if necessary to have their largest dimension be 1m 
Models are still rescaled beforehand if thought to be in cm.
 2016-12-15 12:25:56 +13:00
David Rowe
dbd00e39a8 Handle unzip failure 2016-12-15 11:52:34 +13:00
David Rowe
fa6f121ff2 Missing comment close 2016-12-15 11:51:28 +13:00
David Rowe
b55c558f96 Initial fix for detaching tablet UI 2016-12-15 11:11:40 +13:00
Anthony J. Thibault
d4f9d21ce8 Pass tablet QQuickItem to TabletScriptingInterface 
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
 2016-12-14 14:04:48 -08:00
David Rowe
17c54a5fae Log requested ATP mapping of model upload 2016-12-15 10:01:19 +13:00
David Rowe
5af57d7bbc Don't make downloaded Clara.io models dynamic 2016-12-15 09:38:06 +13:00
Zach Fox
c53111781b Fix the bug 2016-12-14 12:17:00 -08:00
Anthony J. Thibault
db0b2ba7d3 Fleshing out TabletScriptingInterface. 
Added TabletProxy and TabletButtonProxy
 2016-12-14 12:08:41 -08:00
Anthony J. Thibault
d94da76b72 Added TabletScriptingInterface 2016-12-14 12:08:40 -08:00
Brad Hefta-Gaub
2290179281 add compression and minimal data flags to AvatarData 2016-12-14 11:47:45 -08:00
David Rowe
934f48362a Rework Clara.io download user messaging to have no user interaction 2016-12-14 22:23:25 +13:00
Brad Hefta-Gaub
a7750501c6 first cut at adding view frustum support to avatar mixer 2016-12-13 18:58:11 -08:00
Zach Pomerantz
bbb7229392 skip graphics config if not in engine 2016-12-13 20:47:28 -05:00
David Rowe
2b0529bcea Inform user if can't do Clara.io download because can't write to ATP 2016-12-14 14:45:33 +13:00
David Rowe
d546b69daf Add scriptEvent message to web3d overlay event bridge 2016-12-14 14:30:02 +13:00
Brad Hefta-Gaub
e3bc49c302 drop avatar data rate to 45hz 2016-12-13 16:51:59 -08:00
Zach Pomerantz
bc59be12ef create flagged forward render task 2016-12-13 19:19:30 -05:00
howard-stearns
6fc27ac8d6 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-13 09:39:51 -08:00
David Rowe
2df7c189a2 Auto-close Clara model download progress box when model added to world 2016-12-14 01:22:47 +13:00
David Rowe
5344cc6155 Make Clara.io models grabbable and dynamic by default 2016-12-14 01:15:12 +13:00
David Rowe
c9a00e86d1 Fix model being left invisible if not auto-resized 2016-12-13 18:31:24 +13:00
David Rowe
ea7d84ec7d Increase auto-resize timeout for Clara.io asset download from ATP 2016-12-13 17:55:44 +13:00
David Rowe
aefa116207 Add extra logging for Clara.io asset resizing 2016-12-13 17:55:22 +13:00
David Rowe
1f3045ad30 Merge branch 'master' into 21089 
Conflicts:
	interface/src/Application.cpp
 2016-12-13 14:05:24 +13:00
Stephen Birarda
b4f43e01b1 Merge pull request #9189 from huffman/feat/help-touch 
Add support for oculus touch in help menu
 2016-12-12 16:48:00 -08:00
howard-stearns
712543a39a Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-12 16:37:41 -08:00
howard-stearns
4b5aae3c55 pal prototype 2016-12-12 16:37:16 -08:00
Seth Alves
d97be52542 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2016-12-12 16:24:17 -08:00