4977 commits

Author	SHA1	Message	Date
Bradley Austin Davis	9f6c2c3cdd	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 11:44:00 -08:00
Seth Alves	69a33428c0	Merge pull request #12078 from druiz17/soft-entities ... Soft Entities	2018-01-17 08:02:37 -08:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Clément Brisset	1949471dad	Merge pull request #12182 from highfidelity/stable ... Merge stable (RC62) to master	2018-01-16 11:01:07 -08:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Dante Ruiz	283b9a8003	fix softEntity edge cases	2018-01-12 15:31:54 -08:00
Dante Ruiz	5b82c7bc41	fix merge conflict	2018-01-12 11:00:19 -08:00
Anthony J. Thibault	088f227df2	Pass model offset from avatar skeletonModel to attached entity	2018-01-12 10:26:02 -08:00
Brad Davis	7579451c24	Merge remote-tracking branch 'upstream/master' into android	2018-01-11 23:31:45 -08:00
Anthony Thibault	8d5e7dbeff	Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings ... Fix for black screen when clicking Settings from Snap app	2018-01-11 09:58:10 -08:00
John Conklin II	da2c56dbc9	Merge pull request #12139 from hyperlogic/bug-fix/snapshot-app-settings ... RC62: Fix for black screen when clicking Settings from Snap app	2018-01-11 09:48:03 -08:00
Seth Alves	568c27d6e0	Merge pull request #12039 from luiscuenca/currentAPI ... Fix and improve currentAPI.js	2018-01-10 17:55:08 -08:00
Brad Davis	560fd38547	Merge remote-tracking branch 'upstream/master' into android	2018-01-10 17:31:50 -08:00
Anthony J. Thibault	1deb75daf7	Fix for black screen when clicking Settings from Snap app ... (cherry picked from commit d5e3b97c93)	2018-01-10 16:31:51 -08:00
Anthony J. Thibault	d5e3b97c93	Fix for black screen when clicking Settings from Snap app	2018-01-10 16:03:53 -08:00
Brad Davis	2c35242af1	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-10 13:40:12 -08:00
Brad Davis	fb59a0a56f	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-09 20:02:55 -08:00
Nissim Hadar	bb04b68e42	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-09 15:51:46 -08:00
Nissim Hadar	0b1e321ccf	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-09 15:25:03 -08:00
Brad Hefta-Gaub	a7b56da570	Merge pull request #12103 from ZappoMan/emoteApp ... first cut at an emote app	2018-01-09 15:23:14 -08:00
Dante Ruiz	125eb9ce44	add new tablet model and adjust screen offset	2018-01-09 14:31:57 -08:00
Nissim Hadar	4ecb056210	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-09 13:44:13 -08:00
ZappoMan	4f1dc2f184	fix CR comments	2018-01-09 13:42:51 -08:00
Nissim Hadar	8042b4b3fb	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-09 13:28:14 -08:00
Zach Fox	0bc483f7a6	Merge pull request #12096 from ElderOrb/FB5648 ... 5648 play audio notification to confirm purchase upon rezzing	2018-01-09 12:32:28 -08:00
Brad Davis	d6dd29b952	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-09 11:43:03 -08:00
Nissim Hadar	e94982a470	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-09 10:10:27 -08:00
Thijs Wenker	88d353a642	Merge pull request #12105 from misslivirose/feat/make-zones-lights-not-grabbable ... Make zones, lights, and particles not grabbable when created in edit.js	2018-01-09 18:26:13 +01:00
Alexander Ivash	7e87cb38e1	adjusted code to PR comments	2018-01-09 11:10:23 +03:00
ZappoMan	1fd9eae2b5	make second click stop animation if still playing, and shrink animation files	2018-01-08 17:57:12 -08:00
ZappoMan	0d1b34f487	make animation 60fps	2018-01-08 17:32:22 -08:00
Nissim Hadar	7811ddb904	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-08 15:39:09 -08:00
Nissim Hadar	46b494c802	Removed the Stage functionality - it is now implemented as a script.	2018-01-08 14:34:46 -08:00
Nissim Hadar	569cf1a30e	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-08 14:16:03 -08:00
Anthony Thibault	f4c38b91b3	Merge pull request #12071 from luiscuenca/handTouch ... Touch feeling for near grab	2018-01-08 12:50:30 -08:00
Nissim Hadar	8e03ecedb9	Added user data for lat/lon.	2018-01-08 11:50:49 -08:00
Liv Erickson	d1e176ee9d	Update menu to reflect non-grabbable entity types, include particles	2018-01-08 11:31:09 -08:00
Dante Ruiz	fd83e00df4	fix tablet interaction and far grab functionallity	2018-01-08 11:30:21 -08:00
Alexander Ivash	9a63fc94f0	5648 play audio notification to confirm purchase upon rezzing	2018-01-08 21:14:44 +03:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
ZappoMan	1dc24072dc	cleanup a few things in emote App	2018-01-08 09:04:07 -08:00
ZappoMan	c4d0872bbf	first cut at an emote app	2018-01-07 22:28:50 -08:00
luiscuenca	8a7c68829d	Optimizations, cleanings and globals	2018-01-07 11:56:30 -07:00
Nissim Hadar	f742ab7952	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-05 23:14:51 -08:00
Nissim Hadar	9e5eba4d3a	Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance	2018-01-05 23:11:40 -08:00
Liv Erickson	4e582975b6	cleanup	2018-01-05 18:03:20 -08:00
Liv Erickson	f563b8ca2e	Make zones and lights not default grabbable	2018-01-05 17:49:43 -08:00
Zach Fox	0c38a5598f	Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection ... Fix bugs related to inspecting entities with hand controllers	2018-01-05 15:50:00 -08:00
luiscuenca	4f6a804fd1	Fix magic numbers	2018-01-05 16:27:48 -07:00
Andrew Meadows	b28684f15e	Merge pull request #12087 from ctrlaltdavid/21661 ... Laser auto-on with tablet and Web overlays	2018-01-05 14:08:01 -08:00