12543 commits

Author	SHA1	Message	Date
Sam Gondelman	56944afd39	avatar doesn't move in independent mode, alphabetized menu options	2015-06-25 12:36:36 -07:00
Sam Gondelman	19ec080e2b	Merge with master	2015-06-24 15:04:03 -07:00
Philip Rosedale	0bef506be2	Merge pull request #5190 from jherico/mirror_zoom ... Mirror zoom	2015-06-24 14:43:14 -07:00
Ryan Huffman	4df1bea4ec	Merge pull request #5167 from SamGondelman/hmdControls ... hmdControls.js for movement when wearing an HMD	2015-06-24 14:40:31 -07:00
Philip Rosedale	b7c64ef246	Merge pull request #5193 from SamGondelman/master ... hydra dead zone to prevent drifting	2015-06-24 13:52:48 -07:00
Andrew Meadows	1ceed98ca2	Merge pull request #5166 from jherico/64bit ... Enable Windows 64 bit builds	2015-06-23 17:03:42 -07:00
Sam Gondelman	778e19ac11	fixed camera mode issue	2015-06-23 11:45:08 -07:00
Sam Gondelman	c1fdbeb3b4	hydra dead zone to prevent drifting	2015-06-23 10:52:44 -07:00
Sam Gondelman	824c219fa0	started fixing camera mode issue	2015-06-23 09:26:38 -07:00
Bradley Austin Davis	07dce3856a	Fixing some math functions	2015-06-22 20:10:21 -07:00
Bradley Austin Davis	62af30761e	Fixing inverted mirror zoom setting	2015-06-22 20:07:51 -07:00
Bradley Austin Davis	f833121032	Fixing the initial missing UI on retina displays, again	2015-06-22 19:55:52 -07:00
Seth Alves	300a879ff4	Merge pull request #5186 from AndrewMeadows/antimony ... fix crash when other avatar disconnects unexpectedly	2015-06-22 19:34:13 -07:00
Brad Hefta-Gaub	de39049a56	Merge pull request #5187 from jherico/fix_overlay_backgrounds ... Fix the 2D text overlay backgrounds to stop using a previously bound …	2015-06-22 17:32:06 -07:00
Brad Hefta-Gaub	ee85ad8bf8	Merge pull request #5185 from jherico/mouse_flicker ... Removing flickering mouse cursor in HMD	2015-06-22 17:23:40 -07:00
Brad Hefta-Gaub	81541e6013	Merge pull request #5180 from jherico/hmd_offset ... Fixing HMD position offset bug in picking & stereo rendering in HMD	2015-06-22 17:22:26 -07:00
Bradley Austin Davis	ce3d1bd9a4	Fix the 2D text overlay backgrounds to stop using a previously bound texture	2015-06-22 16:19:31 -07:00
Andrew Meadows	ce9dfc098b	unhook motionstate before removing avatar	2015-06-22 15:40:26 -07:00
Andrew Meadows	b7c728a794	assert AvatarMotionState unhooked before delete	2015-06-22 15:40:02 -07:00
Brad Davis	d94cc3d785	Merge pull request #5182 from venkatn93/master ... Fixed tooltip position relative to the cursor	2015-06-22 13:57:47 -07:00
Philip Rosedale	111b0f286d	Merge pull request #5160 from ctrlaltdavid/addressbar-tidy ... Tidy address bar code	2015-06-22 12:08:33 -07:00
Brad Davis	1cfc0b2e42	Fixing mac/linux compilation	2015-06-22 12:06:08 -07:00
Brad Davis	8c9deb9d16	Removing flickering mouse cursor in HMD	2015-06-22 12:04:55 -07:00
Niraj Venkat	e66206ec4f	Fixed tooltip position relative to the cursor	2015-06-22 11:29:44 -07:00
Brad Davis	4cd1c52987	Fixing HMD position offset bug in picking & stereo rendering in HMD	2015-06-22 11:20:48 -07:00
Philip Rosedale	293a88b3d4	Merge pull request #5158 from ctrlaltdavid/20545 ... DO NOT MERGE - QA for #20545 - Eye saccades are too jittery and too fast	2015-06-22 10:31:10 -07:00
Brad Davis	3231bbba5a	Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp	2015-06-22 09:44:16 -07:00
samcake	be8ae9580d	Merge pull request #5177 from bwent/doubleClickEvent ... Expose mouseDoublePressEvents to js	2015-06-22 11:13:05 +02:00
Bradley Austin Davis	02510790c3	Fixing projection during star rendering	2015-06-21 17:16:30 -07:00
Brad Davis	012b0973b9	removing cruft	2015-06-21 14:26:19 -07:00
Bradley Austin Davis	5bbfb97c37	Fixing blurry UI on retina displays	2015-06-21 13:31:18 -07:00
Brad Davis	e66b2d4141	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-20 22:54:45 -07:00
Brad Hefta-Gaub	13c5c830d7	Merge pull request #5173 from huffman/fix-line-bounds ... Add correct line3doverlay bounds	2015-06-20 11:39:08 -07:00
Bradley Austin Davis	577962cb67	Merge branch 'master' into overlay	2015-06-20 10:37:55 -07:00
David Rowe	0b13accf94	Merge branch 'master' into addressbar-tidy ... Conflicts: interface/resources/qml/AddressBarDialog.qml	2015-06-19 17:42:27 -07:00
Brad Davis	3ab8025b82	Responding to Sam's comments	2015-06-19 16:14:05 -07:00
Sam Gondelman	a0d4b7ec7c	without script, doesn't limit you to constant degree turns	2015-06-19 16:11:43 -07:00
Niraj Venkat	482f12be8c	Returning ref to stack to view controller	2015-06-19 16:05:45 -07:00
bwent	c315bcec24	Expose mouseDoublePressEvents to js	2015-06-19 15:52:27 -07:00
Brad Davis	cc6b589ae5	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-19 14:48:38 -07:00
Brad Davis	99c217184b	Fixing the mic/camera buttons and the mirror UI buttons	2015-06-19 14:46:39 -07:00
Niraj Venkat	03c10d15e6	Adding lambdas and removing dead code	2015-06-19 14:37:21 -07:00
Niraj Venkat	054e12a315	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-19 11:22:50 -07:00
Niraj Venkat	1494aa4faa	Adding new icon and getters	2015-06-19 11:18:16 -07:00
Niraj Venkat	b15e7cec21	Back and forward are red if not possible	2015-06-19 11:17:56 -07:00
Sam Gondelman	e78ce8055a	hmdControls turns on when you enter VR mode, turns off when you exit, can toggle with CTRL+G	2015-06-19 11:17:36 -07:00
Ryan Huffman	ff66eb584d	Add correct line3doverlay bounds	2015-06-19 10:48:07 -07:00
Clément Brisset	5192796851	Merge pull request #5168 from samcake/daft ... Improving the rendering job architecture	2015-06-19 18:00:39 +02:00
Sam Gateau	598d0a5375	Just remove these changes on SkeletonModel.cpp	2015-06-19 17:44:56 +02:00
Atlante45	9c7f24eeb6	Add culled option for simple programs	2015-06-19 16:50:38 +02:00