13805 commits

Author	SHA1	Message	Date
Howard Stearns	8e3d8cd31c	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-26 16:08:42 -07:00
Howard Stearns	475331a97d	Sprinkle locks everywhere.	2015-08-26 16:08:07 -07:00
Brad Davis	8cd13cad00	Merge pull request #5661 from sethalves/linux-memory-debugger ... call setup_memory_debugger from common macros rather than from everywhere	2015-08-26 15:43:08 -07:00
Seth Alves	d2eb3108d5	Merge pull request #5644 from howard-stearns/eye-correction-application ... eye correction correction	2015-08-26 14:46:48 -07:00
Howard Stearns	0e18395fd0	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-26 12:04:28 -07:00
Howard Stearns	54877cdd47	Use GenericThread, and use usleep instead of QTimer (which is incompatible with GenericThread).	2015-08-26 11:59:12 -07:00
Howard Stearns	b0734a06f3	snapshot	2015-08-26 11:14:09 -07:00
Seth Alves	695ffa29c7	call setup_memory_debugger from common macros rather than from every CMakeLists.txt file	2015-08-26 11:09:59 -07:00
Brad Hefta-Gaub	aa80fc9127	Merge pull request #5653 from jherico/homer ... Remove items from the VR menu properly	2015-08-26 09:14:48 -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
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
Howard Stearns	38bc8634de	displayPlugin is not thread safe, and switch from simulate rate to interval in prep for sleep.	2015-08-25 21:26:46 -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
Brad Davis	0aaa07a2de	Remove items from the QML version of the menu when they are removed from the main menu	2015-08-25 19:05:29 -07:00
Howard Stearns	b8ca604bf8	Checkpoint before GenericThread.	2015-08-25 16:17:50 -07:00
David Rowe	9d3d104ec3	Add Desktop object to JavaScript with width and height properties	2015-08-25 16:13:36 -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
Howard Stearns	2ca4768766	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-25 10:44:54 -07:00
Howard Stearns	2ed6900c7e	Clear the brush, clear the cobwebs, and set the other orientations now that we're clear on what coordinate system we're in.	2015-08-25 09:55:04 -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
Howard Stearns	828509e8eb	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-24 15:01:46 -07:00
Howard Stearns	476ca36460	final	2015-08-24 15:01:01 -07:00
Howard Stearns	57e4ff182d	Merge branch 'master' of https://github.com/highfidelity/hifi into eye-correction-application	2015-08-24 11:27:52 -07:00
Howard Stearns	484db87abc	Set head pitch before making downstream eye corrections.	2015-08-24 11:10:29 -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