54941 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Vladyslav Stelmakhovskyi	fa9a4053ca	Save selected device in settings to make sure it will not be changed back in Menu	2017-05-08 21:24:46 +02:00
David Kelly	7d0494dd56	use new images in api/v1/users response json	2017-05-08 12:15:03 -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
Mike Moody	dae652d3db	v1 HMD duplication overlay.	2017-05-08 11:25:24 -07:00
Ryan Huffman	c73c59baee	Move changes in AC audio searcher from tutorial content into git	2017-05-08 11:19:05 -07: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
Vladyslav Stelmakhovskyi	d0111ac0bb	Merge branch 'master' into audio-source-sync	2017-05-08 20:09:34 +02:00
Seth Alves	c8cdad5b4e	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-08 11:02:42 -07:00
Seth Alves	fd238f5438	working on fixing action/constraint export/import	2017-05-08 11:02:35 -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
Clément Brisset	8df8ed568f	Merge pull request #10342 from huffman/feat/tutorial-update ... DNM Tutorial update	2017-05-08 10:54:19 -07:00
Andrew Meadows	f00a3cafb6	cleanup logic to be more readable	2017-05-08 10:52:54 -07:00
Ryan Huffman	9b098a4bf7	Fix randFloat error in ac audio searcher	2017-05-08 10:51:13 -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	d88d52cd2e	Merge pull request #9735 from humbletim/21190-fix-unit-tests ... CR 21190 unit_tests: add support for jasmine.done() and pending	2017-05-08 09:19:01 -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
Seth Alves	cfe118e2c6	start on code to remap constraint IDs during import	2017-05-07 19:42:24 -07:00
Seth Alves	7a1a9d6496	start on code to remap constraint IDs during import	2017-05-07 19:42:04 -07:00
Rob Kayson	1873558df1	added floating lantern box that spawns floating lanterns	2017-05-06 18:41:57 -07:00
Mike Moody	03490c81da	v1 with bug, looking into.	2017-05-06 15:36:18 -07:00
Brad Davis	b63015eaea	Fix sped up animations	2017-05-06 14:34:28 -07:00
Seth Alves	5d539bcc17	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-06 07:49:02 -07:00
Seth Alves	9e0845f17e	Merge pull request #10387 from vladest/tablet-performance ... Decrease CPU usage in tabletUI periodical updates	2017-05-06 07:07:29 -07:00
Vladyslav Stelmakhovskyi	b2be22f0e0	Maerge broke the logic. Fixed now	2017-05-06 10:28:57 +02:00
Clément Brisset	37f339858e	Merge pull request #10397 from huffman/feat/baked-tutorial ... Update content set URL	2017-05-05 17:34:41 -07:00
Chris Collins	0a16831395	Merge pull request #10396 from Atlante45/master ... Stable -> Master	2017-05-05 16:47:51 -07:00
Ryan Huffman	4895f51dc1	Update content set URL	2017-05-05 16:41:32 -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
Atlante45	d4bd145786	Merge branch 'stable' of https://github.com/highfidelity/hifi	2017-05-05 16:36:21 -07:00
Dante Ruiz	a744db56aa	removed dead code	2017-05-06 00:21:52 +01:00
David Rowe	1b26ba22cb	Fix browser history in goto "i" pages on tablet	2017-05-06 11:13:13 +12:00
Dante Ruiz	8813306857	fixed the wierd rotation issue	2017-05-05 23:59:38 +01:00
Don Hopkins	c6eb1aa4e8	Fixed silly bugs with /who response and drawing lines to identify avatars. DOH!	2017-05-05 23:32:05 +01: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
Dante Ruiz	20c8356bb2	debugging rotation fix	2017-05-05 22:55:53 +01:00
Seth Alves	b2ccc33a79	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-05 14:52:07 -07: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 Fox	6b00688289	Merge pull request #10392 from zfox23/AvailabilityLanguageChanges ... "Set Availability" UI changes	2017-05-05 14:03:39 -07: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 Fox	a10606b994	OMG language changed again	2017-05-05 11:44:59 -07:00
Zach Fox	905f36976f	New language	2017-05-05 11:28:49 -07:00
Howard Stearns	f676c84477	Merge pull request #10393 from howard-stearns/announcement-card-tweak ... Announcement Card visual tweaks.	2017-05-05 11:22:10 -07:00
howard-stearns	2ecc71a990	Annoncement Card visual tweeks.	2017-05-05 10:49:09 -07:00
Zach Fox	b41fb952ae	UI changes - Thanks Alan!	2017-05-05 10:29:46 -07:00