22422 commits

Author	SHA1	Message	Date
Zach Fox	9ab643c416	I think this is all that must be done.	2017-05-09 15:33:33 -07:00
Zach Pomerantz	45feee38b2	Merge pull request #10269 from zzmp/fix/audio-bg-join ... Cleanup Audio background threads on shutdown	2017-05-09 17:23:36 -04:00
Seth Alves	48c78584c3	fix a bug that could cause OBJ models with external mtl references to hang the loading thread	2017-05-09 11:09:39 -07:00
Andrew Meadows	e92e710cdc	Merge pull request #10413 from humbletim/fix_lookat_regression ... Fix lookAt eye snapping	2017-05-09 08:51:10 -07:00
humbletim	29b1ac3572	optimizations per feedback	2017-05-08 21:50:24 -04:00
humbletim	68ca0d921e	use assert rather than whole if block	2017-05-08 21:34:55 -04:00
Andrew Meadows	2835a73c6b	Merge pull request #10071 from AndrewMeadows/walk-up-steps ... avatar can walk up steps	2017-05-08 18:17:16 -07:00
Zach Pomerantz	73a3bf413b	update local audio thread name	2017-05-08 20:14:09 -04:00
Zach Pomerantz	defc3c1c4f	Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join	2017-05-08 19:55:10 -04:00
humbletim	ef0e32643d	update refactored logic to match previous application behavior	2017-05-08 18:53:47 -04:00
Andrew Meadows	e44c2c8da3	init zero gravity to agree with init hover state	2017-05-08 12:47:32 -07:00
Thijs Wenker	5aed960c4c	Merge pull request #10389 from AndrewMeadows/render-collision-shapes-002 ... fix render of debug collision shapes	2017-05-08 20:35:59 +02:00
Brad Hefta-Gaub	d52daf3445	Merge pull request #10378 from samcake/orange ... Adding a test to protect Uniform Buffer binding at wrong slot	2017-05-08 11:16:56 -07:00
Andrew Meadows	d9e893ac21	minior optimization/cleanup	2017-05-08 11:02:11 -07:00
Andrew Meadows	0f643b7d66	add check to avoid divide by zero	2017-05-08 10:59:15 -07:00
Andrew Meadows	f00a3cafb6	cleanup logic to be more readable	2017-05-08 10:52:54 -07:00
Chris Collins	4bfb23b5d2	Merge pull request #10388 from humbletim/21308 ... CR #21308 Fix Script.print	2017-05-08 10:46:49 -07:00
Chris Collins	1264c34f6c	Merge pull request #10349 from birarda/machine-guid-fingerprint ... use MachineGuid for slightly safer windows machine fingerprint	2017-05-08 10:42:14 -07:00
Chris Collins	0351ac1575	Merge pull request #10401 from jherico/fix_benny_hill_animations ... Fix sped up animations	2017-05-08 09:11:23 -07:00
Chris Collins	b4118e5619	Merge pull request #10394 from zzmp/fix/local-audio-prep ... Guard against local audio crashes	2017-05-08 09:04:41 -07:00
Brad Davis	b63015eaea	Fix sped up animations	2017-05-06 14:34:28 -07:00
Chris Collins	820ed5049b	Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire ... Fix -- dont send non-entity edits to entity-server	2017-05-05 16:37:27 -07:00
Zach Pomerantz	7db404eba0	recast avoid overwriting buffer logic	2017-05-05 18:16:48 -04:00
Zach Pomerantz	ed3fc004a6	avoid assignment-as-test	2017-05-05 18:15:56 -04:00
Clément Brisset	479e810173	Merge pull request #10364 from huffman/fix/ktx-skybox-loading ... Fix progressive loading of KTX skybox textures	2017-05-05 14:11:03 -07:00
Zach Pomerantz	48af83a960	guard against audio injector and local buffer datarace	2017-05-05 17:05:40 -04:00
Zach Pomerantz	cdf6c332a6	prevent overflow of local injectors buffer	2017-05-05 16:29:52 -04:00
Zach Pomerantz	e882e7b648	rm extra lock in audio read	2017-05-05 15:37:01 -04:00
Zach Pomerantz	ca7cd61c64	Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join	2017-05-05 13:04:01 -04:00
Chris Collins	fd836dcd68	Merge pull request #10366 from Atlante45/feat/normal-map-compression ... Feat/normal map compression	2017-05-05 10:03:01 -07:00
Andrew Meadows	2bfbb63906	remove unused variable	2017-05-05 09:37:01 -07:00
Andrew Meadows	8ed93783bd	fix step up velocity calculation	2017-05-05 09:37:01 -07:00
Andrew Meadows	cd7be46b70	tweak threshold for minimum stepheight	2017-05-05 09:37:01 -07:00
Andrew Meadows	6e8d90e3b6	restore clear of follow accumulators	2017-05-05 09:37:01 -07:00
Andrew Meadows	fe401c7488	improved management of collisionless avatar state	2017-05-05 09:37:00 -07:00
Andrew Meadows	95a4bb9ef4	fix transition height from hover to stand	2017-05-05 09:35:49 -07:00
Andrew Meadows	e449c48888	remove one more line of cruft	2017-05-05 09:35:49 -07:00
Andrew Meadows	d34b667e82	remove kinematic character controller implemention	2017-05-05 09:35:49 -07:00
Andrew Meadows	94ee6d6838	fix driving motion of collisionless avatars	2017-05-05 09:35:49 -07:00
Andrew Meadows	e21bd7a67a	help avatar walk up steps	2017-05-05 09:35:49 -07:00
Andrew Meadows	a31a861e19	fix typo: physcis --> physics	2017-05-05 09:33:50 -07:00
Seth Alves	7f4399b0a3	fix name in entity-edit-an-overlay warning	2017-05-04 19:16:15 -07:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	a7c684e007	entity scripting call to get the nestable-type of an object, by id	2017-05-04 19:05:29 -07:00
Seth Alves	51cb579773	function to turn nestable-type into a string	2017-05-04 19:05:01 -07:00
Seth Alves	d25db099b9	be more effecient about ignoring edits to unknown entities	2017-05-04 18:49:46 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
humbletim	c17d1a6d88	manually promote glm values to double when stringifying (to prevent -Wdouble-promotion "error")	2017-05-04 19:21:32 -04:00
Stephen Birarda	1857b297e0	don't re-grab the machine fingerprint every DS connection	2017-05-04 16:00:46 -07:00
Stephen Birarda	f39411656a	use machine GUID from registry for machine ID	2017-05-04 16:00:46 -07:00