5889 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	7db22ee8c2	Merge pull request #7477 from ericrius1/cowTipper ... Adds a cow which untips itself and moos when it collides with an entity	2016-04-01 13:08:41 -07:00
Brad Hefta-Gaub	95e0682012	Merge pull request #7446 from ctrlaltdavid/20855 ... Restyle entities editor	2016-04-01 13:07:58 -07:00
Brad Davis	cd548744f6	Merge pull request #7531 from ZappoMan/optimizeDepthReticle ... only do depth reticle depth check when the reticle is visible	2016-04-01 13:06:44 -07:00
Brad Hefta-Gaub	aee6fc9c8a	handle starting in HMD mode	2016-04-01 11:22:12 -07:00
Brad Hefta-Gaub	c36a5370e6	whitespace	2016-04-01 09:02:16 -07:00
Brad Hefta-Gaub	d5ecb99b16	switch to HMD preferred audio when mounting the HMD	2016-04-01 09:00:57 -07:00
David Rowe	b9054897f7	Merge branch 'master' into 20855	2016-04-01 17:32:47 +13:00
David Rowe	7d36ec9520	Miscellaneous fixes	2016-04-01 17:30:22 +13:00
Eric Levin	8176852503	removed extra space	2016-03-31 18:50:24 -07:00
Eric Levin	e0f843d6eb	removes extra space	2016-03-31 18:49:51 -07:00
David Rowe	1f0529b5ea	Miscellaneous fixes	2016-04-01 14:13:38 +13:00
David Rowe	b900fcbbf0	Back out attempt at fixing OSX styling	2016-04-01 12:43:30 +13:00
Brad Hefta-Gaub	bbca1ba6db	only do depth reticle depth check when the reticle is visible	2016-03-31 15:58:37 -07:00
Brad Davis	27406f5b21	Add texture stress test	2016-03-31 15:13:04 -07:00
David Rowe	a2953595a5	Tweak spinbox fields for large values	2016-04-01 10:23:39 +13:00
David Rowe	048865fb09	Style spin buttons	2016-04-01 09:55:27 +13:00
David Rowe	dbd6b9e90b	Use monospace font for textarea fields	2016-04-01 08:50:11 +13:00
Brad Hefta-Gaub	2e129a398f	add example script for testing	2016-03-31 09:37:03 -07:00
David Rowe	2ac9f282c7	Merge branch 'master' into 20855	2016-03-31 17:00:09 +13:00
David Rowe	31b96c75ca	Tidying	2016-03-31 16:53:03 +13:00
David Rowe	f584d4d00c	Style parent joint index property as a number	2016-03-31 16:49:11 +13:00
David Rowe	751a37a1ff	Arrange more properties in rows	2016-03-31 16:48:40 +13:00
David Rowe	13ab854a9d	Reduce space between collapsed sections ... In settings dialogs as well as entities editor.	2016-03-31 15:02:16 +13:00
David Rowe	382b05e00b	Make expand/collapse icon larger	2016-03-31 13:13:13 +13:00
David Rowe	4189f46156	Make input text color change to black when selected	2016-03-31 12:32:36 +13:00
David Rowe	ba43843340	Disable right-click context menu	2016-03-31 12:27:08 +13:00
samcake	6213e0859d	Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned	2016-03-30 15:07:45 -07:00
David Rowe	870636832f	Possible work-around for OSX font issues	2016-03-31 10:45:57 +13:00
samcake	f09593e106	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-03-30 14:16:16 -07:00
samcake	3cf2eeb4d5	IMproving the perfplot qml and adding 2 more info	2016-03-30 13:58:32 -07:00
David Rowe	3457d1c21e	Entities list fixes ... - Fix report of number of entities selected if have two selected - Don't show yellow focus highlight on row when first click it	2016-03-31 09:16:31 +13:00
David Rowe	510d167c87	Merge branch 'master' into 20855	2016-03-31 08:43:35 +13:00
howard-stearns	37e6fce30b	Disconnect menuItemEvent before setIsOptionChecked, and then reconnect.	2016-03-30 10:48:54 -07:00
David Rowe	0a83df2281	Fix textarea selection highlight	2016-03-30 19:25:45 +13:00
David Rowe	cfc5c36f05	Fix dropdowns	2016-03-30 19:16:04 +13:00
David Rowe	0b70da1581	Improve layout of scale controls	2016-03-30 19:02:28 +13:00
David Rowe	f4b9ffe26f	Reorder sections	2016-03-30 18:07:45 +13:00
David Rowe	fdf45e0134	Use "-group" classification for section expand and collapse	2016-03-30 17:34:31 +13:00
David Rowe	1c5e414c15	Reinstate original property "-section" classifications	2016-03-30 16:10:32 +13:00
samcake	be27eaff24	Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights	2016-03-29 17:51:24 -07:00
David Rowe	1cb08952ae	Merge branch 'master' into 20855 ... Conflicts: interface/resources/qml/ToolWindow.qml	2016-03-30 12:01:45 +13:00
David Rowe	d07cc82512	Color some buttons	2016-03-29 23:39:02 +13:00
David Rowe	791d3b0310	Fix styling of disabled form	2016-03-29 23:24:34 +13:00
David Rowe	252a48ed5b	Miscellaneous fixes	2016-03-29 22:28:00 +13:00
David Rowe	ab37534e0d	Restyle dropdowns	2016-03-29 20:14:08 +13:00
David Rowe	a2d9f088ab	Typos	2016-03-29 18:47:13 +13:00
samcake	884a3e691d	Cleaning up moved files	2016-03-28 18:38:34 -07:00
samcake	a815c50fca	fixing the qml component	2016-03-28 18:36:17 -07:00
samcake	95418e25c0	Try to fix the iinclude for the PerfPlot/qml	2016-03-28 17:46:19 -07:00
Brad Hefta-Gaub	44b37c332a	Merge pull request #7480 from jherico/webchannel_redux ... Webchannel redux	2016-03-28 13:18:22 -07:00