55926 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	e3b4e4aa20	Disable print statements	2017-06-14 15:37:36 +12:00
David Rowe	395d40f0f9	Fix script default to match C++ default	2017-06-14 12:21:19 +12:00
David Rowe	be2bcb1c13	Turn with head roll in HMD when walking or flying	2017-06-14 12:20:46 +12:00
David Rowe	05f19d54f4	Add HMD roll control JavaScript API	2017-06-14 11:55:04 +12:00
Brad Hefta-Gaub	88929c7bd7	Merge pull request #10679 from zzmp/audio/check-timer ... start device check timer	2017-06-13 15:37:50 -07:00
Zach Pomerantz	9017738a8d	start device check timer	2017-06-13 18:00:41 -04:00
Brad Hefta-Gaub	ae81738f1f	Merge pull request #10675 from jherico/vive_audio ... Add support for querying the desired output audio device for OpenVR	2017-06-13 13:25:58 -07:00
Anthony Thibault	0d46b78bff	Merge pull request #10541 from Menithal/21324 ... Reworked Particle Editor UI	2017-06-13 13:00:54 -07:00
Chris Collins	90c4d7d666	Merge pull request #10674 from samcake/brown ... Fix bug in clearFramebuffer with Stencil Buffer	2017-06-13 11:25:06 -07:00
Chris Collins	33bf8cc20e	Merge pull request #10672 from howard-stearns/fix-teleport-vs-stuck-in-floor ... fix teleport vs stuck-in-floor work	2017-06-13 11:13:35 -07:00
Brad Davis	c3f664502a	Add support for querying the desired output audio device for OpenVR	2017-06-13 10:57:10 -07:00
Matti Lahtinen	35f83afd09	Removed unneccessary print	2017-06-13 20:43:14 +03:00
Menithal	c2c1e607c0	Formating	2017-06-13 20:31:41 +03:00
Menithal	395cc55fb2	Fixed formatting	2017-06-13 20:20:54 +03:00
Menithal	020760cc97	21324: Fixed accidental inccorect bracket	2017-06-13 20:16:56 +03:00
Menithal	00701eb5c7	Merge remote-tracking branch 'origin/master' into 21324	2017-06-13 19:08:37 +03:00
Menithal	0edb763dac	21324: Formatting and PR Feedback Changes	2017-06-13 19:06:47 +03:00
Sam Cake	f4ed635725	Fix bug in clearFramebuffer with Stencil Buffer	2017-06-12 22:59:42 -07:00
Brad Hefta-Gaub	cbff1910e2	Merge pull request #10660 from birarda/bug/fileOnUrl ... simplify fileOnUrl to only look for external textures right beside FBX	2017-06-12 21:59:17 -07:00
Brad Davis	db8bdbc0a6	Merge pull request #10659 from samcake/orange ... simple Render Engine refactors coming from the Spectator Cam project	2017-06-12 20:31:07 -07:00
Brad Hefta-Gaub	0a84a75bde	Merge pull request #10650 from jherico/web_event_handlers ... Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 19:23:01 -07:00
Seth Alves	aeaddd23c7	Merge pull request #10658 from seefo/fb5087 ... Resolved FB5087	2017-06-12 17:25:05 -07:00
Brad Davis	308e7295cc	Merge pull request #10657 from jherico/tablet_deadlock ... Attempt to resolve Tablet scripting interface deadlocks	2017-06-12 17:06:58 -07:00
howard-stearns	3d4f9be05b	fix teleport vs stuck-in-floor work	2017-06-12 17:01:13 -07:00
Brad Hefta-Gaub	347742be1b	Merge pull request #10601 from birarda/mannequin-avatar ... Update default avatar to baked mannequin	2017-06-12 16:42:37 -07:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Chris Collins	123ed81e20	Merge pull request #10664 from zfox23/FB5260_PotentialFontCrash ... Potentially fix a crash in font loading	2017-06-12 11:49:08 -07:00
Andrew Meadows	321e307c9f	Merge pull request #10609 from 1P-Cusack/21317 ... WL21317 helper functions for getting into avatar coordinate space	2017-06-12 11:18:29 -07:00
seefo	cb5a114145	Fixed Ubuntu warning	2017-06-12 10:47:55 -07:00
Zach Fox	e96c55956f	First pass at the fix	2017-06-12 09:53:14 -07:00
Seth Alves	92fe8145be	Merge pull request #10616 from vladest/create_button_sticked ... Set active button property isActive before Home menu redraw. Makes su…	2017-06-11 13:43:41 -07:00
Chris Collins	4b6c13bc1f	Merge pull request #10646 from ZappoMan/debugAudioProblems ... Fix for no-audio on clean install	2017-06-10 11:32:42 -10:00
Seth Alves	eb049c8c6e	Merge pull request #10624 from misslivirose/feat/add-primitive-shapes ... Add additional primitive shapes	2017-06-09 19:02:54 -07:00
Clément Brisset	8e62bdea40	Merge pull request #10538 from ctrlaltdavid/21345 ... Position tablet relative to hand	2017-06-09 17:01:37 -07:00
Stephen Birarda	d2bea94768	simplify fileOnUrl to always look right beside FBX	2017-06-09 15:52:21 -07:00
Brad Hefta-Gaub	6006fa0fe1	Merge pull request #10638 from samcake/hobbes ... Adjust the preview to avoid seeing the masked pixels in HMD mode	2017-06-09 15:38:33 -07:00
samcake	bb38938534	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-09 14:34:25 -07:00
David Rowe	fff8876b21	Code review	2017-06-10 09:33:45 +12:00
Stephen Birarda	8bc7ce6357	put back defaultAvatar_full.fst mode to 644	2017-06-09 13:55:57 -07:00
ZappoMan	6fe20f90a3	add better debugging for audio problems ... use OS default device if settings have no values	2017-06-09 13:36:12 -07:00
seefo	0343d4e443	Resolved FB5087	2017-06-09 13:33:46 -07:00
Stephen Birarda	e658953246	Merge pull request #10645 from seefo/oven ... Oven will now give proper return codes when used via CLI	2017-06-09 13:06:09 -07:00
Liv	7785473ccb	moving else	2017-06-09 12:59:08 -07:00
Seth Alves	3f425a5f02	Merge pull request #10649 from sethalves/fix-head-puck-broken-eyes ... Fix head puck broken eyes	2017-06-09 12:50:53 -07:00
seefo	d17bd4352a	Merge pull request #10651 from seefo/fb5009 ... Resolved FB5009	2017-06-09 11:57:29 -07:00
Stephen Birarda	3582e5110e	Merge pull request #10644 from seefo/fb5005 ... Resolved FB5005	2017-06-09 11:55:45 -07:00
Liv	8c488d95d1	Stylish updates	2017-06-09 11:46:38 -07:00
seefo	06a5d0970c	Fixed issue with invalid time being sent when logging	2017-06-09 10:58:07 -07:00
Liv	1808505d8b	Coding standard fixes	2017-06-09 10:54:57 -07:00
Seth Alves	5b62c9e83b	try again to get forward not-looking-at-anyone gaze to work right	2017-06-09 10:45:04 -07:00