54941 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	9289cd2022	Merge pull request #10398 from zfox23/PAL_FixIDPacketOrder ... Fix the PAL not showing user info for user who opened PAL	2017-05-11 15:16:05 -07:00
David Kelly	ae5f9e4fb1	animate scroll of partially visible cards	2017-05-11 15:10:19 -07:00
Dante Ruiz	539aaf8c59	add debug statment and fixed sorting order	2017-05-11 23:00:41 +01:00
Atlante45	6378b96b4c	CR	2017-05-11 14:41:02 -07:00
David Kelly	52c288bfed	Desktop users of different height can shake hands	2017-05-11 14:20:42 -07:00
Seth Alves	ac2bc39a27	try, try again	2017-05-11 14:10:03 -07:00
Atlante45	9138ec53e9	Don't send avatars to previous lookup on server restart	2017-05-11 14:07:36 -07:00
druiz17	e4df4369ad	Merge pull request #10436 from druiz17/config-ui ... Added the ability to choose puck configuration from the general settings	2017-05-11 13:39:05 -07:00
Seth Alves	a26f9c7887	make _size const	2017-05-11 13:36:05 -07:00
Seth Alves	9d63113e62	Merge pull request #10337 from vladest/audio-source-sync ... Audio source sync	2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi	045e93fb95	Code style fixes #2	2017-05-11 21:49:07 +02:00
Dante Ruiz	5d457eaa39	better handling of when lost tracking of pucks	2017-05-11 20:44:08 +01:00
Seth Alves	19401af3e1	Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage	2017-05-11 12:43:05 -07:00
Atlante45	e0863aa50f	Only open files for write if necessary	2017-05-11 11:54:52 -07:00
Zach Fox	15574f509e	Clarifying comments	2017-05-11 11:45:07 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
Anthony J. Thibault	a14fa5dab9	code review feedback	2017-05-11 10:54:15 -07:00
Andrew Meadows	0852852f39	Merge pull request #10443 from ctrlaltdavid/21326-2 ... Fix avatar recording playback mouth not moving	2017-05-11 10:41:41 -07:00
Seth Alves	80e6edda0c	code review	2017-05-11 10:13:15 -07:00
Seth Alves	4042e2bceb	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-11 09:29:30 -07:00
David Kelly	0ea5bf7834	Merge pull request #10440 from davidkelly/dk/fixSettingsDialog ... Fix for multiple settings dialogs	2017-05-11 08:11:16 -07:00
Seth Alves	dfb9fecf17	pad MemoryStorage size to multiple of 4 rather than using a vector of uint32_t -- this gets the same alignment without needs casts	2017-05-11 07:11:40 -07:00
Seth Alves	712386f256	Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage	2017-05-11 06:55:49 -07:00
Vladyslav Stelmakhovskyi	4290eb21ea	Fixed possible crashes/freezes on input audio switch	2017-05-11 15:41:07 +02:00
Vladyslav Stelmakhovskyi	f963233a7b	Merge branch 'master' into audio-source-sync	2017-05-11 15:25:24 +02:00
Vladyslav Stelmakhovskyi	e4d9772bbc	Fixed crashes/freezes on audio switch	2017-05-11 15:20:36 +02:00
Thijs Wenker	0a3a2705af	Merge pull request #10426 from huffman/fix/tablet-invisible-by-default ... Fix tablet showing up for a short period of time on launch	2017-05-11 15:03:52 +02:00
Mike Moody	89d93ee56d	Updated HMD grab Clone to work with all entity types.	2017-05-11 04:16:22 -07:00
David Rowe	e426d70437	Improve variable name	2017-05-11 18:37:23 +12:00
David Rowe	98b943269b	Sum of blendshapes is used sent through avatar mixer	2017-05-11 18:17:35 +12:00
David Rowe	21f9594f81	Sum of blendshapes is used for recording	2017-05-11 18:17:12 +12:00
David Rowe	1b855f2c6b	Voice modulation and facetrackers write to transient blendshapes	2017-05-11 18:15:38 +12:00
Philip Rosedale	f9567d0330	Merge pull request #10182 from CraftsmanMG/master ... hifi: #21216 - Resize entities with hand controllers while editing	2017-05-10 22:03:35 -07:00
David Rowe	3b06b03e01	Rename blendshapes variables in preparation for repurposing	2017-05-11 16:46:36 +12:00
Philip Rosedale	5fe18bc217	Merge pull request #10435 from AndrewMeadows/truncate-mouth-time ... avoid floating point error when generating fake mouth shapes	2017-05-10 21:17:21 -07:00
Philip Rosedale	5f4625dbed	Merge pull request #10232 from amvmoody/master ... audience applause meter	2017-05-10 21:10:05 -07:00
David Kelly	4cc0aaf102	Fix for multiple settings dialogs	2017-05-10 18:31:57 -07:00
Seth Alves	c9868640c1	force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D	2017-05-10 18:14:50 -07:00
Anthony J. Thibault	147d067c4e	Merge branch 'master' into feature/ik-solver-init-config	2017-05-10 18:12:39 -07:00
anshuman64	1be404ef87	Merge pull request #10438 from druiz17/input-recorder-fix ... fix issue when loading recording file into the input recorder	2017-05-10 17:34:46 -07:00
Dante Ruiz	7687617e91	made requested changes	2017-05-11 00:32:42 +01:00
Dante Ruiz	0cae299192	fix issue when loading file to the input recorder	2017-05-11 00:20:21 +01:00
Atlante45	79d53d92a1	Use baked default skybox	2017-05-10 16:03:02 -07:00
Zach Fox	ae983658be	Finally, the actual fix?	2017-05-10 15:59:19 -07:00
Dante Ruiz	0f0bf79367	Merge branch 'master' of github.com:highfidelity/hifi into config-ui	2017-05-10 22:12:26 +01:00
Dante Ruiz	4365907462	drop down puck configuration for gernal settings	2017-05-10 22:12:11 +01:00
Howard Stearns	3c652a52d8	Merge pull request #10431 from davidkelly/dk/messageLoggedInStatus ... minor handshake script update	2017-05-10 13:54:21 -07:00
Vladyslav Stelmakhovskyi	2328da3c48	Merge branch 'master' into audio-source-sync	2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi	2d46f9d30e	Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum	2017-05-10 21:21:39 +02:00
Andrew Meadows	a3df55915b	avoid floating point error in fake mouth shapes	2017-05-10 12:02:37 -07:00