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
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
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
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
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
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
Howard Stearns
f26849c7e1
Proper HMD scaling.
2015-08-20 12:34:50 -07:00
Howard Stearns
ce1cc83a9e
Merge pull request #5612 from birarda/audio-position-change
...
make sure .options works from scripted AudioInjector
2015-08-20 12:31:06 -07:00
Stephen Birarda
e93b360908
expose options property to AI script interface
2015-08-20 12:12:43 -07:00
Thijs Wenker
7f5fc64f6c
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-20 21:09:22 +02:00
Brad Hefta-Gaub
8d256a8e9c
Merge pull request #5611 from huffman/edit-bounds
...
Fix edit.js to warn when creating entities outside of positive world bounds
2015-08-20 11:46:18 -07:00
Sam Gateau
84d244ec52
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-08-20 11:33:18 -07:00
Ryan Huffman
f834418384
Fix edit.js to warn when creating entities outside of world bounds
2015-08-20 11:23:16 -07:00
Brad Davis
1cede8f88d
Merge pull request #5610 from ZappoMan/noDirectModeHMDTools
...
don't show hmd tools for direct mod HMDs
2015-08-20 11:05:04 -07:00
Brad Hefta-Gaub
0e506fa663
Merge pull request #5608 from jherico/marge
...
Add fullscreen menu item to 2D display plugin
2015-08-20 11:02:34 -07:00
Stephen Birarda
aac15e52bb
add explicit cast to double for uptime
2015-08-20 10:19:34 -07:00
Seth Alves
0ac885da80
fix when memory debugging message is printed
2015-08-20 10:17:13 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Stephen Birarda
08c810baad
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-08-20 10:04:56 -07:00
ZappoMan
cd050b2e60
don't show hmd tools for direct mod HMDs
2015-08-20 09:53:58 -07:00
Andrew Meadows
48ff54300b
Merge pull request #5607 from jherico/maggie
...
Make sure that items added via plugins can be removed as well
2015-08-20 08:02:08 -07:00
Leonardo Murillo
129761c002
making qtimer interval a const
2015-08-20 08:10:19 -06:00
