Brad Davis
f569cbf70e
Add debugging output, fix timewarp
2016-03-30 10:40:32 -07:00
Brad Davis
8123617fe1
Improve failure detection logging
2016-03-30 10:40:31 -07:00
Brad Davis
80d397555d
Fixing input API, DLL path for Oculus
2016-03-30 10:40:30 -07:00
Brad Davis
78626f7938
Add warning logging if we can't find a 1.x Oculus dll
2016-03-30 10:40:29 -07:00
Brad Davis
bd9813bbf5
Only enable the Oculus plugin in the presence of the 1.x runtime
2016-03-30 10:40:29 -07:00
Brad Davis
d056c41e25
Update to latest Oculus SDK, add input device support
2016-03-30 10:40:28 -07:00
samcake
11b6952eff
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-30 09:49:17 -07:00
samcake
b492c4b52c
DUmb fix to the flickering issue by overshooting the inside volume of the light and avoid the failing region
2016-03-30 09:32:40 -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
Seth Alves
bd5757d586
Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts
2016-03-29 18:33:22 -07:00
Seth Alves
7c0bb72aff
started on making ~ mean the application directory in script paths
2016-03-29 18:32:46 -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
samcake
be27eaff24
Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights
2016-03-29 17:51:24 -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
Seth Alves
537c6fa3c6
fix indentation
2016-03-29 15:39:42 -07:00
Seth Alves
2ad02941e4
lowercase filenames/paths before they go into _treeNodes to avoid scripts being unstoppable
2016-03-29 15:38:11 -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
Seth Alves
9d8e01f2a5
lock entity-tree before moving entity-children of avatars
2016-03-29 15:01:23 -07:00
Zach Pomerantz
6c7b6cd62e
Return parsed tex directly as variant
2016-03-29 14:16:22 -07:00
Seth Alves
51cf854863
cleanups
2016-03-29 13:45:09 -07:00
Seth Alves
0c72ca1be3
works on windows now
2016-03-29 13:39:35 -07:00
howard-stearns
4a28dadae5
Working, but not cleaned up.
2016-03-29 13:26:50 -07:00
Stephen Birarda
b9ce427344
use c-style casts to respect the coding standard
2016-03-29 13:25:03 -07:00
Stephen Birarda
37950e9931
use explicit double casts for win_high_resolution_clock
2016-03-29 13:13:22 -07:00
Seth Alves
3aa1090ced
working toward allowing local files in running-scripts window
2016-03-29 11:58:21 -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
Seth Alves
b88770228e
convert running-scripts window to use local script files
2016-03-29 10:40:56 -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
Seth Alves
442339bbc3
Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts
2016-03-29 09:39:50 -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
Seth Alves
4f65f26717
Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts
2016-03-28 20:26:23 -07:00
Anthony J. Thibault
940f3e636d
Merge branch 'master' into tony/animated-culling
2016-03-28 19:58:38 -07:00
