36367 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	aa0d1f0c29	temp	2015-12-22 17:15:23 -08:00
James B. Pollack	c39f26ad72	new features	2015-12-22 16:31:49 -08:00
James B. Pollack	56d654987c	changing branches	2015-12-22 11:48:56 -08:00
James B. Pollack	b59b8db5c9	set defaults	2015-12-21 12:09:18 -08:00
James B. Pollack	da57e29096	start options, cleanup	2015-12-20 16:40:41 -08:00
James B. Pollack	485bb4ee3f	slider should stay with avatr	2015-12-19 19:14:56 -08:00
James B. Pollack	daa262af7d	readme	2015-12-19 19:14:19 -08:00
James B. Pollack	9f0d254739	panel entity, readme	2015-12-19 19:11:17 -08:00
James B. Pollack	05467bd5e1	create panel entity and parent panel to it	2015-12-19 18:19:00 -08:00
James B. Pollack	378d50d8a3	update overlays when cutoff slider is used	2015-12-19 12:49:42 -08:00
James B. Pollack	eb03dcd821	keep parent of lights that already have parents	2015-12-19 12:47:44 -08:00
James B. Pollack	890f98b38b	Merge branch 'master' into light_mod	2015-12-19 12:23:23 -08:00
Brad Hefta-Gaub	f55445bb88	Merge pull request #6707 from jherico/webengine ... Fixing QML based web view crash.	2015-12-18 18:19:36 -08:00
Brad Davis	ae6cf131f5	Fixing crash bug	2015-12-18 17:19:06 -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
Brad Davis	baf2d5acb7	Merge pull request #6705 from highfidelity/revert-6651-webengine ... Revert "Migrate QML based web views to Qt WebEngine"	2015-12-18 17:09:44 -08:00
Brad Davis	1f3adeb666	Revert "Migrate QML based web views to Qt WebEngine"	2015-12-18 17:09:38 -08:00
James B. Pollack	b0da1773c2	have right rotation on sequential edits	2015-12-18 16:53:41 -08:00
James B. Pollack	4afdd0242b	cleanup	2015-12-18 16:44:20 -08:00
James B. Pollack	f834765990	readme	2015-12-18 16:39:21 -08:00
James B. Pollack	e405311cc8	cleanup	2015-12-18 16:35:06 -08:00
James B. Pollack	0e530900d4	sequential editing	2015-12-18 16:22:20 -08:00
James B. Pollack	387c30d83f	close button	2015-12-18 15:04:13 -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 Davis	88b88a3306	Fixing warnings	2015-12-18 14:32:35 -08:00
Brad Hefta-Gaub	bfa0652100	Merge pull request #6700 from AndrewMeadows/angular-velocity-is-a-vector ... protect against NaN in measure of hydra angularVelocity	2015-12-18 14:29:23 -08:00
Andrew Meadows	aa3d1c6e4c	Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix ... ModelEntityItem: Fix for incorrect animations with preTranslations	2015-12-18 14:16:35 -08:00
Andrew Meadows	eb3210071e	Merge pull request #6664 from hyperlogic/tony/idle-to-walk-transition ... Improved idle to walk forward transition	2015-12-18 13:59:03 -08:00
Andrew Meadows	4e76e9e50b	prevent nan values in measure of angularVelocity	2015-12-18 13:51:14 -08:00
Eric Levin	2e4df5f859	Merge pull request #6692 from ctrlaltdavid/20758 ... Update particlesTest.js per current particles implementation	2015-12-18 13:35:19 -08:00
Brad Davis	16dd24f3d8	Removing unused LGPL JS file	2015-12-18 13:02:45 -08:00
Brad Hefta-Gaub	bfecf68a2e	Merge pull request #6696 from AndrewMeadows/angular-velocity-is-a-vector ... angular velocity is a vector	2015-12-18 12:29:56 -08:00
Brad Davis	08a087c5aa	PR comments	2015-12-18 11:19:01 -08:00
Andrew Meadows	d6541e9ee7	angular velocity is a vector, not a quaternion	2015-12-18 11:06:58 -08:00
Brad Davis	3446229bd8	Merge pull request #6693 from ZappoMan/fixWarnings ... fix warnings	2015-12-18 00:38:12 -08:00
Brad Hefta-Gaub	a7824a06d0	fix Assignment copy constructor warning	2015-12-17 18:51:27 -08:00
Brad Hefta-Gaub	0b781a3589	fix warnings	2015-12-17 18:39:05 -08:00
James B. Pollack	f84a441c7d	close button	2015-12-17 18:33:17 -08:00
David Rowe	9a7c0cb182	Typo noticed in passing	2015-12-18 15:12:03 +13: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
James B. Pollack	7a542a678b	prep for close button	2015-12-17 17:17:04 -08:00
James B. Pollack	a25feb5578	switching branches	2015-12-17 16:58:38 -08:00
Andrew Meadows	1bb6ddb99f	Merge pull request #6676 from sethalves/dejitter-hold-action ... Dejitter hold action	2015-12-17 14:29:39 -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
James B. Pollack	8e2128c692	update light volume when you move light parent	2015-12-17 11:59:21 -08:00
Seth Alves	b80fa1c806	code review	2015-12-17 11:46:41 -08:00
Ryan Huffman	3da5cf1fe5	Merge pull request #6684 from birarda/read-type-assert ... fix reading of empty or malformed packets	2015-12-17 11:26:47 -08:00