4664 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	3dfc48e205	Merge pull request #6687 from jherico/marketplace ... Support the marketplace in QML	2015-12-21 17:55:55 -08:00
Brad Hefta-Gaub	da86686533	fix reticle drive	2015-12-21 17:10:01 -08:00
Zach Pomerantz	f146b207c4	Update JS debug scripts to use nested props	2015-12-21 15:27:37 -08:00
Brad Hefta-Gaub	111a8caa3c	Merge pull request #6701 from highfidelity/graphics ... Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool	2015-12-21 13:54:50 -08:00
Brad Davis	6ef77bc46a	Support the marketplace in QML	2015-12-21 11:34:03 -08:00
Brad Hefta-Gaub	248b3d09ac	add absolute rotation based hand reticle movement	2015-12-21 10:49:49 -08:00
samcake	6bbc94badc	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-21 10:48:55 -08:00
Brad Davis	46a4a469e9	Merge pull request #6689 from ZappoMan/rightClickMenu ... Some early work to support hand driven reticle	2015-12-20 17:49:50 -08:00
samcake	1e8e3fec87	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-19 11:38:20 -08:00
Brad Hefta-Gaub	e929e3f789	more work on angular velocity tests	2015-12-18 19:20:32 -08:00
Brad Davis	6098c4a1d6	Revert "Revert "Migrate QML based web views to Qt WebEngine"" ... This reverts commit 1f3adeb666.	2015-12-18 17:18:46 -08:00
samcake	7e66515beb	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-18 17:13:48 -08:00
Brad Davis	1f3adeb666	Revert "Migrate QML based web views to Qt WebEngine"	2015-12-18 17:09:38 -08:00
samcake	41525a7c4d	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-18 16:20:41 -08:00
Brad Hefta-Gaub	a621579f17	add philips version of hand movement	2015-12-18 15:44:21 -08:00
Brad Hefta-Gaub	4075f355a3	more work on hand movement	2015-12-18 15:44:01 -08:00
samcake	f24800cf10	Change the default tone curve to jusimple gamma correct and fix the renaming in the renderENgineDebug script	2015-12-18 15:35:01 -08:00
Brad Hefta-Gaub	868d10651a	Merge pull request #6651 from jherico/webengine ... Migrate QML based web views to Qt WebEngine	2015-12-18 14:56:35 -08:00
Brad Hefta-Gaub	42764426ce	Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu	2015-12-18 14:30:16 -08:00
Brad Hefta-Gaub	5701ad2e8c	update to new angular velocity	2015-12-18 12:38:50 -08:00
David Rowe	c3e3af7c8c	Document effect of Bezier interpolation on particle radius simulation	2015-12-18 15:11:43 +13:00
David Rowe	e2ecc388ca	Indicate particle properties that (temporarily) aren't working	2015-12-18 15:10:47 +13:00
David Rowe	5aef309b8a	Get particles in particlesTest.js emitting again	2015-12-18 15:09:36 +13:00
Brad Hefta-Gaub	762aefbbca	add hand driven reticle	2015-12-17 17:38:20 -08:00
Atlante45	9d6618c341	Cleanup DebugDeferredBuffer code	2015-12-17 15:18:23 -08:00
Atlante45	b271542b73	Save DebugMode to setting, restore on script start	2015-12-17 15:18:23 -08:00
Brad Davis	5088eec2a2	Move directory web UI into the overlay	2015-12-17 12:23:39 -08:00
Brad Davis	82c865af2c	Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine	2015-12-17 12:20:38 -08:00
Brad Hefta-Gaub	63a63152a4	add procedural hand pose example	2015-12-17 11:10:49 -08:00
Brad Hefta-Gaub	24dde9ea92	Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu	2015-12-16 21:28:42 -08:00
Brad Hefta-Gaub	0b9bd858a7	implement support for pose ScriptEndpoints	2015-12-16 21:28:27 -08:00
Brad Davis	fa5bab08b1	Support web content inside QML	2015-12-16 16:25:38 -08:00
Clément Brisset	48429eddc8	Merge pull request #6666 from samcake/hdr ... Graphics: Adding a simple manual exposure for configuring the tone mapping	2015-12-16 12:09:52 -08:00
samcake	b4b541178d	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-16 09:42:06 -08:00
Clément Brisset	7c8f019507	Merge pull request #6663 from birarda/baseball ... update link to bat script in createBatButton.js	2015-12-15 19:26:33 -08:00
samcake	d2ebaef69e	Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template	2015-12-15 18:18:42 -08:00
Stephen Birarda	13c83bb262	update link to bat script in createBatButton.js	2015-12-15 17:23:29 -08:00
Brad Davis	29516619ee	Merge pull request #6661 from ZappoMan/rightClickMenu ... first cut at simulating mouse/reticle behavior with input contorllers	2015-12-15 16:08:59 -08:00
Brad Hefta-Gaub	3dcdfbc0f1	first cut at simulating mouse/reticle behavior with input contorllers	2015-12-15 13:59:22 -08:00
samcake	3554f54e17	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-14 17:38:56 -08:00
Anthony J. Thibault	3f0cdb3c02	Merge branch 'master' into tony/js-avatar-default-pose	2015-12-14 11:19:24 -08:00
Brad Hefta-Gaub	2815cb0fef	first cut at adding advanced and developer menu groupings	2015-12-12 18:12:36 -08:00
samcake	b3acde4462	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-11 17:49:00 -08:00
Brad Hefta-Gaub	64dd36d140	Merge pull request #6503 from imgntn/ratsteer ... Add rats to Drylake environment	2015-12-11 13:08:03 -08:00
James B. Pollack	35da54fc6c	dead code and print statements	2015-12-11 11:51:32 -08:00
James B. Pollack	a31ba089c1	semicolons and print statements	2015-12-11 11:49:00 -08:00
Howard Stearns	e8ffa598a2	Merge branch 'master' of https://github.com/highfidelity/hifi into scriptable-anim-var-triggers	2015-12-10 20:40:42 -08:00
Howard Stearns	dfec222c81	Report animation triggers to normal javascript animationStateHandlers, and update away.js as an example.	2015-12-10 20:39:01 -08:00
James B. Pollack	99bc47867a	cleanup	2015-12-10 18:16:01 -08:00
samcake	5d395ae54f	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-10 18:06:43 -08:00