Commit graph

16628 commits

Author SHA1 Message Date
Brad Hefta-Gaub
5287c174b4 Merge pull request #7605 from jherico/route_log_errors
Fixing logging errors on initial load of controller routes
2016-04-07 17:13:13 -07:00
David Rowe
e37e46d34a Disable arrow keys being able to move between HTML form fields
Moving between form fields with arrow keys makes it to easy to make
unintended changes to adjacent fields.
2016-04-08 10:30:00 +12:00
Brad Hefta-Gaub
3d94558d6b Merge pull request #7589 from jherico/oculus_input
Support oculus remote input
2016-04-07 15:05:45 -07:00
Brad Hefta-Gaub
157dd96303 Merge pull request #7612 from ZappoMan/mirrorReturnsToLastView
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
2016-04-07 14:56:53 -07:00
Brad Davis
72d8990fed Fix menu launch from Oculus remote 2016-04-07 14:13:02 -07:00
Brad Hefta-Gaub
d1a2a30c02 fix build buster 2016-04-07 13:41:05 -07:00
Brad Hefta-Gaub
09004680d0 handle a couple edge cases 2016-04-07 13:32:26 -07:00
Brad Davis
2f28c64edb Fixing menu navigation in oculus remote 2016-04-07 13:21:00 -07:00
Brad Davis
a58a627fdf Support oculus remote input 2016-04-07 13:20:59 -07:00
Brad Hefta-Gaub
81bb5ff07d when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror 2016-04-07 13:13:19 -07:00
Brad Hefta-Gaub
bd1eb5842a fix crash related to menu vs watchdog create order 2016-04-07 12:45:24 -07:00
Brad Davis
85019b2b5e Fixing logging errors on initial load of controller routes 2016-04-07 10:41:54 -07:00
Brad Hefta-Gaub
2c3aeddbe4 reduce log spam for the deadlock watchdog 2016-04-07 10:25:08 -07:00
Brad Hefta-Gaub
e78b202433 Merge pull request #7602 from ZappoMan/default1PView
default to first person view
2016-04-07 09:16:04 -07:00
Brad Hefta-Gaub
5f4d6ca1d3 CR feedback 2016-04-06 19:07:26 -07:00
Brad Hefta-Gaub
47aed9c8bd fix redraw issue when logging in to or out of a domain 2016-04-06 14:56:20 -07:00
Brad Hefta-Gaub
1f708ccb57 default to first person view 2016-04-06 13:35:08 -07:00
Brad Hefta-Gaub
2ee5b45ca6 Merge pull request #7583 from zzmp/log/bookmarks-exists
Do not warn if no bookmarks file
2016-04-06 11:20:06 -07:00
Ryan Huffman
5fb898de74 Add rolled log files to BugSplat 2016-04-06 10:14:12 -07:00
Brad Hefta-Gaub
51660ab3a8 Merge pull request #7579 from sethalves/log-about-webengine-remote-debugging
Log about webengine remote debugging
2016-04-06 08:28:37 -07:00
Brad Hefta-Gaub
699c717828 Merge pull request #7580 from hyperlogic/tony/keyboard-focus-on-web-entity-fix
Application: focusOut keyboard device when clicking on web entity.
2016-04-05 18:44:30 -07:00
Brad Hefta-Gaub
70f3a39463 Merge pull request #7593 from hyperlogic/tony/keyboard-focus-improvements
Application: change keyboard input focus when using ui overlay.
2016-04-05 18:44:16 -07:00
Anthony J. Thibault
07ff687bfe Application: change keyboard input focus when using ui overlay.
call focusOutEvent on keyboard input plugin when an offscreen ui has activeFocus.
2016-04-05 18:12:02 -07:00
Brad Hefta-Gaub
891cc12d3f Merge pull request #7549 from zzmp/feat/resource-vis
Add a visualization of cacheable resource usage
2016-04-05 15:43:27 -07:00
Zach Pomerantz
cba866b375 Do not warn if no bookmarks file 2016-04-05 14:59:57 -07:00
Seth Alves
bda8761e00 fix how env variable is accessed 2016-04-05 14:30:41 -07:00
Seth Alves
f42e968dda commit to repush to see if github is working yet 2016-04-05 14:12:46 -07:00
Anthony J. Thibault
4c632cb4c4 Application: focusOut keyboard device when clicking on web entity. 2016-04-05 14:00:43 -07:00
Seth Alves
d8282ae799 log value of QTWEBENGINE_REMOTE_DEBUGGING before exit 2016-04-05 13:56:39 -07:00
David Rowe
c9c414d5a8 Fix entities editor display of large negative coordinates and angles 2016-04-06 07:45:04 +12:00
Brad Hefta-Gaub
08a19c0471 Merge pull request #7554 from jherico/load_stutter2
Addressing stuttering in the frame while loading content - Part 2
2016-04-05 09:45:31 -07:00
Ryan Huffman
ab89e47bba Merge pull request #7562 from hyperlogic/tony/make-debugger-work-again
Fix for debugging on windows
2016-04-05 09:08:50 -07:00
Brad Davis
e86066c1ce Merge pull request #7563 from hyperlogic/tony/jittery-hands-fix
Application: fix for jittery hands when moving.
2016-04-04 15:58:22 -07:00
Brad Hefta-Gaub
04471f1c88 Merge branch 'master' of https://github.com/highfidelity/hifi into simpleTestPR
Conflicts:
	interface/src/Application.cpp
