Andrew Meadows
45c846572e
Merge pull request #5645 from jherico/maggie
...
Fixing problems reported by static analysis tool
2015-08-26 08:31:05 -07:00
Brad Hefta-Gaub
029c59fb77
Merge pull request #5654 from jherico/barney
...
Fix stereo modes aspect ratio
2015-08-25 22:16:30 -07:00
Brad Hefta-Gaub
5d5c1584c3
Merge pull request #5659 from jherico/nelson
...
Fix UserInputMapper event generation
2015-08-25 22:14:37 -07:00
samcake
fda9827100
Merge pull request #5529 from SeijiEmery/gputest
...
gputest
2015-08-25 20:03:08 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
073567558e
Fix UserInputMapper event generation
2015-08-25 19:15:06 -07:00
Brad Davis
f176003dad
Fixing aspect ratio on stereo plugins
2015-08-25 19:05:31 -07:00
Brad Davis
f9f5743fd7
Merge pull request #5650 from ZappoMan/fixCrashInController
...
Fix a couple crashes in the Controller scripting interface
2015-08-24 18:49:50 -07:00
Brad Hefta-Gaub
53ae958c74
Merge pull request #5643 from hyperlogic/tony/renderable-particle-crash-fix
...
Fix for RenderableParticleEffectEntity crash.
2015-08-24 17:44:39 -07:00
Brad Hefta-Gaub
13a9dc4df2
cleanup controller interface, add getActionNames() and getDeviceNames()
2015-08-24 15:35:55 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
Seiji Emery
4d9f45475e
Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
2015-08-24 14:38:26 -07:00
Brad Hefta-Gaub
6549e47dbc
fix crash in Controller when asking for device name out of bounds
2015-08-24 14:35:19 -07:00
Anthony J. Thibault
47b8ab373c
Fix for RenderableParticleEffectEntity crash.
...
The render item payload now keeps a shared_ptr to the entity.
2015-08-24 11:15:30 -07:00
Brad Davis
78a08ed7c7
Merge pull request #5641 from thoys/20660
...
CR for Job #20660 - Render the world Axis markers into negative space, add view option
2015-08-24 10:16:56 -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
Nex Pro
8d8a9535a0
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-24 16:07:38 +01:00
Nex Pro
3f4323e084
Added overload for renderDashedLine
2015-08-24 16:07:07 +01:00
Thijs Wenker
0f8cf80d45
Merge branch 'master' of https://github.com/worklist/hifi into 20660
2015-08-23 19:53:50 +02:00
Nex Pro
ad315cf68a
Merge branch '20660' of github.com:thoys/hifi into 20660
...
Conflicts:
interface/src/Util.cpp
2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369
Modified the world box to render axes in negative space
...
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
2015-08-23 16:21:20 +01: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
fe44442ffe
Merge pull request #5577 from vastcharade/horizAmbOcclPerf
...
Horiz amb occl performance updates
2015-08-22 12:39:51 -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
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
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
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
d89ecc1e42
Move WebSocketServer to be accessable from Assignment-Client:Agent only.
2015-08-21 22:43:49 +02: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
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
ZappoMan
270463fc4e
restore new oculus detect code from master
2015-08-21 09:29:25 -07:00
ZappoMan
75aff2f281
fix atmosphere rendering
2015-08-21 00:29:28 -07:00
Brad Davis
cc037c8828
Fix culling calculations in HMD with new stereo mechanism
2015-08-21 00:29:27 -07:00
