Brad Hefta-Gaub
d9ae788818
more CR feedback
2016-04-21 15:55:50 -07:00
Brad Davis
6c30194916
Support lowering the minimum mip of a texture at runtime
2016-04-21 14:46:12 -07:00
Brad Hefta-Gaub
ddf5b0f316
some debugging
2016-04-21 10:32:22 -07:00
Zach Pomerantz
e3131d2098
Rm prefetchAnimation from avatar/rig
2016-04-20 20:14:15 -07:00
Brad Hefta-Gaub
31f9d592e0
support for larger than 35 minute clock skew
2016-04-20 18:42:00 -07:00
Zach Pomerantz
2c7cf3ea83
Fix RateScriptingInterface headers
2016-04-20 14:32:25 -07:00
Zach Pomerantz
ad225b3aed
Fix RatesScriptingInterface ctor
2016-04-20 13:58:06 -07:00
Zach Pomerantz
1fe12e7029
Mv Rates to RatesScriptingInterface.h
2016-04-20 13:26:23 -07:00
Anthony J. Thibault
8e5785cdf8
Avatar animations are now stored locally
...
Improves FTUE, by no longer going over the network to download default avatar animations.
This also includes support for relative animation urls within the animation.json
2016-04-19 16:11:14 -07:00
Zach Pomerantz
4dacb04ee1
Rm myAvatar motion states on shutdown
2016-04-19 16:01:55 -07:00
Howard Stearns
cbb76013c4
Merge pull request #7710 from ZappoMan/LODtweaks
...
tweaks to LOD behavior
2016-04-19 13:50:21 -07:00
samcake
3dad4f576e
Merging with master
2016-04-19 11:59:44 -07:00
Brad Hefta-Gaub
c7ecbb6b4b
tweaks to LOD behavior
2016-04-19 11:19:28 -07:00
Howard Stearns
9ff9682b2a
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
...
Reset entities script engine on domain change
2016-04-19 11:14:28 -07:00
samcake
a997f9bb1b
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-19 10:49:53 -07:00
Zach Pomerantz
fc61f85bf9
Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback
...
Added MyAvatar onLoadComplete Callback
2016-04-19 10:36:20 -07:00
samcake
265f6f1275
Updating & Merging with master
2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
8eff47f922
Merge pull request #7705 from hyperlogic/tony/avatar-attachment-lag-fix
...
Fix for laggy avatar attachments
2016-04-19 07:15:38 -07:00
Brad Hefta-Gaub
0ac9601ea7
Merge pull request #7690 from ZappoMan/improveHMD
...
Introduce "recommended overlay rectangle" to display plugins
2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
0a79b5dd69
Merge pull request #7707 from huffman/fix/osx-default-script-dir
...
Remove fix for old QT file path bug in OSX
2016-04-18 18:01:47 -07:00
Brad Hefta-Gaub
0e9bd9a776
Merge pull request #7682 from zzmp/clean/stars
...
Cleanup stars to persist a single BufferView
2016-04-18 17:59:48 -07:00
Zach Pomerantz
f48541961d
Expose Rates to JS/QML
2016-04-18 17:43:34 -07:00
Ryan Huffman
4e0ac2a4be
Remove fix for old QT file path bug in OSX
2016-04-18 16:07:53 -07:00
Brad Hefta-Gaub
01907f181f
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-18 16:01:42 -07:00
Seth Alves
3298883774
Merge pull request #7702 from zzmp/fix/clear-octree-on-exit
...
Clear entities and avatars on exit
2016-04-18 15:48:35 -07:00
Anthony J. Thibault
279e77f523
updated comment
2016-04-18 15:18:08 -07:00
samcake
dccf549118
Merge pull request #7676 from jherico/perf_testing
...
Manually generate mipmaps for textures while loading
2016-04-18 15:09:12 -07:00
Zach Pomerantz
146ea066db
Update AvatarManager.cpp
2016-04-18 14:53:04 -07:00
Anthony J. Thibault
544928b46e
MyAvatar: fix for laggy avatar attachments
2016-04-18 14:51:33 -07:00
Zach Pomerantz
c9dc642d76
Fix type in AvatarManager::clearAllAvatars
2016-04-18 14:48:24 -07:00
Zach Pomerantz
c87eec4182
Fix typo in AvatarManager::clearAllAvatars
2016-04-18 14:45:33 -07:00
Zach Pomerantz
790e325248
Clear entities and avatars on exit
2016-04-18 14:31:16 -07:00
Anthony J. Thibault
dc92ccc2b2
MyAvatar: Removed unnecessary slot.
2016-04-18 13:19:49 -07:00
Brad Hefta-Gaub
374ba10524
more CR feedback
2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e
CR feedback
2016-04-18 12:13:21 -07:00
Anthony J. Thibault
1682598be7
Added onLoadComplete signal to MyAvatar
...
This can be used in javaScript to detect when the model has finished loading because the url has changed or the model has been reset.
2016-04-18 11:37:02 -07:00
Brad Hefta-Gaub
0520363da8
cleanup
2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
d1f6b371c9
cleanup
2016-04-18 10:27:12 -07:00
Brad Davis
b50f835d35
Warning and error fixes
2016-04-17 10:22:26 -07:00
Brad Davis
f3e5306f90
Working on an automated performance test
2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
8f3d48190a
switch to QRect instead of vec4
2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807
code review feedback
2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
54777c9cd5
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub
87078b1ea2
first cut at resetting entities script engine on domain change
2016-04-16 11:09:23 -07:00
David Rowe
8f6cfb72ea
Fix QML warnings at shutdown
2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
04df84974c
handle repositioning of qml windows
2016-04-15 19:50:12 -07:00
Zach Pomerantz
d96c97cdb4
Cleanup stars to persist BufferView
2016-04-15 16:40:02 -07:00
samcake
298300e42f
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-15 14:16:02 -07:00
Brad Hefta-Gaub
c7f58dc17c
first cut at exposing recommend overlay rectangle
2016-04-14 20:47:31 -07:00
Zach Pomerantz
f803ecd2e7
Merge pull request #7633 from Atlante45/fix/shared-resource
...
Fix raw pointers in shared resource cache items
2016-04-14 17:52:04 -07:00
Atlante45
4ed8573f74
CR
2016-04-14 17:28:24 -07:00
Brad Hefta-Gaub
ea4da05cba
Merge pull request #7643 from AndrewMeadows/faster-bullet
...
faster Bullet kinematics
2016-04-14 12:16:54 -07:00
Brad Hefta-Gaub
c9b0531f55
Merge pull request #7662 from zzmp/fix/model-anim-cache
...
Use AnimationCache for models
2016-04-14 12:16:32 -07:00
Andrew Meadows
dcf28937cf
cleanup cached Physics::sessionUUID
2016-04-14 11:18:10 -07:00
Zach Pomerantz
e80898f095
Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache
2016-04-14 10:12:16 -07:00
Ryan Huffman
e76ed6f73a
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-handling
2016-04-14 09:47:03 -07:00
Brad Hefta-Gaub
7b5075cce5
Merge pull request #7645 from sethalves/dont-run-bullet-too-soon
...
add a heuristic for deciding when it's safe to enable bullet
2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
285ebe8ec5
Merge pull request #7655 from sethalves/dont-spam-about-expired-actions
...
don't flood log with messages about expired actions
2016-04-14 09:32:56 -07:00
Brad Hefta-Gaub
623bfa3c35
Merge pull request #7653 from hyperlogic/tony/avatar-meta-item-bound-fix
...
Fix for occasional invisible avatars
2016-04-14 09:32:46 -07:00
Brad Hefta-Gaub
37dcfdad8a
Merge pull request #7652 from huffman/feat/crash-menu
...
Move crash menu items to submenu and add new crash types
2016-04-14 09:32:36 -07:00
Seth Alves
ba0549dddd
Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon
2016-04-14 09:18:58 -07:00
samcake
6c3e011b89
Expose cleanely the 3 different techniques
2016-04-14 02:43:28 -07:00
samcake
41d4d3b2d7
Providing a cleaner way to try different paths and exploring a simpler way
2016-04-13 19:21:17 -07:00
Chris Collins
47522e1774
Merge pull request #7659 from ZappoMan/newLODSettings
...
improve reset settings
2016-04-13 16:49:22 -07:00
Zach Pomerantz
7a15339631
Use AnimationCache for models
2016-04-13 15:44:47 -07:00
Ryan Huffman
47c2a1722b
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu
2016-04-13 14:40:46 -07:00
Ryan Huffman
bc247ec058
Remove unused Application::crashApplication()
2016-04-13 14:01:41 -07:00
Howard Stearns
f24c2c7714
Merge pull request #7657 from ZappoMan/avatarLicenseSupport
...
add support for avatar licenses in FST files
2016-04-13 14:01:37 -07:00
Brad Hefta-Gaub
0af47fd3d5
Merge pull request #7617 from jherico/vr_menu
...
VR menu fixes
2016-04-13 13:53:36 -07:00
Brad Hefta-Gaub
9c437c0824
CR feedback
2016-04-13 13:36:28 -07:00
Brad Hefta-Gaub
67af3917bc
improve reset settings
2016-04-13 13:18:23 -07:00
Brad Hefta-Gaub
4b3b917af6
add support for avatar licenses in FST files
2016-04-13 12:26:09 -07:00
Ryan Huffman
2d39551a35
Fix style in CrashReporter.cpp
2016-04-13 10:56:27 -07:00
Ryan Huffman
fa49c213cc
Add threaded crashes
2016-04-13 10:24:56 -07:00
Seth Alves
3288bff963
don't flood log with messages about expired actions. also, try to remove such actions
2016-04-13 09:47:07 -07:00
Brad Hefta-Gaub
93f8cfc80a
new default LOD settings, and support for reset settings without crashing
2016-04-13 09:26:01 -07:00
samcake
de4345bdc5
Trying to use several FBO instead to avoid changing the REnderBUffers for overlay but...
2016-04-13 01:27:57 -07:00
samcake
8800dd84f1
Trying to use several FBO instead to avoid changing the REnderBUffers for overlay but...
2016-04-13 01:25:46 -07:00
Anthony J. Thibault
97f836d3bb
Avatar: fix for avatar meta item bound.
...
* In the case where a SkeletonModel was renderable, but had not actually
created the render items yet, don't use the the rendererableMeshBound
for the meta render item, because it hasn't been computed yet! Instead
wait until the render items have been added to the scene before using
the more accurate bound...
2016-04-12 17:32:49 -07:00
Ryan Huffman
0c1277ae7a
Add CrashHelpers.h and add to separate submenu
2016-04-12 16:44:11 -07:00
Seth Alves
688de6f100
quiet warning
2016-04-12 14:10:14 -07:00
Atlante45
e45939d18f
Make sure ResourceCacheSharedItems deals with strong refs
2016-04-12 13:51:11 -07:00
Atlante45
afdfef1482
Make sure we don't use raw resource ptr
2016-04-12 13:51:11 -07:00
Seth Alves
e4c91e5064
add a heuristic for deciding when it's safe to enable bullet
2016-04-12 11:46:00 -07:00
Brad Davis
3349093908
Fix vr menu login item update
2016-04-12 11:15:06 -07:00
Brad Hefta-Gaub
83494c4a96
Merge pull request #7594 from huffman/feat/include-rolled-logs-bugsplat
...
Add rolled log files to BugSplat
2016-04-12 08:33:17 -07:00
Brad Hefta-Gaub
3f05ded932
Merge pull request #7611 from zzmp/guard/amd
...
Disable gradient QML items on AMD
2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub
a1fe6aee6d
Merge pull request #7625 from hyperlogic/tony/third-person-hmd-camera-improvements
...
Improve comfort of third-person HMD camera.
2016-04-12 08:32:23 -07:00
Brad Hefta-Gaub
c5840f217a
Merge pull request #7630 from jherico/fps_fix
...
Fix FPS counter
2016-04-12 08:31:58 -07:00
Ryan Huffman
2dfe96a654
Cleanup headers
2016-04-11 14:50:28 -07:00
Ryan Huffman
afe502e1d2
Fix typo
2016-04-11 14:43:05 -07:00
Ryan Huffman
02a17c4497
Fix commented out code
2016-04-11 14:38:29 -07:00
Ryan Huffman
9faeb13ae9
Remove error testing code
2016-04-11 14:38:19 -07:00
Ryan Huffman
63aee23bf1
Move crash testing to CrashHelpers.h
2016-04-11 14:29:16 -07:00
Ryan Huffman
316d533d19
Update crash reporting to cover a larger area
2016-04-11 13:50:42 -07:00
Zach Pomerantz
ab72d8d8fb
Init QML GL from share context
2016-04-11 13:47:45 -07:00
Brad Davis
df8ad57185
Fix FPS counter
2016-04-11 00:25:16 -07:00
Anthony J. Thibault
93a5bdd79a
Prevent avatar rotation due to HMD head turning in third-person camera.
...
Also, fix one frame glitch during snap turning, by updating the sensorToWorld matrix
after the MyAvatar::updateOrientation rotates the avatar, but before we perform IK.
2016-04-08 15:27:43 -07:00
Anthony J. Thibault
711a1b8c7d
Avatar: update renderItems when avatar position or render mesh is in the frustum.
...
Previously, when render mesh was visible the renderItems they were not updated with the latest avatar mixer joints rotations and position.
This would result in a frozen avatar being visible.
Now the renderItems are updated when the render mesh is in the frustum or the bounding sphere around the avatar position is visible.
2016-04-08 13:14:50 -07:00
Ryan Huffman
6232c82f66
Update BugSplat to only send first and last log files
2016-04-08 09:39:25 -07:00
Ryan Huffman
2d60a9a51e
Reduce log size limit from 1MB to 512KB
2016-04-08 09:39:08 -07:00
Zach Pomerantz
e08c9db469
Expose GL property to QML
2016-04-07 18:27:07 -07:00
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
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 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
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
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
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
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
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
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
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
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
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
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
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
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
Brad Hefta-Gaub
b76f8509aa
Merge branch 'master' of https://github.com/highfidelity/hifi into optimizeFindZones
2016-03-30 19:29:28 -07: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
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
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
howard-stearns
5381be6902
Whitespace
2016-03-29 17:06:19 -07:00
howard-stearns
4ebf816166
cleanup
2016-03-29 16:17:19 -07: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
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
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
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
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
Zach Pomerantz
5d306a74d5
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
2016-03-25 10:09:37 -07:00
Brad Hefta-Gaub
fb09ad51b3
CR feedback
2016-03-24 21:14:07 -07: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
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
Brad Hefta-Gaub
8691aa6905
fix unix build and CR feedback
2016-03-24 15:45:44 -07:00
Brad Davis
520cccb219
Make display plugin switching atomic from other threads
2016-03-24 15:19:46 -07:00
Brad Hefta-Gaub
deed643ca7
add additional tracking of max elapsed
2016-03-24 13:30:39 -07:00
Anthony J. Thibault
ba4520fe56
Avatar: fix for Avatar animation updates while wearing HMD
...
The boundingSphere vs frustum check now uses the displayViewFrustum, which
more accurately reflects the actual projection matrix used for rendering.
2016-03-24 13:23:30 -07:00
Brad Hefta-Gaub
208b594ef8
make the deadlock watchdog more generous and add some logging so we can see heatbeats on slow machines
2016-03-24 12:37:07 -07:00
Zach Pomerantz
3e9e083df5
Update users of NetworkGeometry
2016-03-24 11:35:41 -07:00
Ozan
003af03b33
Merge pull request #7400 from Menithal/default-use-pre-post
...
Set UserAnimPreAndPostRotations true by Default
2016-03-24 09:57:03 -07:00
Brad Hefta-Gaub
2b0670718f
Merge pull request #7449 from howard-stearns/report-previous-session-data
...
Report previous session data
2016-03-23 20:58:51 -07:00
Anthony J. Thibault
de3144cde5
Merge branch 'master' into tony/vive-rendering-work
2016-03-23 18:13:59 -07:00
Anthony J. Thibault
0ef5c45815
DeadlockWatchdogThread: bumped up age from 10 to 15 seconds.
...
This will, hopefully, prevent false positives from people loading content on slow PCs.
2016-03-23 17:59:54 -07:00
Howard Stearns
a393f36978
Forgot important comment.
2016-03-23 17:31:21 -07:00
Howard Stearns
c09c1438f8
ivar init order.
2016-03-23 17:28:54 -07:00
Philip Rosedale
e1f3665185
Merge pull request #7435 from hyperlogic/tony/all-jitter-must-die
...
MyAvatar: fix jitter in hands when moving
2016-03-23 17:28:47 -07:00
Anthony J. Thibault
cec6e7dd8d
Application: reduced idle PROFILE_RANGE spam
2016-03-23 17:12:48 -07:00
howard-stearns
dbdf79f96f
Restore whitespace so there aren't superfluous diffs.
2016-03-23 17:01:50 -07:00
howard-stearns
c435ca212a
Report previous session time.
2016-03-23 16:59:17 -07:00
Anthony J. Thibault
0d37515784
Merge branch 'master' into tony/vive-rendering-work
2016-03-23 15:59:59 -07:00
howard-stearns
550738776c
Pass whether or not previous session crashed to the UserActivityLogger.
2016-03-23 15:56:29 -07:00
Anthony J. Thibault
df187499ff
MyAvatar: fix jitter in hands when moving
...
Store hand controller positions within the avatar in sensor space, not world space.
Before IK the sensorToWorld matrix is updated to reflect the world space motion of the
character controller during physics. This ensures the IK hand targets move properly with the character.
2016-03-22 19:19:52 -07:00
Zach Pomerantz
9c11474dd7
Expose qApp->updateHeartbeat
2016-03-22 17:17:36 -07:00
Anthony Thibault
50ac101d56
Avatar and Rig NSIGHT instrumentation
2016-03-22 10:36:32 -07:00
Anthony Thibault
9faccabf0d
Merge branch 'master' of https://github.com/highfidelity/hifi into tony/vive-rendering-work
2016-03-21 21:55:53 -07:00
Anthony Thibault
225c462685
Improved NSIGHT instrumentation
...
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
2016-03-21 21:47:59 -07:00
Philip Rosedale
6b3a4eb327
Merge pull request #7419 from hyperlogic/tony/no-locks-no-problem
...
Prevent deadlocks in AvatarUpdate
2016-03-21 17:54:27 -07:00
Stephen Birarda
6b28523cb5
don't release the OPP processed packet
2016-03-21 16:29:18 -07:00
Anthony J. Thibault
7cab8f63fb
Merge branch 'master' of github.com:highfidelity/hifi into tony/no-locks-no-problem
2016-03-21 16:03:33 -07:00
Brad Hefta-Gaub
a6bf84b90e
Merge pull request #7399 from zzmp/fix/qml-thread
...
Move QML rendering to a defined thread
2016-03-21 15:31:42 -07:00
Anthony J. Thibault
0f31c3da10
Application: guard idle from being called within paintGL()
2016-03-21 15:21:16 -07:00
Anthony J. Thibault
ce47f83288
Prevent deadlock if idle is called during rendering
...
This extraordinary event can occur if a MessageBox is popped up by the opengl driver.
* removed AvatarData::avatarLock
* removed AvatarUpdate
This code was left over from an earlier avatar threading experiment.
Removed AvatarData avatarLock and AvatarUpdate class
2016-03-21 15:11:15 -07:00
Andrew Meadows
0a00436700
Merge pull request #7411 from ZappoMan/fixBlenderCrashRedux
...
Fix blender crash redux
2016-03-21 15:04:22 -07:00
Andrew Meadows
47c4b226ea
Merge pull request #7395 from hyperlogic/tony/openvr-crash-on-exit
...
openvr crash on exit fix
2016-03-21 13:04:45 -07:00
Brad Hefta-Gaub
492e71345a
Revert "Revert "Fix ModelBlender crash""
...
This reverts commit f274cdcc7f
.
2016-03-21 11:42:25 -07:00
Zach Pomerantz
d3d0f229aa
Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread
2016-03-21 11:25:14 -07:00
Brad Hefta-Gaub
091e34e792
Merge pull request #7396 from AndrewMeadows/do-not-trust
...
prevent crash in SwingTwistConstraint
2016-03-21 11:13:41 -07:00
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00