2016-04-04 13:16:39 -07:00
Brad Hefta-Gaub
b3b5c5d1ea small change to trigger a build 2016-04-04 13:14:52 -07:00
Anthony J. Thibault
d7b13d226f Application: fix for jittery hands when moving.
The issue was that the hands are sampled in sensor coordinates.
But when the avatar is moved via physics, the sensor to world matrix
must be updated to move the hands in the world by the correct amount.
These new hand positions are then computed before IK is performed.
2016-04-04 12:36:18 -07:00
Anthony J. Thibault
a9197385b5 Make debug builds work again.
Only run mt.exe on the manifest in non development builds.
2016-04-04 12:24:26 -07:00
Brad Davis
d98abbc7df First pass at threaded texture transfers 2016-04-04 10:23:01 -07:00
Thijs Wenker
2be4097bc5 another 3.1.2.1 rollback 2016-04-04 17:36:43 +02:00
Thijs Wenker
142f37da1c fix accidentally violated style rule 3.1.2.1 2016-04-04 17:33:47 +02:00
Thijs Wenker
b2058376ba used "ReSharper C++" to fix some style and spelling in Application.(h|cpp) 2016-04-04 17:03:05 +02:00
Brad Hefta-Gaub
e5f3ec4600 Merge pull request #7545 from birarda/marketplace-to-examples
renaming of marketplace icon/window to examples
2016-04-03 14:25:00 -07:00
Brad Hefta-Gaub
ecaaa34576 Merge pull request #7547 from howard-stearns/lock-trees-on-import-export
Lock trees on import export
2016-04-03 14:23:54 -07:00
James B. Pollack
15e0b40a18 merge hand controller things 2016-04-02 21:02:14 -07:00
Anthony Thibault
d899d7d696 Merge pull request #7530 from hyperlogic/tony/culling-fixes
Culling fixes
2016-04-01 21:29:34 -07:00
Zach Pomerantz
5b9198ed3d Expose tex/model cache to js/qml 2016-04-01 19:52:43 -07:00
Seth Alves
5fa9f662fc Merge pull request #7542 from birarda/refresh-on-asset-connect
refresh/close the asset browser dialog on domain switch
2016-04-01 18:08:59 -07:00
Zach Pomerantz
d72c695417 Sanitize ResourceCache to expose to JS/QML
fix sanitize
2016-04-01 17:42:36 -07:00
Seth Alves
4788bb453b Merge pull request #7540 from murillodigital/master
Updating defaultAvatar_full.fbx to fixed version
2016-04-01 15:53:19 -07:00
Stephen Birarda
6e83ed5ccc use a more generic custom user agent 2016-04-01 15:49:24 -07:00
Stephen Birarda
6df7ddeb16 pass the HighFidelityInterface user agent with WebView 2016-04-01 15:13:28 -07:00
howard-stearns
b5cbd7720e Lock entity tree on export, and clipboard on import. 2016-04-01 14:56:56 -07:00
Brad Hefta-Gaub
5f710782eb Merge pull request #7528 from howard-stearns/fbx-reader-safety
Fbx reader safety
2016-04-01 13:34:17 -07:00
Brad Hefta-Gaub
95e0682012 Merge pull request #7446 from ctrlaltdavid/20855
Restyle entities editor
2016-04-01 13:07:58 -07:00
Brad Hefta-Gaub
270a9b0483 Merge pull request #7534 from hyperlogic/tony/only-update-model-on-main-thread
Application: don't call Model::simulate on network thread.
2016-04-01 13:05:54 -07:00
Stephen Birarda
309d327a37 change My Asset Server to Asset Browser in Menu 2016-04-01 13:02:26 -07:00
Stephen Birarda
ee7bee95f8 use nodeActivated to trigger refresh of Asset Browser 2016-04-01 11:35:33 -07:00
Stephen Birarda
459cbebcee don't show the My Asset Server option beside Reload All Content 2016-04-01 11:15:32 -07:00
Stephen Birarda
194226103c refresh the Asset Browser when switching domains 2016-04-01 11:13:59 -07:00
Leonardo Murillo
946a292cfb Updating defaultAvatar_full.fbx to fixed version 2016-04-01 11:49:45 -06:00
Anthony J. Thibault
5e81cccc6c Merge branch 'master' into tony/culling-fixes 2016-04-01 09:29:46 -07:00
Brad Hefta-Gaub
5a665f9aef Merge pull request #7482 from huffman/extra-logging
Add system information to log file
2016-04-01 09:10:21 -07:00
James B. Pollack
30c8a44411 Merge remote-tracking branch 'upstream/master' into homereset 2016-04-01 08:02:19 -07:00
David Rowe
b9054897f7 Merge branch 'master' into 20855 2016-04-01 17:32:47 +13:00
Anthony J. Thibault
3d43f73a88 Application: don't call Model::simulate on network thread.
This can cause a crash.

