13697 commits

Author	SHA1	Message	Date
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	d9425100b6	Merge pull request #5595 from sethalves/fix-inviso-av ... possible fix for invisible other's-avatar bug	2015-08-18 21:24:15 -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
Seth Alves	940390ee46	make enable-avatar-collisions menu item work again	2015-08-18 19:31:05 -07:00
Seth Alves	5fcbd37e43	possible fix for invisible other's-avatar bug	2015-08-18 15:45:17 -07:00
Brad Hefta-Gaub	a00eb0ca5d	Merge pull request #5592 from jherico/homer ... Remove keyboard focus highlight on delete entity	2015-08-18 15:25:52 -07:00
Brad Davis	944734fed2	Remove focus highlight on delete entity	2015-08-18 13:59:39 -07:00
Brad Hefta-Gaub	5c1364ca2a	Merge pull request #5590 from ctrlaltdavid/20649 ... Add further temporary debug for tracking down invalid scale value assert	2015-08-18 13:31:23 -07:00
David Rowe	00aa336a2b	Add further temporary debug for tracking down invalid scale value assert	2015-08-18 10:01:00 -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
Brad Davis	5d65937120	Merge pull request #5583 from ZappoMan/clickToFocusWebEntity ... make web entity focus click based	2015-08-17 16:57:39 -07:00
Philip Rosedale	01108bdf6b	Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors ... Synchronize eye joint and debugging vectors	2015-08-17 16:56:01 -07:00
ZappoMan	49cf29ce8f	cleanup debugging and dead code	2015-08-17 15:57:20 -07:00
ZappoMan	47b0e2fda6	more hacking on click to focus	2015-08-17 14:02:24 -07:00
ZappoMan	b7d9dc444b	more work on clicking focus	2015-08-17 13:06:32 -07:00
Seth Alves	296a6b1cb8	re-enabled ctrlaltdavid's eye calibration code	2015-08-17 12:20:46 -07:00
Howard Stearns	941b966dc7	Force eyeball update even when not looking at me.	2015-08-17 11:57:08 -07:00
ZappoMan	8cf450cb67	first cut at making focus click based	2015-08-17 11:41:54 -07:00
Brad Hefta-Gaub	494fd6035a	Merge pull request #5569 from ctrlaltdavid/webwindow-extras ... Add size and position properties, methods, and events to WebWindow	2015-08-15 11:23:59 -07:00
Brad Davis	9706a44ca1	Merge pull request #5571 from ZappoMan/hmdToolsRedux ... remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd	2015-08-14 20:11:27 -07:00
Howard Stearns	eeeaa8050d	Fix the rush jobs, so gustavo can build build for me...	2015-08-14 18:58:49 -07:00
Brad Hefta-Gaub	a0e92e71a5	Merge pull request #5562 from AlexanderOtavka/overlay-docs ... Documentation for overlay changes.	2015-08-14 18:53:34 -07:00
Brad Hefta-Gaub	65b9c7bed8	Merge pull request #5522 from huffman/fix-billboard-url ... Fix BillboardOverlay breaking when changing url	2015-08-14 18:10:22 -07:00
Brad Davis	dc2ddd0303	switch statement spacing	2015-08-14 17:12:00 -07:00
Howard Stearns	d28c555a79	Synchronize eye joint and debugging vectors when the other avatar is looking at me.	2015-08-14 16:47:34 -07:00
Brad Davis	db95657455	PR comments	2015-08-14 16:40:53 -07:00
ZappoMan	6a802560f2	remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd	2015-08-14 16:27:50 -07:00
Brad Davis	208e41efd1	WebEntity keyboard input with mouse hover	2015-08-14 16:18:38 -07:00
Ryan Huffman	fec460886b	Merge branch 'master' of github.com:highfidelity/hifi into fix-billboard-url	2015-08-14 15:18:40 -07:00
David Rowe	bb2c48e3ed	Add size and position properties, methods, and events to WebWindow	2015-08-14 14:42:32 -07:00
Brad Hefta-Gaub	ea685f4587	Merge pull request #5563 from huffman/fix-image3d-rotation ... Fix rotation of image3d overlays	2015-08-14 11:14:18 -07:00
Brad Hefta-Gaub	31a49a551a	Merge pull request #5556 from jherico/bart ... QML framerate improvments	2015-08-14 11:11:14 -07:00
Howard Stearns	6b27f854b2	Eyelid position is on sender side and should use lookAt spot, not the receiver side.	2015-08-14 07:51:04 -07:00
Howard Stearns	1133e053d1	Developer->Avatar->Fix Gaze menu option to not move the eyes around while we're debugging.	2015-08-14 07:33:36 -07:00
Howard Stearns	f00d3c037d	whitespace	2015-08-13 17:36:03 -07:00
Howard Stearns	0f6c0a3117	Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate	2015-08-13 15:56:13 -07:00
Howard Stearns	63608d8012	Undo avatar choice if the whole preferences dialog is cancelled.	2015-08-13 15:55:43 -07:00
Howard Stearns	722c024f61	Remove obsolete code.	2015-08-13 15:08:26 -07:00
Howard Stearns	7d4c96cc29	avartar => avatar	2015-08-13 14:53:12 -07:00
Howard Stearns	74dc6a3dc5	updateMotionBehavior => updateMotionBehaviorFromMenu	2015-08-13 14:43:39 -07:00
Howard Stearns	a8a064990f	apperance => appearance	2015-08-13 14:42:37 -07:00
Howard Stearns	2756a00638	Get default avatar url from resources.	2015-08-13 14:23:34 -07:00
Howard Stearns	4dae01a69c	Provide a consistent avatar default for the empty string.	2015-08-13 12:54:16 -07:00
Howard Stearns	62941c0914	Remove dead code.	2015-08-13 12:39:30 -07:00
Howard Stearns	ea834609c2	Kill the AvatarAppearanceDialog and rewire necessary parts of PreferencesDialog.	2015-08-13 10:33:31 -07:00