30109 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ZappoMan	44fcf71f07	change domain to be 32k and still have origin centered at 0	2015-08-14 15:26:49 -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
bwent	7834a18bcf	add untracked changes	2015-08-14 15:11:05 -07:00
bwent	7bd9e2653c	more bug fixes	2015-08-14 15:09:48 -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
bwent	68fcf4ec8a	formatting	2015-08-14 11:06:44 -07:00
bwent	2c5c362957	adding rocket and refresh icons	2015-08-14 10:19:57 -07:00
ZappoMan	7c6a9b131d	some CR cleanup	2015-08-14 10:17:48 -07:00
ZappoMan	bdc78e9666	some CR cleanup	2015-08-14 10:16:48 -07:00
Ryan Huffman	ee11b74c8b	Update click move distance threshold	2015-08-14 10:13:05 -07:00
Ryan Huffman	56501490a1	Update edit.js mouse click code to be more lenient to micro movements	2015-08-14 10:09:16 -07:00
bwent	58713c0d57	more minor bug fixes	2015-08-14 09:55:05 -07:00
ZappoMan	daeb90c1e0	fix clamp in AddEntityOperator	2015-08-14 09:35:39 -07:00
ZappoMan	5fdd7304aa	Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin	2015-08-14 09:33:53 -07:00
Philip Rosedale	74f695cc9c	Merge pull request #5567 from howard-stearns/fix-gaze ... fix-gaze debugging aid	2015-08-14 08:03:35 -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
bwent	2dbba322fd	bug fixes, ride through system	2015-08-13 18:13:08 -07:00
Howard Stearns	f00d3c037d	whitespace	2015-08-13 17:36:03 -07:00
bwent	8c47bcc141	implement new UI	2015-08-13 16:00:55 -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
Leonardo Murillo	b345d75e4d	More cleanup and showing version in ds web gui	2015-08-13 16:44:28 -06:00
Leonardo Murillo	7c4813f1cf	Another versioning checkpoint + cleanup	2015-08-13 16:35:55 -06: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
Leonardo Murillo	cda5b29fd3	Another take at versioning details exchange - checkpoint	2015-08-13 14:19:13 -06: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
Howard Stearns	9308e9df4f	Merge pull request #5458 from ctrlaltdavid/20639 ... CR for 20639 - Add SMI Rift eye tracker support	2015-08-13 10:06:15 -07:00
Ryan Huffman	0daa9d4871	Remove extra rotation in image3d	2015-08-13 09:38:21 -07:00
Zander Otavka	b84b8b6119	Restructure overlayManager.js to be more readable.	2015-08-12 23:30:07 -07:00
Zander Otavka	dc68e12963	Improve documentation for overlay changes.	2015-08-12 22:04:06 -07:00
bwent	c585f24e27	Refining UI, introduce tween functionality for zooming into planets	2015-08-12 20:28:32 -07:00
bwent	e61ba997e5	Fix trail functionality with new classes	2015-08-12 20:28:32 -07:00
bwent	861c9f0ca0	more refactoring	2015-08-12 20:28:32 -07:00
bwent	e27335fc5e	Refactoring to use Planet class, set up framework for UI	2015-08-12 20:28:32 -07:00
Andrew Meadows	f64ab8e6b0	add QCOMPARE_QUATS macro for easier tests	2015-08-12 17:52:54 -07:00
Seth Alves	8cbb0c2ac3	Merge pull request #5560 from howard-stearns/no-version-constants ... No symbolic names for non-entity contants.	2015-08-12 16:57:00 -07:00
Howard Stearns	daae750d68	No symbolic names for non-entity contants.	2015-08-12 16:40:00 -07:00
Ryan Huffman	1000033f53	Merge pull request #5559 from SeijiEmery/js-widgets ... Js widgets	2015-08-12 16:39:11 -07:00
David Rowe	c0439f123b	Merge branch 'master' into 20639	2015-08-12 16:34:53 -07:00
Seiji Emery	fdacb894a5	tabs to spaces	2015-08-12 16:28:06 -07:00
Seiji Emery	81588f7db0	renamed Icon to Image	2015-08-12 16:26:47 -07:00