On startup the Application::processOctreeStats method on the network thread will call into entities entity->isReadyToComputeShape() (without a tree lock) and trigger Model::simulate.  Model is NOT thread safe.  This was leading to a single model to be initialized on two threads simultaneously.

This might be somewhat rare, I only caught it because I was running a debug build.
2016-03-31 17:57:20 -07:00
ericrius1
39f5ed443a fixed merge conflicts 2016-03-31 17:16:36 -07:00
Anthony J. Thibault
bc967f0ab0 Model: update renderItems when items are added to the scene.
* Renamed enqueueLocationChange to updateRenderItems
* Call updateRenderItems when models are added to the scene.

This will fix entity render bounds being incorrect when they are first added to the scene,
then later being correct after a position update.

* Renamed getMeshPartBound to getRenderableMeshBound.
* Avatar now uses getRenderableMeshBound() to do boundingRadius vs frustum check.
* Model::getRenderableMeshBound now returns a more accurate bound, because it is the same one used for rendering.

This will fix avatar freezing, when they are in the corner of your frustum.
This was due to matrices not being updated because the avatar had to a small bounding sphere.
2016-03-31 14:59:27 -07:00
Ryan Huffman
1c1158b761 Add Windows manifest to interface.exe 2016-03-31 14:20:19 -07:00
Brad Davis
97e96f7b67 PR comments 2016-03-31 13:19:26 -07:00
howard-stearns
1df9a57e58 Merge branch 'master' of https://github.com/highfidelity/hifi into fbx-reader-safety 2016-03-31 10:56:55 -07:00
Andrew Meadows
74633ca8c8 Merge pull request #7522 from ZappoMan/optimizeFindZones
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
2016-03-31 10:14:32 -07:00
howard-stearns
258ffbc8ac Merge branch 'master' of https://github.com/highfidelity/hifi into fbx-reader-safety 2016-03-31 10:08:01 -07:00
James B. Pollack
140bb75542 lots 2016-03-31 09:21:08 -07:00
Brad Hefta-Gaub
a7f93aa75c Merge pull request #7519 from zzmp/fix/avatar-crash
Fix crash from updating/resetting avatar
2016-03-30 21:31:17 -07:00
David Rowe
2ac9f282c7 Merge branch 'master' into 20855 2016-03-31 17:00:09 +13:00
Brad Hefta-Gaub
b76f8509aa Merge branch 'master' of https://github.com/highfidelity/hifi into optimizeFindZones 2016-03-30 19:29:28 -07:00
David Rowe
13ab854a9d Reduce space between collapsed sections
In settings dialogs as well as entities editor.
2016-03-31 15:02:16 +13:00
Brad Hefta-Gaub
28978c8adb optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently 2016-03-30 17:49:30 -07:00
Brad Hefta-Gaub
f0cc8c0dd3 Merge pull request #7491 from jherico/oculus_release
Update to latest Oculus SDK, add input device support
2016-03-30 17:42:32 -07:00
David Rowe
382b05e00b Make expand/collapse icon larger 2016-03-31 13:13:13 +13:00
howard-stearns
51a4154ae7 Check results of qUncompress, and catch fbx reader throws in utility
programs.
2016-03-30 16:56:39 -07:00
Brad Hefta-Gaub
4a1e82892a Merge pull request #7494 from sethalves/use-local-scripts
Use local scripts
2016-03-30 15:46:32 -07:00
Seth Alves
92981a6660 Merge pull request #7503 from sethalves/lock-tree-before-moving-av-children
lock entity-tree before moving entity-children of avatars
2016-03-30 15:05:38 -07:00
Zach Pomerantz
b6bf392f94 Defer avatar URL change to render thread 2016-03-30 14:39:35 -07:00
Seth Alves
bb43347599 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-30 13:33:59 -07:00
David Rowe
510d167c87 Merge branch 'master' into 20855 2016-03-31 08:43:35 +13:00
Brad Davis
f569cbf70e Add debugging output, fix timewarp 2016-03-30 10:40:32 -07:00
Brad Hefta-Gaub
d99dcf5450 Merge pull request #7487 from hyperlogic/tony/animated-culling
Improved render bounding boxes for animated models
2016-03-30 09:27:43 -07:00
Brad Hefta-Gaub
6fdedb8f34 Merge pull request #7508 from howard-stearns/import-export-parents
Make export/import and copy/paste be parent/child-clean.
2016-03-30 09:06:33 -07:00
Brad Hefta-Gaub
c64b2bb236 Merge pull request #7495 from Atlante45/fix/audio-client
Fix crash in Audio Client
2016-03-30 09:00:07 -07:00
David Rowe
db72e3efbb Increase maximum window height 2016-03-30 19:22:34 +13:00
howard-stearns
5381be6902 Whitespace 2016-03-29 17:06:19 -07:00
David Rowe
28d0fc677c Update UIT QML control 2016-03-30 12:19:26 +13:00
howard-stearns
4ebf816166 cleanup 2016-03-29 16:17:19 -07:00
David Rowe
1cb08952ae Merge branch 'master' into 20855
Conflicts:
	interface/resources/qml/ToolWindow.qml
