23393 commits

Author	SHA1	Message	Date
Zach Fox	16d51986a9	Make the call to receiveAt more robust	2018-01-17 15:11:58 -08:00
Dante Ruiz	8f22c719b3	Merge pull request #12099 from sethalves/run ... allow avatar walk-speed to be set from javascript	2018-01-17 13:53:13 -08:00
Seth Alves	8edded7059	Merge pull request #12164 from ctrlaltdavid/21695 ... Remove old ToolWindow code	2018-01-17 13:43:59 -08:00
Seth Alves	7af90d5429	Merge pull request #12171 from mnafees/21671 ... CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files	2018-01-17 13:42:47 -08:00
Seth Alves	33c586de60	Merge pull request #12188 from hyperlogic/feature/small-anim-refactor ... Remove dangerous "Use Anim Pre and Post Rotations" menu item	2018-01-17 13:41:51 -08:00
David Back	92c0fd4877	Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS ... Merge Account & GlobalServices follow-up	2018-01-17 10:50:54 -08:00
Seth Alves	1e847cf32e	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-17 08:08:13 -08:00
Seth Alves	69a33428c0	Merge pull request #12078 from druiz17/soft-entities ... Soft Entities	2018-01-17 08:02:37 -08:00
Seth Alves	d3084dc0df	defang	2018-01-17 07:11:27 -08:00
Seth Alves	bfccb52b7a	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-17 07:02:14 -08:00
Sam Gateau	d4571bd86a	Merge pull request #12181 from humbletim/rename-model-graphics ... Rename libraries/model -> libraries/graphics	2018-01-16 18:12:25 -08:00
Anthony J. Thibault	51ea2632c0	Remove Avatar UseAnimPreAndPostRotations option. ... This should always be true and can lead to hard to diagnose bugs if it is ever set to false.	2018-01-16 17:27:19 -08:00
Seth Alves	511f94a4fc	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-16 14:01:54 -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
Mohammed Nafees	885801c5ca	Fix copying to clipboard from JS scripts	2018-01-16 13:17:47 -05:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Seth Alves	12db51728e	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-16 07:50:55 -08:00
MiladNazeri	c7cdf6b8f6	Merge pull request #12145 from ctrlaltdavid/21684 ... Update Window JSDoc per recent API changes	2018-01-15 14:50:40 -08:00
Seth Alves	06dd680dc9	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-15 13:48:10 -08:00
Seth Alves	ed91ece871	Merge pull request #12169 from druiz17/asset-browser ... fix asset browser for tablet	2018-01-15 12:04:26 -08:00
Seth Alves	eaeebc0215	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-15 11:52:58 -08:00
Melissa Brown	991dad18ba	Merge pull request #12160 from ElderOrb/FB11241 ... FB11241 Changing options in menu causes the title “Menu” to change to…	2018-01-15 10:46:37 -08:00
Dante Ruiz	645f608814	fixing merge conflict	2018-01-15 10:45:51 -08:00
John Conklin II	c3648fb04c	Merge pull request #12168 from druiz17/RC62 ... fix Asset browser for tablet (RC62)	2018-01-15 10:16:56 -08:00
Dante Ruiz	8e4bd2d662	fix asset browser for tablet	2018-01-12 17:11:02 -08:00
Dante Ruiz	a48304b104	fix Asset browser for tablet	2018-01-12 17:06:07 -08:00
Zach Fox	bd3474de68	Merge pull request #12166 from zfox23/fixSnapshotSocialSharing ... Fix social media sharing buttons on Snapshot app	2018-01-12 15:52:56 -08:00
Seth Alves	2388bea39d	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-12 15:28:52 -08:00
Zach Fox	e627925bd3	Fix 'Browse Avatars' button from Avatar Settings	2018-01-12 15:14:42 -08:00
Zach Fox	522007af9d	Fix social media sharing buttons on Snapshot app	2018-01-12 14:58:14 -08:00
Seth Alves	914e84a346	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-12 13:46:58 -08:00
Zach Fox	6920e57613	Fix 'Browse Avatars' button from Avatar Settings	2018-01-12 13:31:58 -08:00
David Rowe	1fa31d3c10	Remove old ToolWindow code	2018-01-13 10:27:43 +13:00
Dante Ruiz	5b82c7bc41	fix merge conflict	2018-01-12 11:00:19 -08:00
Zach Fox	b7f4fe2ba3	Merge pull request #12149 from howard-stearns/do-not-delete-wallet-file ... Do not delete wallet file	2018-01-12 09:44:40 -08:00
Dante Ruiz	96a97b5938	added model transform override	2018-01-11 16:41:45 -08:00
Alexander Ivash	11e918681a	FB11241 Changing options in menu causes the title “Menu” to change to “root” ... note: fix is based on removing duplicated top-level menu entry from stack view	2018-01-12 02:08:10 +03:00
Seth Alves	57368fb786	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-11 14:23:51 -08:00
John Conklin II	96babdf2e2	Merge pull request #12135 from luiscuenca/palVolumeSlider ... RC62 Pal volume slider fix	2018-01-11 13:36:03 -08:00
Seth Alves	1e92615459	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-11 13:21:45 -08:00
vladest	cff80e86b6	Temporarily disable magnification until further notice	2018-01-11 22:18:22 +01:00
howard-stearns	2987d21f66	remove some more	2018-01-11 13:15:34 -08:00
howard-stearns	c39771d995	do not delete wallet file when things go wrong, and remove obsolete ... reset machinery	2018-01-11 11:50:23 -08:00
luiscuenca	54a1da8d73	Only mod my card	2018-01-11 11:55:28 -07: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	c09f644612	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-11 09:09:11 -08:00
David Rowe	a543d90090	Miscellaneous fixes	2018-01-11 15:53:45 +13:00
David Rowe	7ba42f0e76	Update JSDoc per recent changes in Window API	2018-01-11 15:52:56 +13:00