54103 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Dante Ruiz	cd095915ef	removed emacs junk file from my repo	2017-04-18 00:32:30 +01:00
Dante Ruiz	31b61c3225	removed white space	2017-04-18 00:24:34 +01:00
Dante Ruiz	e46d9da98f	fixed merge conflict	2017-04-18 00:22:35 +01:00
Dante Ruiz	6d44cd4d1e	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-18 00:18:55 +01:00
Dante Ruiz	c298886896	hooking up the input playback	2017-04-18 00:17:14 +01:00
David Rowe	f920192244	Fix up script tear-down	2017-04-18 08:22:29 +12:00
Zach Fox	d1a11740f0	Whoops	2017-04-17 13:00:23 -07:00
volansystech	7e0efed062	Improve speed of grabbing.	2017-04-18 00:54:01 +05:30
Zach Fox	9c4e367245	Merge pull request #10213 from zfox23/fixGoToFocus ... FB 4156; Fix GoTo text field focus; other GoTo tweaks	2017-04-17 12:13:41 -07:00
Zach Fox	e6edce5352	Entirely remove addressBarToggle()	2017-04-17 12:13:01 -07:00
Brad Hefta-Gaub	f841a18de4	Merge pull request #10230 from zfox23/fixGetAvatarACScripts ... Fix getAvatar() not working for AC scripts	2017-04-17 12:04:11 -07:00
Zach Fox	e13000410e	Whoops	2017-04-17 11:02:27 -07:00
David Kelly	af08df85c8	Merge pull request #10229 from davidkelly/dk/shareableURLForUserStories ... put shareable_url in UserStory details when creating	2017-04-17 10:55:47 -07:00
Zach Fox	7a7cfb84e5	Remove HMD keyboard focus toggle on AddressBar input	2017-04-17 10:08:40 -07:00
Dante Ruiz	3eb9b37c29	Merge branch 'master' of github.com:highfidelity/hifi into webview-redesign	2017-04-17 16:41:15 +01:00
David Kelly	3e268fbf68	put shareable_url in UserStory details when creating	2017-04-17 07:38:24 -07:00
Thijs Wenker	588ddfde8d	fix the Script.require based entity import functionality	2017-04-17 13:35:28 +02:00
Thijs Wenker	12ef157316	cr fixes and some more style/ESLINT/structure	2017-04-17 13:16:10 +02:00
Thijs Wenker	d101bdb952	Merge branch 'master' of https://github.com/highfidelity/hifi into gameTable2	2017-04-17 13:12:12 +02:00
Sam Cake	2d35f95930	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-16 23:31:06 -07:00
druiz17	4bf3fa56f8	saving work	2017-04-16 21:26:09 -07:00
Seth Alves	fbd4677a9a	add a way to set hinge-constraint motor speed from javascript	2017-04-15 21:10:02 -07:00
Seth Alves	b4ff3a8691	don't destroy and recreate constraints when reinserting rigid body	2017-04-15 21:08:59 -07:00
David Rowe	7dcda47f95	Fix recording GIF still displaying when reopen tablet to stop recording	2017-04-16 12:57:37 +12:00
Seth Alves	d42970d480	fix hinge-constraint constructors to use otherAxis	2017-04-15 08:51:08 -07:00
Seth Alves	db98020974	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-15 07:22:16 -07:00
Sam Cake	61ed5c3ce9	THank you mac	2017-04-15 01:35:28 -07:00
Sam Cake	2b97171061	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 01:06:01 -07:00
Sam Cake	038d01ce04	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 00:45:50 -07:00
Sam Cake	96960a505d	COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side	2017-04-14 23:22:45 -07:00
David Rowe	15128faa49	Fix (work around) tablet access at Interface start-up crashing Interface	2017-04-15 17:11:03 +12:00
Zach Fox	e65079f826	Merge pull request #10224 from zfox23/fixGifSharing ... Fix GIFs not sharing	2017-04-14 18:44:41 -07:00
David Rowe	ef8f36026c	Improve speed of starting playing animations at server start-up	2017-04-15 13:20:42 +12:00
David Rowe	e91cf4a4e8	Use "i" circle for info button	2017-04-15 12:50:00 +12:00
David Rowe	e7fb268843	Update to use modified Recording API	2017-04-15 12:18:50 +12:00
Seth Alves	2a76061ef3	Merge branch 'bullet-constraints-0' of github.com:sethalves/hifi into bullet-constraints-1	2017-04-14 16:38:50 -07:00
Seth Alves	5fba4654c8	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-14 16:37:48 -07:00
Seth Alves	41fb05ecf7	bump protocol version	2017-04-14 16:26:54 -07:00
Seth Alves	371118a6c0	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 16:26:30 -07:00
Zach Fox	b410399a16	Resolve your paths, silly!	2017-04-14 16:26:29 -07:00
Seth Alves	f08fecbfa7	make sure new constraint data gets transmitted over network	2017-04-14 16:25:27 -07:00
Zach Fox	85e5173abe	Fix embedded location	2017-04-14 16:11:37 -07:00
Zach Fox	f81dce5e70	Fix the bug	2017-04-14 15:42:19 -07:00
Seth Alves	66137e78a2	grab script checks for touch devices continually, rather than just when the script starts	2017-04-14 15:28:56 -07:00
Andrew Meadows	6a8ddee878	send keep-alive packets but don't resend identity	2017-04-14 15:16:14 -07:00
Andrew Meadows	06b9fd6a7e	don't keep stale avatars alive	2017-04-14 15:16:02 -07:00
Andrew Meadows	d72f6cf45e	avatar-mixer to send identity packets as 'reliable'	2017-04-14 15:15:54 -07:00
Andrew Meadows	eaefa3d3f2	avatar-mixer resends to avoid stale avatar	2017-04-14 15:15:45 -07:00
Chris Collins	6a6800b8c3	Merge pull request #10222 from sethalves/fix-late-touch-cant-grab-tablet ... fix can't grab tablet	2017-04-14 14:57:06 -07:00