3885 commits

Author	SHA1	Message	Date
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
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	4bdfe092cf	Regression in injection script	2017-09-05 12:28:31 -07: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
David Rowe	269f1769be	Merge branch 'master' into vr-edit-a	2017-09-01 14:45:59 +12:00
David Rowe	110413b025	Fix action after color picker failure	2017-09-01 14:36:44 +12:00
David Rowe	734ce66df3	Add audio and haptic feedback	2017-09-01 14:30:22 +12:00
Zach Fox	fa25c434ca	Messages to marketplaces.js	2017-08-31 15:50:42 -07:00
Brad Davis	65b49a958f	Merge branch 'master' into 21484	2017-08-31 14:59:30 -07:00
Zach Fox	ce32d2d420	Checkout and Purchases	2017-08-31 14:12:05 -07:00
David Kelly	de2ce1cd5f	warning	2017-08-31 13:23:38 -07:00
druiz17	98b1fe6138	Merge pull request #11266 from ElderOrb/case6819 ... 6819 - Create button not disabled	2017-08-31 12:36:08 -07:00
David Kelly	396f108182	forgot this the first time	2017-08-31 12:18:46 -07:00
Zach Fox	914a6bae00	Commerce: Wallet Passphrase Modal	2017-08-31 12:18:38 -07:00
Zach Fox	164eeaae64	Fix the duplicated buy buttons for admins on Marketplace	2017-08-31 10:41:44 -07:00
David Rowe	8205b0d9d2	Merge branch 'master' into vr-edit-a	2017-08-31 15:45:15 +12:00
David Rowe	652fbaa9b7	Refactoring	2017-08-31 15:30:04 +12:00
David Rowe	3dacd1fcda	Tidy options settings code	2017-08-31 13:55:00 +12:00
David Rowe	5299596254	Code tidying	2017-08-31 13:36:48 +12:00
David Rowe	3f0872465f	Rename new code items	2017-08-31 13:20:37 +12:00
David Rowe	c6f987c00c	Remove old code	2017-08-31 13:05:50 +12:00
David Rowe	63074ad928	Fix button press distance	2017-08-31 11:44:52 +12:00
David Rowe	e8af4bdb2d	Fix up hover state of toggle button after pressing	2017-08-31 10:54:20 +12:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
David Rowe	59505b4334	Fix up colors and highlighting of group/ungroup and toggle buttons	2017-08-31 09:30:11 +12:00
David Rowe	db27b97ec7	Add zero indicators to Physics options' sliders	2017-08-31 08:24:38 +12:00
Zach Fox	f366743be7	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
Zach Fox	1b48319a3f	Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 ... Commerce: Zachs Punchlist 01	2017-08-30 10:10:56 -07:00