Howard Stearns
484db87abc
Set head pitch before making downstream eye corrections.
2015-08-24 11:10:29 -07:00
Howard Stearns
a8bbd8d43f
Merge branch 'master' of https://github.com/highfidelity/hifi into howard-stearns-restore-body-indicators
2015-08-24 09:40:52 -07:00
Howard Stearns
bb91b17314
Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
...
Fix for animation resources
2015-08-24 08:13:33 -07:00
Andrew Meadows
1d7d5071ae
Merge pull request #5633 from howard-stearns/restore-body-indicators
...
Restore body indicators (e.g., lookAt vectors).
2015-08-23 15:46:57 -07:00
Brad Hefta-Gaub
0eaeb99064
Merge pull request #5640 from jherico/maggie
...
Fixing build problem with 3d connexion
2015-08-23 13:46:49 -07:00
Brad Davis
b7237fb5ca
Fixing build problem with 3d connexion
2015-08-23 09:32:58 -07:00
Howard Stearns
a1be458721
Merge branch 'master' of https://github.com/highfidelity/hifi into howard-stearns-restore-body-indicators
2015-08-23 09:30:16 -07:00
Brad Hefta-Gaub
53f9815f69
Merge pull request #5639 from jherico/maggie
...
Stereo rendering work
2015-08-22 20:48:54 -07:00
Brad Davis
d3135dcfa6
Stereo rendering work
2015-08-22 16:15:10 -07:00
Brad Hefta-Gaub
62d8b14b8b
Merge pull request #5635 from samcake/punk
...
Improve the light attenuation formulae
2015-08-22 15:49:59 -07:00
Brad Hefta-Gaub
2bca05fb2e
Merge pull request #5629 from ctrlaltdavid/displayname-assert
...
More temporary logging to track down cause of assert
2015-08-22 15:48:58 -07:00
Brad Hefta-Gaub
fe44442ffe
Merge pull request #5577 from vastcharade/horizAmbOcclPerf
...
Horiz amb occl performance updates
2015-08-22 12:39:51 -07:00
Howard Stearns
17800d04be
Merge branch 'restore-body-indicators' of https://github.com/howard-stearns/hifi into howard-stearns-restore-body-indicators
2015-08-22 10:05:15 -07:00
Philip Rosedale
2bfa121925
Merge pull request #5637 from hyperlogic/tony/fbx-texture-fix
...
Resource fix for textures in FBX files.
2015-08-21 22:20:18 -07:00
Anthony J. Thibault
80d3ae68c2
Removed redundant ends with ‘fbx’ check.
2015-08-21 22:11:53 -07:00
Anthony J. Thibault
04e7084743
Resource fix for textures in FBX files.
...
The baseTexturePath url for textures in FBXGeometry
should default to the same base url as the fbx file itself.
This error was introduced in my recent refactoring.
Textures embedded in FBXGeometries should be un-affected
by this change.
2015-08-21 21:44:15 -07:00
Ryan Huffman
e9517ef929
Merge pull request #5594 from thoys/20638
...
CR for Job #20638 - Scripting: WebSocket Implementation
2015-08-21 19:13:43 -07:00
Thijs Wenker
67e945b884
fix unit test
2015-08-22 03:32:53 +02:00
Thijs Wenker
d84cf1859c
hook up the WebSocket error event directly
2015-08-22 02:18:21 +02:00
Thijs Wenker
0e255f4f3e
properly exposed WebSocketClass::ReadyState to the ScriptEngine
2015-08-22 01:59:44 +02:00
Seth Alves
90483e7c97
Merge pull request #5632 from birarda/master
...
force the HTTPManager to listen on IPv4
2015-08-21 16:56:55 -07:00
Anthony J. Thibault
5e31d423b9
Removed some debugging statements
2015-08-21 16:55:08 -07:00
Thijs Wenker
9edba451eb
- remove webSockets from List after disconnect.
...
- leave it up to the QtScript to delete the WebSocket / WebSocketServer objects
2015-08-22 01:33:22 +02:00
Thijs Wenker
f512205f6f
add ability to include scripts from a relative path in assignment-client (for persistent scripts only)
2015-08-22 01:30:07 +02:00
Sam Gateau
518cf3be15
Improve the light attenuation formulae
2015-08-21 16:28:38 -07:00
Anthony J. Thibault
b7009b4631
Fix for animation resources
...
The problem was that the invokeMethod between the AnimationReader thread
and the main thread was failing, because FBXGeometry* wasn't a registered meta type.
So, I ended up normalizing the AnimationReader class to be more like GeometryReader,
in that it uses singles and slots to communicate success and failure, rather then
invokeMethod.
2015-08-21 16:09:06 -07:00
Andrew Meadows
e9047ac891
Merge pull request #5631 from howard-stearns/sixense-dev-build
...
Make sixense work in dev builds
2015-08-21 15:26:26 -07:00
Howard Stearns
b579b996c3
There was a hidden (and inappropriate) dependency on face model loading.
2015-08-21 15:07:39 -07:00
Stephen Birarda
4b95d54955
remove the explicit failure test
2015-08-21 14:55:24 -07:00
Stephen Birarda
0fbbfb77d1
exit with a code to indicate error
2015-08-21 14:42:05 -07:00
Stephen Birarda
3e4a05a57b
leave the listen check but queue Application quit
2015-08-21 14:30:41 -07:00
Stephen Birarda
34b3fb1c0c
Revert "force the HTTPManager to listen on IPv4"
...
This reverts commit 220ad189a0
2015-08-21 14:27:17 -07:00
Howard Stearns
ad0df3a47c
Make sixense work in dev builds (if you put the library in the documented place).
2015-08-21 14:21:49 -07:00
Stephen Birarda
220ad189a0
force the HTTPManager to listen on IPv4
2015-08-21 14:16:34 -07:00
Thijs Wenker
176d7372ad
add QWebSockets to assignment-client project (cmake)
2015-08-21 23:03:26 +02:00
Thijs Wenker
d89ecc1e42
Move WebSocketServer to be accessable from Assignment-Client:Agent only.
2015-08-21 22:43:49 +02:00
David Rowe
6ee22055fa
More temporary logging to track down cause of assert
2015-08-21 12:48:08 -07:00
samcake
66087872a3
Merge pull request #5621 from highfidelity/stereo
...
New stereo rendering mechanism
2015-08-21 11:23:14 -07:00
Thijs Wenker
d3a6833133
delete WebSockets on ScriptEngine finish
2015-08-21 20:20:50 +02:00
Thijs Wenker
c7346209fb
fix memory leak
2015-08-21 19:44:43 +02:00
Thijs Wenker
fd82f05307
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-21 19:29:38 +02:00
Brad Hefta-Gaub
cf3d84dbff
Merge pull request #5627 from jherico/homer
...
Attempting to fix judder issues
2015-08-21 10:28:22 -07:00
Thijs Wenker
e581a57320
WebSocket constructor could allow more then one parameter now, only the first one is used though.
2015-08-21 19:13:57 +02:00
Thijs Wenker
55fd847636
removed unused code, renamed UnitTest.ready() to UnitTest.done()
2015-08-21 19:07:33 +02:00
Brad Davis
b8b0917d9d
Attempting to fix judder issues
2015-08-21 10:01:11 -07:00
Brad Hefta-Gaub
72b1801b94
Merge pull request #5626 from ZappoMan/stereo
...
restore new oculus detect code from master
2015-08-21 09:30:03 -07:00
ZappoMan
270463fc4e
restore new oculus detect code from master
2015-08-21 09:29:25 -07:00
Andrew Meadows
0fb2390877
Merge pull request #5604 from birarda/master
...
report non-skewed uptime from domain-server
2015-08-21 09:16:21 -07:00
Andrew Meadows
fe2bdbec00
Merge pull request #5625 from ZappoMan/fixVSync
...
set vsync on startup
2015-08-21 09:15:57 -07:00
ZappoMan
a0552050b0
set vsync on startup
2015-08-21 08:23:18 -07:00
