4269 commits

Author	SHA1	Message	Date
Zach Fox	733df8391f	Round 2	2017-10-09 12:27:56 -07:00
Thijs Wenker	895f79fd80	Merge pull request #11548 from ctrlaltdavid/move-shapes ... Move Shapes app files from scripts directory to marketplace directory	2017-10-09 02:37:15 +02:00
Thijs Wenker	bd74386997	Merge pull request #11543 from ctrlaltdavid/21496 ... Add script that tests setting your listening position and orientation	2017-10-09 01:15:22 +02:00
David Rowe	765f3fc381	Move Shapes app files from scripts directory to marketplace directory	2017-10-09 10:38:40 +13:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
David Rowe	596ce8e9c1	Add script that tests setting your listening position and orientation	2017-10-07 21:46:56 +13:00
Brad Hefta-Gaub	62fc193bff	Merge pull request #11532 from sethalves/import-av-entities ... fix importing of avatar entities	2017-10-06 17:59:54 -07:00
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
David Rowe	3fbaf250a4	Increase delay in kicking off physics	2017-10-07 11:50:31 +13:00
Seth Alves	8d00731620	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-06 07:20:34 -07:00
David Rowe	105457b388	Don't unbusubscribe from possibly shared channel	2017-10-06 13:27:08 +13:00
David Rowe	5c72a41163	Delete some redundant code	2017-10-06 11:14:07 +13:00
David Rowe	5587a2fdf8	Fix creating an entity while a tool is active	2017-10-06 11:13:53 +13:00
druiz17	3139f5ef2a	improve mouseHMD exit logic	2017-10-05 15:12:58 -07:00
druiz17	ba50fcc509	fix mouse dissapearing in desktop mode	2017-10-05 15:07:49 -07:00
David Rowe	1673c08353	Update undo for grouping	2017-10-06 10:42:23 +13:00
David Rowe	21d286b422	Fix undo not coping with cloning with both hands simultaneously	2017-10-06 10:04:14 +13:00
Seth Alves	b96fac2f00	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-05 11:43:25 -07:00
Seth Alves	53a49272dc	fix importing of avatar-entities	2017-10-05 11:43:19 -07:00
David Rowe	b526ec0d93	Code review	2017-10-05 18:21:04 +13:00
David Rowe	4855e0f528	Fix children's rotations drifting when scale group	2017-10-05 14:36:25 +13:00
David Rowe	63e7521711	Merge branch 'master' into vr-edit-a	2017-10-05 11:29:49 +13:00
Clément Brisset	74fd69ac2d	Merge pull request #11523 from Atlante45/new-master ... RC56 into Master	2017-10-04 15:17:52 -07:00
Brad Hefta-Gaub	a1979a2600	Merge branch 'master' into RC-56	2017-10-03 18:16:21 -07:00
druiz17	13feec89c2	remove update stylus	2017-10-03 16:12:37 -07:00
druiz17	ad9677f63e	fixing grabbing and tablet bugs	2017-10-03 16:11:51 -07:00
druiz17	6b3d89d18f	fix hudlaser module	2017-10-03 14:13:37 -07:00
druiz17	33e9a71000	grab attachments	2017-10-03 12:51:51 -07:00
Zach Fox	ea3da6c9dd	Merge pull request #11495 from zfox23/pop_interfaceChanges2 ... Commerce: One step closer!	2017-10-03 11:56:00 -07:00
Howard Stearns	22f0ef33ed	Merge pull request #11496 from howard-stearns/certificate-properties ... Certificate properties	2017-10-03 10:06:48 -07:00
David Rowe	06f0e23bf9	There no longer is a handControllerGrab.js	2017-10-03 21:44:56 +13:00
David Rowe	5145107f8c	2D overlays can no longer be lasered	2017-10-03 21:36:40 +13:00
David Rowe	31e72c5503	Work around bug undoing physics where entities can end at wrong position	2017-10-03 16:26:00 +13:00
David Rowe	a59d590111	ESLint	2017-10-03 13:33:20 +13:00
David Rowe	46ce68a893	Fix lasers	2017-10-03 13:33:11 +13:00
Zach Fox	11d0062104	Progress on buy endpoint	2017-10-02 16:57:41 -07:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
druiz17	68780f56b7	Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module	2017-10-02 14:06:26 -07:00
Zach Fox	1050d2851d	Modify injected code to add to dropdown menu	2017-10-02 12:37:49 -07:00
Zach Fox	15c0a21e0e	Varied commit - styling changes, beginnings of new Wallet endpoint, etc	2017-10-02 12:19:24 -07:00
Howard Stearns	930832bb19	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-10-02 09:44:29 -07:00
Zach Fox	1ec0f5d9a0	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-10-02 09:26:59 -07:00
David Rowe	0bd67d494d	Fix UI sometimes turning off/on/off as hand enters entity	2017-10-02 19:27:26 +13:00
David Rowe	829cc8e5e6	Merge branch 'master' into vr-edit-a	2017-10-02 17:08:27 +13:00
Anthony J. Thibault	7dfa80f666	Bug fix for offset of animated parts of oculus touch controller display ... Ensure position/rotations are updated with a consistent scale and are animated correctly as the controller values change.	2017-10-01 17:52:59 -07:00
David Rowe	680235a7b1	+= 1 ==> ++	2017-10-01 13:22:48 +13:00
David Rowe	03e0e21ce0	JSLint ==> ESLint	2017-10-01 13:19:54 +13:00
David Rowe	659b2d8a99	Disable debug log info	2017-09-30 15:14:07 +13:00
David Rowe	229c186901	Rename script from vr-edit.js to shapes.js	2017-09-30 15:09:35 +13:00
David Rowe	b56b3a2e61	Change app name from "VR EDIT" to "SHAPES" and use new icon	2017-09-30 15:01:21 +13:00