2016-03-30 12:01:45 +13:00
Seth Alves
537c6fa3c6 fix indentation 2016-03-29 15:39:42 -07:00
howard-stearns
bcb729eac2 Abstract out globalizeProperties. 2016-03-29 15:21:06 -07:00
Seth Alves
9d8e01f2a5 lock entity-tree before moving entity-children of avatars 2016-03-29 15:01:23 -07:00
howard-stearns
4a28dadae5 Working, but not cleaned up. 2016-03-29 13:26:50 -07:00
Anthony J. Thibault
a2c520a74a ModelOverlay: use a shared_ptr<Model> not a model member
This is necessary for shared_ptr and weak_ptr to work for Models contained within a ModelOverlay.
2016-03-29 10:47:26 -07:00
Seth Alves
b88770228e convert running-scripts window to use local script files 2016-03-29 10:40:56 -07:00
howard-stearns
3f18e0cd09 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-29 09:20:07 -07:00
Howard Stearns
5db1c33e4d kill offsets 2016-03-29 09:18:29 -07:00
Eric Levin
830d08c385 Merge pull request #7498 from Atlante45/fix/import-entities
Make svo loading use ResourceManager
2016-03-29 08:09:47 -07:00
Anthony J. Thibault
940f3e636d Merge branch 'master' into tony/animated-culling 2016-03-28 19:58:38 -07:00
Anthony J. Thibault
115fd607a0 Address performance issues introduced with this PR.
* Prevent clusterMatrices from being invalidated and re-computed in each updateItem lambda.
  We do this by not setting _model->_needsUpdateClusterMatrices = true;
