MarcelEdward
9b70605381
Update readme.txt
2015-09-15 00:29:12 +02:00
MarcelEdward
a53d244d33
Create ConnexionClientAPI.h
2015-09-15 00:28:17 +02:00
MarcelEdward
96f20957c3
Create ConnexionClient.h
2015-09-15 00:27:45 +02:00
MarcelEdward
3ab63ba613
Update Find3DConnexionClient.cmake
...
The space navigator stopped working, this hopefully will fix it.
The framework is 3DconnexionClient.framework for osx, not sure why connexion named it that way. It is a library in /Library/Frameworks, the library name is in stone.
for apple, this works in cmake/modules/Find3DConnexionClient.cmake
find_library(3DConnexionClient 3DconnexionClient)
And for windows it has to find the I3dMouseParams.h file in interface/external/3dconnexionclient/includes.
So for windows the line in Find3DConnexionClient.cmake has to be:
hifi_library_search_hints("3dconnexionclient")
2015-08-22 22:48:51 +02:00
MarcelEdward
2abc0700ff
Merge pull request #6 from highfidelity/master
...
sync fork
2015-08-22 22:44:43 +02: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
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
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
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
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
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
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
Brad Davis
1e074ab81c
Remove superfluous clear
2015-08-21 00:29:28 -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
Brad Davis
476e5edb32
Fixing HMD wobble
2015-08-21 00:29:26 -07:00
ZappoMan
62e8ec3fdf
add fullscreen menu item and rename side by side stereo plugin
2015-08-21 00:29:26 -07:00
Brad Davis
7fb491e48c
Cleanup plugin interface, break up oculus plugins
2015-08-21 00:29:25 -07:00
Brad Davis
76f236adf6
New stereo rendering implementation
2015-08-21 00:29:24 -07:00
Brad Davis
f6f189c4b8
Merge pull request #5609 from murillodigital/master
...
Better handling of socket binding
2015-08-21 00:22:19 -07:00
Brad Davis
89d2fc35ff
Merge pull request #5613 from howard-stearns/eye-correction
...
HMD eye correction
2015-08-21 00:20:00 -07:00
Brad Davis
c3991dbb8c
Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor
...
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
2015-08-20 23:57:16 -07:00
Brad Davis
1e5f9b0442
Merge pull request #5624 from PhilipRosedale/master
...
First pass, grenade and basketball toys.
2015-08-20 23:56:44 -07:00
Philip Rosedale
cee570d2b2
First pass at basketball, just appears in front of you with some reasonable values
2015-08-20 23:06:05 -07:00
Philip Rosedale
7284e3aa3c
added a little bit of spin, too.
2015-08-20 22:20:51 -07:00
