3917 commits

Author	SHA1	Message	Date
David Rowe	afb47dcfb2	Add undo and redo buttons to Tools menu	2017-09-12 20:43:11 +12:00
David Rowe	be049009c8	Improve sizing of scale handles	2017-09-11 17:51:58 +12:00
David Rowe	ec6cae4105	Fix physics "grabbable" setting being applied without gravity	2017-09-11 17:04:50 +12:00
David Rowe	acf6a433a9	Don't scale z-axis of text and Web entities	2017-09-11 16:38:06 +12:00
David Rowe	18f4a3bf35	Fix hiding UI when hand is inside entity that camera isn't	2017-09-11 15:43:19 +12:00
David Rowe	ce15d0ecd0	Fix color picker circle and slider images clipping at oblique angles	2017-09-11 15:18:42 +12:00
David Rowe	bd95274a72	Merge branch 'master' into vr-edit-a	2017-09-09 20:16:09 +12:00
David Rowe	6f4f8e583b	Don't kick off physics for Text and Web entities	2017-09-09 20:15:15 +12:00
David Rowe	a7e04fcba6	Don't color particle effects	2017-09-09 20:14:09 +12:00
David Rowe	561c3e4653	Make polylines and polyvoxes able to be colored	2017-09-09 17:24:07 +12:00
Sam Gateau	ed8aa8b74d	Merge pull request #11160 from Zvork/outline ... Outline effect	2017-09-08 12:32:01 -07:00
David Rowe	03ddf04140	Merge branch 'master' into vr-edit-a	2017-09-08 16:51:12 +12:00
David Rowe	70581ebbc1	Fix handle scaling's scaling and positioning of entities	2017-09-08 10:43:43 +12:00
Brad Hefta-Gaub	b316f366fc	Merge pull request #11198 from druiz17/oculus-tablet-position ... fixed tablet spawn position for oculus menu button	2017-09-07 12:30:33 -07:00
Brad Hefta-Gaub	fce8715457	Merge pull request #11306 from ElderOrb/case7385 ... 7385 - Collect Stats on "Exit VR" button	2017-09-07 10:18:58 -07:00
Olivier Prat	796c59b9c2	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-09-07 10:13:53 +02:00
David Rowe	8fdc2313cc	Tidying	2017-09-07 18:36:01 +12:00
David Rowe	83a8cb5fe0	Merge branch 'master' into vr-edit-a	2017-09-07 10:53:41 +12:00
David Rowe	e94d2034c7	Don't grab entity behind entity just created and grip-click-deleted	2017-09-07 10:44:03 +12:00
David Rowe	8ca97d91c5	Make able to pick color from locked entities	2017-09-07 10:26:12 +12:00
David Rowe	2661fb6647	Tidying	2017-09-07 08:48:03 +12:00
Olivier Prat	17e992bd14	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-09-06 19:08:37 +02:00
Olivier Prat	fe357671e1	Removed qmlc files	2017-09-06 19:06:40 +02:00
Olivier Prat	25ff132fc7	Debugging scripts working again with correct occlusion management	2017-09-06 19:05:15 +02:00
David Rowe	3cc0db8b40	Fix app icon occasionally being disabled at Interface start	2017-09-06 23:38:38 +12:00
David Rowe	808f37a824	Prevent entities from jittering or drifting when grab a moving set	2017-09-06 22:54:51 +12:00
David Rowe	6c35a008f1	Fix scaling entities that have physics	2017-09-06 22:32:22 +12:00
David Rowe	7b19b39bce	Make physics work with multiple entities per HiFi's current capabilities	2017-09-06 18:36:06 +12:00
David Rowe	52bf8ac9a1	Merge branch 'master' into vr-edit-a	2017-09-06 13:33:33 +12:00
David Rowe	6838461b07	Display notification message when don't have rez permissions	2017-09-06 12:44:57 +12:00
David Rowe	61fc32714a	Handle domain and permission changes; disable app icon appropriately	2017-09-06 12:23:36 +12:00
David Kelly	1fd30b1e0f	fix passphrase reset	2017-09-05 17:03:11 -07:00
David Kelly	4bdfe092cf	Regression in injection script	2017-09-05 12:28:31 -07:00
beholder	c0e7e5a8b2	7385 - Collect Stats on "Exit VR" button	2017-09-05 21:26:35 +03:00
Olivier Prat	b619b2311d	Merged with master	2017-09-05 10:27:53 +02:00
David Rowe	310750fc0f	Close the app when the user changes avatars	2017-09-04 13:30:51 +12:00
David Rowe	2cd6f7fd54	Fix cursor not working when change dominant hand	2017-09-04 12:59:05 +12:00
David Rowe	44b365df6d	Merge branch 'master' into vr-edit-a	2017-09-03 10:57:32 +12:00
David Rowe	1cbc807016	Further haptic and audio tweaks	2017-09-02 21:23:30 +12:00
David Rowe	c93acbecaa	Move hover haptic pulses to dominant hand	2017-09-02 21:23:13 +12:00
David Rowe	039ceed74c	Modify equip and create sounds	2017-09-02 21:01:37 +12:00
David Rowe	5408daea73	Increase drop tool haptic pulse and decress hover haptic pulses	2017-09-02 20:49:50 +12:00
David Rowe	c7461a9646	Fix hover colors of menu buttons and header "back" icon	2017-09-02 20:36:22 +12:00
David Rowe	939b2ef11a	Fix laser enabling / disabling while inside an entity	2017-09-02 19:39:37 +12:00
David Rowe	d3819cfee3	Better names for overlay methods	2017-09-02 19:24:37 +12:00
David Rowe	9f9a0b0c58	Hide UI if hand is inside entity that camera is outside of	2017-09-02 19:09:36 +12:00
David Rowe	296d270098	Enable entities inside an entity to be manipulated	2017-09-02 19:06:43 +12:00
David Kelly	8723ff2df2	Merge pull request #11294 from zfox23/commerce_walletPassphraseModal ... Commerce: Wallet Passphrase Input Modal	2017-09-01 17:46:09 -07:00
Seth Alves	8ccacf34f4	Merge pull request #11290 from Menithal/21484 ... WL21484 - Add an additional parameter for entity animations to "allow translation"	2017-09-01 15:34:07 -07:00
Zach Fox	3cf0df518f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal	2017-09-01 11:53:47 -07:00