* Prevent redundant work if Model::enqueueLocationChange is called multiple times per frame.
  We do this by introducing a preRenderLambdas map in the Application class.
  Instead of adding work directly to the scene PendingChanges queue Model::enqueueLocationChange
  adds a lambda to the Application preRenderLambdas map.  The Application ensures that only one lambda will
  be invoked for each model per frame.
2016-03-28 19:47:30 -07:00
Atlante45
807698f0bb Make svo loading use ResourceManager 2016-03-28 18:07:48 -07:00
howard-stearns
1b3d9d7ab6 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 16:59:20 -07:00
Atlante45
238131014b Fix avatar manager naming 2016-03-28 15:00:36 -07:00
Atlante45
92ef8cafb1 Make sure pos/rot getters don't crash 2016-03-28 14:37:06 -07:00
Zach Pomerantz
2de94e672b Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-28 14:08:30 -07:00
howard-stearns
d07967d6d8 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 14:02:20 -07:00
Brad Hefta-Gaub
7396fa1cc3 Merge pull request #7493 from zzmp/fix/plugin-check
Default to desktop when display plugins fail to load
2016-03-28 13:49:58 -07:00
howard-stearns
c6347eb92a checkpoint for debugging/comparing edit.js 2016-03-28 13:39:43 -07:00
Zach Pomerantz
7bcef1d319 Fallback display to last, then desktop 2016-03-28 12:54:38 -07:00
Zach Pomerantz
37a725b06d Fallback to desktop if display plugin fails 2016-03-28 12:12:52 -07:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
David Rowe
ef4d67008b Style x, y, z fields 2016-03-28 11:45:50 +13:00
David Rowe
b9ec5f39d9 Style color RGB fields 2016-03-27 22:12:10 +13:00
Anthony J. Thibault
49a4d104a6 Minimize diff with master 2016-03-26 13:27:05 -07:00
Anthony J. Thibault
bf433487fa Dynamic bound update for skinned mesh
* Use all cluster matrices to compute bound for skinned mesh.
  This is far less expensive then doing per-vertex work, but it's not free, for avatars especially.
* Remove skinnedMeshBound, compute it instead.
* Compute clusterMatrices in render update, because we need them to update bounds.
2016-03-26 12:22:02 -07:00
Anthony J. Thibault
b4e70d9101 WIP: checkpoint
* bug fix in AABox::operator+=
* added AABox::emiggen
* Avatar now has a default bound for it's skinned mesh.
* WIP: AABox tests;  NEED MORE
* Model: split collision and model mesh render items.
  Because ModelMeshRenderItems need special handling to update bounds for animated joints.
