13810 commits

Author	SHA1	Message	Date
Ryan Huffman	4105b7369c	Remove AssetScriptingInterface	2015-08-26 15:55:29 -07:00
Ryan Huffman	59b32751f0	Cleanup AssetScriptingInterface	2015-08-26 15:54:02 -07:00
Ryan Huffman	aed1ba31c4	Fix bugs in Menu.cpp	2015-08-26 12:26:24 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
Ryan Huffman	d90ceb200a	Add asset uploader to Menu	2015-08-26 09:27:50 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Brad Hefta-Gaub	b19f1e0631	Merge pull request #5658 from ctrlaltdavid/20653 ... Add Desktop object to JavaScript with width and height properties	2015-08-25 23:18:20 -07:00
Brad Hefta-Gaub	1cd699de9d	Merge pull request #5657 from birarda/master ... fix for 0 entity avg ping	2015-08-25 22:27:44 -07:00
Brad Davis	f176003dad	Fixing aspect ratio on stereo plugins	2015-08-25 19:05:31 -07:00
David Rowe	9d3d104ec3	Add Desktop object to JavaScript with width and height properties	2015-08-25 16:13:36 -07:00
Ryan Huffman	dc5d5cbb63	Add asset server ping to stats	2015-08-25 15:06:40 -07:00
Stephen Birarda	6f14eb2206	fix for 0 entity avg ping	2015-08-25 12:35:34 -07:00
Howard Stearns	6508d5943a	textChanged has to do something	2015-08-25 11:29:27 -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	34e32ddaeb	Merge pull request #5636 from howard-stearns/marketplace-avatars ... marketplace avatars	2015-08-24 17:49:20 -07:00
Brad Hefta-Gaub	5ea6d2704a	Merge pull request #5628 from ctrlaltdavid/webwindow-external-links ... Make WebWindow hyperlinks with target="_blank" open in user's browser	2015-08-24 17:45:35 -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
Brad Hefta-Gaub	275cdf9d8f	Merge pull request #5581 from larsnaesbye/master ... Preliminary da_DK translation of Interface	2015-08-24 10:36: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
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
Thijs Wenker	bbd6f25ff7	style fixes	2015-08-23 20:01:58 +02:00
Thijs Wenker	0f8cf80d45	Merge branch 'master' of https://github.com/worklist/hifi into 20660	2015-08-23 19:53:50 +02:00
Thijs Wenker	63f0173665	extend world boundaries	2015-08-23 19:52:29 +02:00
Brad Davis	b7237fb5ca	Fixing build problem with 3d connexion	2015-08-23 09:32:58 -07:00
Nex Pro	53a63fed79	Changed constants red, green, blue and grey to uppercase as per style guide.	2015-08-23 17:16:23 +01:00
Thijs Wenker	748625399e	"View -> World Axes" menu option	2015-08-23 17:59:58 +02:00
Thijs Wenker	b7f9bc13da	Merge branch '20660' of github.com:thoys/hifi into 20660	2015-08-23 17:52:51 +02:00
Nex Pro	0ef2def56e	changed default DASH_LENGTH and GAP_LENGTH to 1.0f	2015-08-23 16:52:12 +01:00
Thijs Wenker	9de35511fc	Merge branch '20660' of github.com:thoys/hifi into 20660	2015-08-23 17:50:28 +02:00
Nex Pro	3e8970cc1e	corrected declaration of float constants DASH_LENGTH and GAP_LENGTH as per style guide.	2015-08-23 16:49:39 +01:00
Thijs Wenker	90c8200d66	Merge branch '20660' of github.com:thoys/hifi into 20660	2015-08-23 17:44:43 +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	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
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
Howard Stearns	74fd640f16	Restore the ability to change avatars from the edit.js marketplace button.	2015-08-21 16:49:07 -07:00
Howard Stearns	b579b996c3	There was a hidden (and inappropriate) dependency on face model loading.	2015-08-21 15:07:39 -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
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 Davis	b8b0917d9d	Attempting to fix judder issues	2015-08-21 10:01:11 -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
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
Brad Davis	7fb491e48c	Cleanup plugin interface, break up oculus plugins	2015-08-21 00:29:25 -07:00