4116 commits

Author	SHA1	Message	Date
Stephen Birarda	fa0abe2972	resolve conflicts on merge with upstream/master	2015-08-31 10:51:12 -07:00
Stephen Birarda	1d6f43e0d0	cleaned up some warnings	2015-08-27 18:26:55 -07:00
Stephen Birarda	e3e529c4e5	resolve conflicts on merge with origin/protocol	2015-08-27 14:52:29 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Stephen Birarda	229015a5da	don't allow asset-server upload if no server present	2015-08-27 12:21:38 -07:00
Brad Hefta-Gaub	79a9694d4a	Merge pull request #5648 from ctrlaltdavid/20663 ... Clean Interface.ini after a crash	2015-08-27 10:52:25 -07:00
Ryan Huffman	4105b7369c	Remove AssetScriptingInterface	2015-08-26 15:55:29 -07:00
Brad Davis	270f2f7a3b	Fixing framerate limit, moving vsync to 2d plugin	2015-08-26 15:47:45 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
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
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 Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -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
Brad Hefta-Gaub	34e32ddaeb	Merge pull request #5636 from howard-stearns/marketplace-avatars ... marketplace avatars	2015-08-24 17:49:20 -07:00
David Rowe	f6cf77ae68	Add Developer > Display Crash Options menu item ... Is enabled by default. Disabling it stops the display of the crash handling options dialog at start-up.	2015-08-24 13:24:31 -07:00
David Rowe	9c782f6a6d	Display dialog of crash handling options at startup if Interface crashed ... Default option and Esc continue without taking any action.	2015-08-24 12:45:35 -07:00
David Rowe	63ad972576	Write and delete "application is running" marker file	2015-08-24 11:09:41 -07:00
David Rowe	07c9a0e2bb	Add Developer > Crash Interface menu item	2015-08-24 10:48:58 -07: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	748625399e	"View -> World Axes" menu option	2015-08-23 17:59:58 +02:00
Brad Davis	d3135dcfa6	Stereo rendering work	2015-08-22 16:15:10 -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
samcake	66087872a3	Merge pull request #5621 from highfidelity/stereo ... New stereo rendering mechanism	2015-08-21 11:23:14 -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
Brad Davis	76f236adf6	New stereo rendering implementation	2015-08-21 00:29:24 -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
ZappoMan	cd050b2e60	don't show hmd tools for direct mod HMDs	2015-08-20 09:53:58 -07:00
Brad Davis	9faf452196	Make sure that items added via plugins can be removed as well	2015-08-20 00:32:25 -07:00
ZappoMan	6a7f367e5f	fix throttled rendering for the 2D display plugin	2015-08-19 21:11:48 -07:00
Stephen Birarda	42a7262707	Merge pull request #5565 from murillodigital/node-version ... DO NOT MERGE - Node versioning	2015-08-19 13:32:48 -07:00
Ryan Huffman	5884fcb17b	Merge branch 'ordered-sending' into atp-server	2015-08-19 12:23:31 -07:00
Seth Alves	537b690d60	Merge pull request #5566 from howard-stearns/recapitate ... Get rid of separate head/body avatar	2015-08-19 10:46:05 -07:00
Philip Rosedale	eef556eeb2	Merge pull request #5593 from thoys/20528 ... CR for Job #20528 - Tool window unavailable in Windows Client.	2015-08-18 21:23:14 -07:00
Brad Davis	944734fed2	Remove focus highlight on delete entity	2015-08-18 13:59:39 -07:00
Stephen Birarda	0f77ab8611	resolve conflicts on merge with upstream/master	2015-08-18 11:45:55 -07:00
Thijs Wenker	44399da41c	Removed the minimize button from the tool window. Close it to hide it. Fixes bug where ToolWindow hides forever.	2015-08-18 14:54:21 +02:00
Seth Alves	e29bb9183b	minimize diff	2015-08-18 02:08:21 -07:00
Seth Alves	8435550fe9	only update simRate once per second	2015-08-18 02:05:50 -07:00
Seth Alves	551f0aaba3	show how many times per second Application::idle is called	2015-08-18 01:41:17 -07:00
Brad Davis	3cbbb5fb79	Fix crash on mouse click	2015-08-18 00:05:02 -07:00
Brad Davis	cb5f80bf78	Add highlighting of keyboard focused items	2015-08-17 17:11:26 -07:00