samcake
71fa898654
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-05 09:45:45 -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
samcake
dca642256f
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-04 18:25:49 -07:00
samcake
d3a87f8db2
need to merge, commiting at a broken state
2016-04-04 18:25:23 -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
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
howard-stearns
b5cbd7720e
Lock entity tree on export, and clipboard on import.
2016-04-01 14:56:56 -07:00
Stephen Birarda
ee7bee95f8
use nodeActivated to trigger refresh of Asset Browser
2016-04-01 11:35:33 -07:00
Stephen Birarda
194226103c
refresh the Asset Browser when switching domains
2016-04-01 11:13:59 -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
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
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
howard-stearns
bcb729eac2
Abstract out globalizeProperties.
2016-03-29 15:21:06 -07:00
howard-stearns
4a28dadae5
Working, but not cleaned up.
2016-03-29 13:26:50 -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
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
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
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
Brad Hefta-Gaub
f7e6f60e87
one more crack at fixing false deadlock
2016-03-25 19:04:01 -07:00
Brad Hefta-Gaub
fe31be71eb
protect against unexpected rollover
2016-03-25 14:59:43 -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
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
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
