5829 commits

Author	SHA1	Message	Date
Zach Fox	14034f29a1	Interface Fix for MS14314: Make use of original image filename when sharing	2018-06-11 17:10:09 -07:00
John Conklin II	d5b8570ef6	Merge pull request #13343 from ctrlaltdavid/21888 ... Fix tablet attaching to hand while far-grabbing an entity	2018-06-11 10:26:37 -07:00
Howard Stearns	5ce122f148	Merge pull request #13307 from howard-stearns/infinite-scroll ... Infinite scroll	2018-06-11 10:03:52 -07:00
Sam Gondelman	9c66ee412a	Merge pull request #13325 from Cristo86/patch-1 ... Use third person camera mode when switching to My View from Top View mode.	2018-06-11 09:36:29 -07:00
howard-stearns	d2cf042a88	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-09 14:09:42 -07:00
Anthony Thibault	044d142635	Merge pull request #13133 from amantley/nativeCGCode ... Center of Gravity Leaning	2018-06-08 17:53:55 -07:00
David Rowe	54b96cd602	Fix incomplete transition from far-grabbing entity to grabbing tablet	2018-06-09 11:32:10 +12:00
Anthony J. Thibault	c3da4e74de	Code review feedback	2018-06-08 16:22:00 -07:00
David Rowe	dc46c2077d	Fix function name	2018-06-09 11:01:18 +12:00
howard-stearns	2761688d39	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 16:14:57 -07:00
Zach Fox	93eba5fe5e	Merge pull request #13293 from zfox23/MS7224_cubeSnapshots ... Fix MS7224: Add dimensions to printed Snapshot entity	2018-06-07 12:52:20 -07:00
Cristian Duarte	664884c9a8	Use third person camera mode when switching to My View from Radar mode. ... This makes it consistent with the default third person camera in My View.	2018-06-07 16:41:41 -03:00
howard-stearns	890c97e7cb	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 12:24:27 -07:00
John Conklin II	067fa46355	Merge pull request #13265 from wayne-chen/toggleSpaceMode ... Re-adding toggleSpaceMode function	2018-06-07 11:21:28 -07:00
John Conklin II	389bddb0f4	Merge pull request #13255 from ctrlaltdavid/21884 ... Fix properties not populating particle explorer tab	2018-06-07 09:42:45 -07:00
John Conklin II	d39eb250e1	Merge pull request #13310 from ElderOrb/FB15569 ... FB15569 - Debug default scripts no longer on developer menu	2018-06-07 09:41:59 -07:00
John Conklin II	66e2bebcbf	Merge pull request #13279 from thoys/fix/create-camera ... Fix MS13500: create-app camera orbit to not jump around on secondary monitor	2018-06-07 09:38:10 -07:00
David Rowe	32c21a1397	Fix particle property value reverting to old value when switch tabs	2018-06-07 12:22:56 +12:00
David Rowe	3e100fb141	Merge branch 'master' into 21884	2018-06-07 10:46:53 +12:00
Alexander Ivash	b954ac6759	FB15569 - Debug default scripts no longer on developer menu	2018-06-06 03:43:27 +03:00
David Rowe	b4b63187ae	Fix typo	2018-06-05 08:48:10 +12:00
howard-stearns	5257a254cb	more for the previous	2018-06-04 13:12:41 -07:00
howard-stearns	254abfa04a	add request-services to default scripts.	2018-06-04 12:59:08 -07:00
SamGondelman	8af1beca8d	add isGroupCulled for model overlays	2018-06-04 12:07:57 -07:00
Zach Fox	cf7a3d1af6	Fix MS7224: Add dimensions to printed Snapshot entity	2018-06-04 11:30:29 -07:00
Anthony J. Thibault	c3d1daf855	Merge branch 'master' into nativeCGCode	2018-06-04 09:32:38 -07:00
howard-stearns	29b09d64e6	checkpoint with PAL working.	2018-06-01 13:33:45 -07:00
howard-stearns	e6ffb9a3e5	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-01 11:10:13 -07:00
Seth Alves	708cbbc984	Merge pull request #13258 from wayne-chen/toggleAdvancedMovementFile-case-15453 ... JavaScript exception in toggleAdvancedMovementForHandControllers.js	2018-06-01 10:48:24 -07:00
howard-stearns	84f5f0a653	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-01 09:58:08 -07:00
Thijs Wenker	3779a4780e	Prevent the cursor from being stuck on the most outer edges of the screen	2018-06-01 02:07:02 +02:00
Thijs Wenker	a06c9eccca	- fix create-app camera orbit to not jump around on secondary monitor ... - style fixes entityCameraTool.js	2018-06-01 00:16:42 +02:00
Wayne Chen	9f20d52d01	adding alternate solution.	2018-05-31 15:05:33 -07:00
Wayne Chen	d66b548fc5	fixing typo in script file.	2018-05-31 15:04:29 -07:00
howard-stearns	e8e12eef8f	checkpoint	2018-05-31 14:42:52 -07:00
David Rowe	3c5a779a98	Don't modify function parameter	2018-06-01 09:36:28 +12:00
howard-stearns	b0d3729d4d	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-30 17:09:57 -07:00
howard-stearns	bdd38cef7a	checkpoint	2018-05-30 17:09:13 -07:00
Wayne Chen	34120da63f	re-adding toggleSpaceMode	2018-05-30 16:06:34 -07:00
Dante Ruiz	072d8b70b1	adding back notifcations	2018-05-30 13:36:02 -07:00
David Rowe	8c9bdf51a7	Remove superfluous variable	2018-05-30 17:16:08 +12:00
David Rowe	03cec8cb54	Fix properties not populating particle explorer tab	2018-05-30 17:15:33 +12:00
howard-stearns	a84829392f	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-29 16:14:22 -07:00
Gabriel Calero	bb73af7230	Show stats button only in debug mode. Add isDebugMode to Script public interface	2018-05-29 17:21:44 -03:00
howard-stearns	17be460adf	checkpoint	2018-05-25 16:37:06 -07:00
Wayne Chen	8453c7baba	reverting commit 802cedf1bc regarding toggleSpaceMode	2018-05-25 09:25:05 -07:00
Wayne Chen	89f7eb0b30	Adding fix for enabling saved front/back advanced controls.	2018-05-25 09:21:01 -07:00
howard-stearns	235971f8bf	checkpoint	2018-05-24 15:23:45 -07:00
Wayne Chen	b86d74b4b7	Merge branch 'master' of https://github.com/highfidelity/hifi	2018-05-24 15:08:23 -07:00
John Conklin II	04bf8f851f	Merge pull request #13219 from samcake/one ... Bringing Evolution to the Job Engine Task library developed in the workload project to master	2018-05-24 13:30:16 -07:00