* Model: dynamically update the bound for rigidly bound animated meshes
* Rig: added access to geometryToRigTransform
* RenderableModelEntityItem: try to update bounds for skinned mesh to be the entity dimentions (this doesn't seem to be working)
* Geometry.cpp: removed unused bounds parameter in evalPartBounds
* ModelMeshPartPayload: bounds updating
   * non-animated: use existing _localBound
   * rigid bound mesh: use _localBound transformed by clusterMatrix joint transform
   * fully skinned mesh: use _skinnedMeshBound provided by the application.
2016-03-25 21:29:20 -07:00
Brad Hefta-Gaub
f7e6f60e87 one more crack at fixing false deadlock 2016-03-25 19:04:01 -07:00
Brad Hefta-Gaub
9a66d779ae Merge pull request #7463 from zzmp/guard/bugsplat-2177
Guard against lack of GL support to avoid crash
2016-03-25 16:31:14 -07:00
Philip Rosedale
44c6f81c0f Merge pull request #7457 from ZappoMan/reduceFalsePositiveDeadlocks
make the deadlock watchdog more generous
2016-03-25 16:10:37 -07:00
Ryan Huffman
8d7670a4e8 Move system information logging to SharedUtil 2016-03-25 16:00:04 -07:00
Ryan Huffman
9efef21527 Fix indentation 2016-03-25 15:38:25 -07:00
Ryan Huffman
c4a87925e2 Add system information to log file 2016-03-25 15:34:53 -07:00
Zach Pomerantz
9f8848e833 Log on first login 2016-03-25 15:07:14 -07:00
Brad Hefta-Gaub
fe31be71eb protect against unexpected rollover 2016-03-25 14:59:43 -07:00
Zach Pomerantz
b252139704 LMK when running with old GL version 2016-03-25 14:42:58 -07:00
Alan Z
cffbc2e1a4 Merge pull request #7478 from birarda/new-icons
replace interface/server-console icons with new set from Alan
2016-03-25 13:17:58 -07:00
Brad Hefta-Gaub
541c1e5c6f Merge branch 'master' of https://github.com/highfidelity/hifi into reduceFalsePositiveDeadlocks 2016-03-25 13:03:31 -07:00
Brad Hefta-Gaub
941821e2c7 add some extra debugging at deadlock detection to explain unreasonable numbers 2016-03-25 12:17:24 -07:00
Zach Pomerantz
c5e5195db1 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 12:07:00 -07:00
David Rowe
f85b7696b3 Merge branch 'master' into 20855 2016-03-26 07:53:55 +13:00
Stephen Birarda
bb95aec528 replace the interface icons 2016-03-25 11:42:48 -07:00
Andrew Meadows
7064b29a2d Merge pull request #7473 from jherico/revert_webchannel
Revert "Build a better event bridge"
2016-03-25 11:29:06 -07:00
Zach Pomerantz
5d306a74d5 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 10:09:37 -07:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge"
This reverts commit a43fde0803.
2016-03-25 09:48:25 -07:00
Brad Hefta-Gaub
fb09ad51b3 CR feedback 2016-03-24 21:14:07 -07:00
David Rowe
42af3ebc4a Style the entity editor's "grid" tab 2016-03-25 14:15:03 +13:00
Brad Hefta-Gaub
7de8a2267f one more try 2016-03-24 18:09:14 -07:00
Anthony J. Thibault
6a5a443eff Avatar: Eye-tracking works again
This replaces the calculation of the Head left and right eye positions used for eye tracking.
Which was inadvertently removed in this commit 7483b8546b
2016-03-24 18:07:46 -07:00
Brad Davis
0ac70049c7 Merge pull request #7431 from hyperlogic/tony/vive-rendering-work
OpenVR rendering & Nsight instrumentation improvements
2016-03-24 17:44:30 -07:00
Brad Hefta-Gaub
cfaa97d8f3 one more try 2016-03-24 17:39:23 -07:00
Brad Hefta-Gaub
6d76a5872f Merge pull request #7461 from hyperlogic/tony/avatar-culling-fix
Avatar: fix for Avatar animation updates while wearing HMD
2016-03-24 17:34:20 -07:00
Brad Hefta-Gaub
d26fe77803 Merge pull request #7454 from jherico/qml_crashes
Fix async issues related to JS <-> App <-> QML <-> HTML communication
2016-03-24 17:32:38 -07:00
Brad Hefta-Gaub
5b13ebf72b more mac build busters 2016-03-24 17:19:11 -07:00
Brad Hefta-Gaub
2b595fb329 break out thread safe moving average to get around unix build hell 2016-03-24 16:26:28 -07:00