56806 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	495f702722	Merge pull request #10868 from CainFoool/rocket-hands ... WL 21421 - Script to Fly with Rocket Hands	2017-07-03 12:05:06 -07:00
Cain Kilgore	eddb7a349c	Boilerplate	2017-07-03 20:01:01 +01:00
Cain Kilgore	1c5923914b	Combining three if statements into one!	2017-07-03 19:58:26 +01:00
Cain Kilgore	bfcddcf3b7	Cleaned up the code, created a function to check if the hands are in the right position.	2017-07-03 19:53:29 +01:00
Cain Kilgore	5f600b4ea9	Cleanup again	2017-07-03 19:31:41 +01:00
Cain Kilgore	44624c5fab	space	2017-07-03 19:11:57 +01:00
Cain Kilgore	2c53b5b372	QA Cleanup	2017-07-03 19:09:54 +01:00
Cain Kilgore	7d382d9da0	Fixed spelling, added is in HMD Check, removed Haptic Feedback as it wasn't part of the WL	2017-07-03 17:47:54 +01:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Chris Collins	19bbe307b2	Merge pull request #9927 from Patterntrick/21210 ... Xylophone scripts	2017-07-03 05:57:36 -07:00
Cain Kilgore	44f0b8bd60	Support for Oculus & Vive - cleaned up some code, using Script.connect instead of setInterval	2017-07-02 11:41:33 +01:00
Cain Kilgore	a693a61ec8	Cleanup	2017-07-02 03:20:54 +01:00
Cain Kilgore	e0120ebf30	Rocket Hands	2017-07-02 03:20:07 +01:00
Clément Brisset	8744b8e58d	Merge pull request #10859 from Atlante45/fix/ac-cleanup ... Fix AC cleanup	2017-06-30 16:42:15 -07:00
Stephen Birarda	f6fe3f91fd	Merge pull request #10829 from birarda/bug/sequence-skips ... fix avatar mixer sending empty avatar identities	2017-06-30 15:28:29 -07:00
Ryan Downe Karpf	ddce264dd9	Merge pull request #10819 from Menithal/21387 ... WL21387 - Avatar Bookmarks now save Attachment Data and scale PR#2	2017-06-30 14:57:04 -07:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
Atlante45	85601669e1	Prevent thrashing by limiting to 10 restarts every 10 minutes	2017-06-30 14:34:49 -07:00
Brad Davis	3f48c7aef5	Merge pull request #10855 from jherico/snapshot ... Fix snapshot connection errors	2017-06-30 12:58:48 -07:00
utkarshgautamnyu	c81211edef	Merge pull request #10848 from highfidelity/snapshot.js_modify ... Update snapshot.js	2017-06-30 12:40:08 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	9c37b28ba0	Remove tool window logic	2017-06-30 10:58:19 -07:00
utkarshgautamnyu	82597ac424	Update snapshot.js	2017-06-30 10:22:05 -07:00
Zach Fox	0f9c917965	Merge pull request #10853 from samcake/brown ... Fix projection & lighting issues identified with 2nd rendering pipeline In Master	2017-06-30 10:05:54 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
Cain Kilgore	a3db9ae726	Begin Rocket Hands branch	2017-06-30 15:40:42 +01:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Atlante45	22099a14a8	Go Home spawns interface detached	2017-06-29 13:50:40 -07:00
Atlante45	ec7fe81b87	Sandbox doesn't restart Interface.	2017-06-29 13:22:11 -07:00
Menithal	bf0a8e0f91	Updated Comment	2017-06-29 23:18:52 +03:00
anshuman64	b22daa9a6f	Merge pull request #10838 from druiz17/avatar-recording-roomscale ... Fix loading of incorrect joint data for the avatar recording	2017-06-29 12:24:37 -07:00
Atlante45	5c731636b1	Sandbox restarts crashed processes	2017-06-29 12:13:52 -07:00
utkarshgautamnyu	7353014968	Merge pull request #10857 from highfidelity/agent_bug ... Update DomainMetadata.cpp	2017-06-29 11:30:43 -07:00
Atlante45	76e39a3ebd	Make code windows specific	2017-06-29 10:54:44 -07:00
utkarshgautamnyu	5f123018a4	Update DomainMetadata.cpp	2017-06-29 10:38:33 -07:00
Seth Alves	c4667aa1a7	Merge pull request #10839 from vladest/file_dialog_crash_qt59 ... File dialog crash qt59	2017-06-29 10:34:26 -07:00
Brad Davis	6e5eff9407	Fix snapshot connection errors	2017-06-29 10:01:48 -07:00
Sam Gateau	b766c256db	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-29 10:29:05 +02:00
Atlante45	a66e1148ba	Preliminary work on AC auto cleanup	2017-06-28 19:20:18 -07:00
Chris Collins	3a096381ce	Merge pull request #10851 from Atlante45/master ... Stable => Master	2017-06-28 17:28:54 -07:00
Atlante45	fbe1518d1f	Merge branch 'stable' of https://github.com/highfidelity/hifi	2017-06-28 17:26:16 -07:00
Thijs Wenker	e781f97ddc	Merge pull request #10846 from sethalves/fix-server-scripts-more ... make ResourceManager be owned by DependencyManager	2017-06-28 17:05:30 -07:00
Howard Stearns	3606418a22	Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug ... minor fix for --scripts switch	2017-06-28 16:11:18 -07:00
Thijs Wenker	d5289d357b	I need to setup my code-editor, spaces.	2017-06-29 01:01:59 +02:00
Thijs Wenker	93679f7c3b	move the ResourceManager init back to where it was, to prevent problems	2017-06-29 00:52:51 +02:00
utkarshgautamnyu	e6be838e79	Update snapshot.js	2017-06-28 15:30:49 -07:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
Andrew Meadows	e9edf01a34	Merge pull request #10831 from kencooke/audio-hrtf-optimize ... More HRTF optimizations	2017-06-28 14:17:00 -07:00
David Kelly	48de8011b2	cr feedback	2017-06-28 14:15:29 -07:00
Seth Alves	5617860fe4	Merge pull request #10841 from sethalves/fix-server-scripts ... fix server scripts AC	2017-06-28 11:56:32 -07:00