Commit graph

41396 commits

Author SHA1 Message Date
Stephen Birarda
d8b0dbf3bf fix indentation for last inactive check timestamp 2016-03-30 16:58:35 -07:00
Stephen Birarda
4210bc178e default the inactive timestamp for healthy startup 2016-03-30 11:44:55 -07:00
Stephen Birarda
e5adfc40b2 use the inactivity timer for ice-server lockup check 2016-03-30 11:42:41 -07:00
Stephen Birarda
92e9e6a3fa use the NetworkAccessManager to get a single QNetworkAccessManager 2016-03-30 11:35:41 -07:00
Stephen Birarda
1771875186 use one QNetworkAccessManager for the ice-server 2016-03-30 11:31:46 -07:00
Stephen Birarda
24acf7584a don't respond to http other than /status 2016-03-30 11:10:14 -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
Brad Hefta-Gaub
32308c7810 Merge pull request #7501 from zzmp/fix/parse-tex
Respond to error from free in texture parsing
2016-03-30 08:53:15 -07:00
Brad Hefta-Gaub
15a042cef1 Merge pull request #7506 from zzmp/fix/gl-reset-pipelines
Fix ordering of GL backend state reset commands to Field key
2016-03-29 23:29:14 -07:00
Brad Hefta-Gaub
92ddf9d7ac Merge pull request #7507 from AndrewMeadows/broken-time-machine
fix "deadlock" when setting clock backwards
2016-03-29 19:38:45 -07:00
Brad Hefta-Gaub
d63728bd55 Merge pull request #7502 from huffman/fix-asset-client
Fix bug where a pending asset request could receive a pending message after deletion
2016-03-29 18:15:03 -07:00
Brad Hefta-Gaub
8a47c5a35f Merge pull request #7504 from zzmp/log/building-web-surface
Log OffscreenQml lifetime
2016-03-29 18:11:16 -07:00
howard-stearns
5381be6902 Whitespace 2016-03-29 17:06:19 -07:00
howard-stearns
86a77d4f55 Remove unused/non-existent include. 2016-03-29 16:55:17 -07:00
howard-stearns
eef9de4d4f Remove obsolete remapIDs. 2016-03-29 16:28:02 -07:00
howard-stearns
4ebf816166 cleanup 2016-03-29 16:17:19 -07:00
Zach Pomerantz
6ae03fe72e Sync ordering of gl fields/reset commands 2016-03-29 15:52:29 -07:00
Zach Pomerantz
ad9027f9d6 Log OffscreenQml lifetime 2016-03-29 15:26:22 -07:00
Brad Hefta-Gaub
a9995a8790 Merge pull request #7500 from zzmp/fix/queue-model-geo-get
Update model URL on render thread
2016-03-29 15:21:46 -07:00
howard-stearns
bcb729eac2 Abstract out globalizeProperties. 2016-03-29 15:21:06 -07:00
Zach Pomerantz
6c7b6cd62e Return parsed tex directly as variant 2016-03-29 14:16:22 -07:00
howard-stearns
4a28dadae5 Working, but not cleaned up. 2016-03-29 13:26:50 -07:00
Ryan Huffman
96a35a8f43 Fix bug where a pending asset request could receive a pending message after deletion 2016-03-29 11:33:02 -07:00
Zach Pomerantz
848e7703ee Test textures emptiness correctly 2016-03-29 10:50:27 -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
Zach Pomerantz
29dedd5524 Update model URL on render thread 2016-03-29 10:42:40 -07:00
Anthony J. Thibault
80dfed77d7 Fix for flickering eyeballs
Calling glm::axis() on an identity quaternion does not result in a normalized vector.
This vector was used within Rig::updateEyeJoint() to limit the rotation of the eye balls,
to prevent the eyes from rolling back into the avatar's head.

If the avatar was looking straight ahead, this could result in bad quaternions in the eye ball
joint matrices, which in turn would cause the eye ball mesh or any mesh influenced by the eyeball joints
not to render.
2016-03-29 10:01:10 -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
24ca5b3d60 Update after merge changes to NetworkGeometry.
Also cleaned up API for ModelMeshPartPayload::updateTransformForSkinnedMesh() to pass a QVector const ref, instead of a raw pointer and a size.
2016-03-28 20:29:02 -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
Brad Hefta-Gaub
9bcc13d4a8 Merge pull request #7497 from samcake/orange
Fix import for local file.qml tfrom another qml
2016-03-28 18:44:25 -07:00
samcake
884a3e691d Cleaning up moved files 2016-03-28 18:38:34 -07:00
samcake
a815c50fca fixing the qml component 2016-03-28 18:36:17 -07:00
Atlante45
807698f0bb Make svo loading use ResourceManager 2016-03-28 18:07:48 -07:00
samcake
95418e25c0 Try to fix the iinclude for the PerfPlot/qml 2016-03-28 17:46:19 -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
howard-stearns
b09b9a4a0a snapshot after using tree from entity item. 2016-03-28 16:58:20 -07:00
samcake
b34ab28c22 Merge pull request #7456 from zzmp/feat/geocaching
Add model caching
2016-03-28 16:28:40 -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
db13b15337 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 14:26:18 -07:00
howard-stearns
7a066afa26 Checkpoint for freakin edit.js again. 2016-03-28 14:25:51 -07:00
Clément Brisset
b6ce7a7db8 Merge pull request #7492 from birarda/next-packet-delta
fix for incorrect next packet delta in udt::SendQueue
2016-03-28 14:12:04 -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