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
Seth Alves
fdad8fc651
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-21 13:19:19 -07: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
Seth Alves
9937416729
attempt to move some time-consuming polyvox stuff off of the main thread
2015-08-21 11:23:13 -07:00
Thijs Wenker
d3a6833133
delete WebSockets on ScriptEngine finish
2015-08-21 20:20:50 +02:00
Seth Alves
105470bf26
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-21 11:02:16 -07:00
Seth Alves
2c840ae0cc
change default polyvox surface to edged-cubic and turn some voxels on when a polyvox is first rezzed
2015-08-21 11:02:11 -07:00
Seth Alves
6db0442fda
allow for asynchronous building of collision shape
2015-08-21 10:48:26 -07: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
David Rowe
b1db7e5ed2
Make WebWindow hyperlinks with target="_blank" open in user's browser
2015-08-21 10:28:47 -07: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
Philip Rosedale
ef4ad3107e
First pass, grenade toy. Needs art.
2015-08-20 22:11:11 -07:00
Brad Davis
b635ddc7f9
Merge pull request #5623 from ZappoMan/fullScreenMenuFix
...
Hide Menubar on non-mac OS when going to fullscreen
2015-08-20 21:44:31 -07:00
ZappoMan
bd29fb2474
fix ifdef
2015-08-20 19:33:39 -07:00
ZappoMan
06b2a88fb6
toggle menu near top of window
2015-08-20 19:33:22 -07:00
ZappoMan
9f501d4d72
first cut at attempting to hide menu in full screen
2015-08-20 19:33:06 -07:00
Brad Davis
8c7711168c
Merge pull request #5603 from sethalves/linux-memory-debugger
...
memory debugging on linux
2015-08-20 19:19:24 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Howard Stearns
642e569033
Uncomment code that was commented out to simplify debugging.
2015-08-20 17:38:49 -07:00
Howard Stearns
ea02583875
Cleanup.
2015-08-20 17:33:10 -07:00
Howard Stearns
7a79abd278
Merge branch 'master' of https://github.com/highfidelity/hifi into eye-correction
2015-08-20 16:54:52 -07:00
Philip Rosedale
f2fd7dbd3c
Merge pull request #5617 from ctrlaltdavid/disable-eyelid-adjustment
...
Add menu item that disables adjusting eyelids to follow pupil
2015-08-20 16:44:11 -07:00
Howard Stearns
05f4145acb
Checkpoint. Working?
2015-08-20 16:28:40 -07:00
David Rowe
e9b3d48165
Add menu item that disables adjusting eyelids to follow pupil
...
Developer > Avatar > Disable Eyelid Adjustment
2015-08-20 16:10:31 -07:00
Brad Hefta-Gaub
6f3b34982e
Merge pull request #5614 from samcake/punk
...
Script improvments with render Engine debug.js
2015-08-20 15:00:16 -07:00
