34284 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	b1d5a36dc6	removing useless differences	2015-11-06 16:40:46 -08:00
samcake	bc852d8eab	removing useless differences	2015-11-06 16:39:23 -08:00
samcake	5fb2c3ccd1	resolve merge conflict	2015-11-06 16:27:47 -08:00
samcake	4dbca68767	Updating the legacy file format to support the joint translation and also fix the replay problem oof the joints going to the moon	2015-11-06 16:24:19 -08:00
Clément Brisset	143e92ee1b	Merge pull request #6300 from jherico/lisa ... Breaking up InputDevices and InputPlugins, cleanup of some shared_ptr madness	2015-11-06 16:15:53 -08:00
Eric Levin	eda467e252	Merge pull request #6335 from imgntn/promises ... Adapt Promises Library and Add Example	2015-11-06 16:10:28 -08:00
Brad Davis	bf70ae4724	PR feedback	2015-11-06 15:59:13 -08:00
Brad Davis	7c433f47c0	Breaking up input devices and input plugins classes.	2015-11-06 15:20:00 -08:00
James B. Pollack	ced1a4899d	promises	2015-11-06 15:10:23 -08:00
Andrew Meadows	e410030dd9	Merge pull request #6320 from hyperlogic/tony/blender-avatar-ik-fix ... IK fix for avatars exported from Blender	2015-11-06 15:00:25 -08:00
James B. Pollack	8eea7ff67c	Merge pull request #6329 from sethalves/fix-grab-release ... send to server upon grab release	2015-11-06 14:33:08 -08:00
Brad Davis	55dc486556	Merge pull request #6331 from AlessandroSigna/controllers ... Changes to Standard.RY	2015-11-06 14:24:59 -08:00
Eric Levin	7be537c49c	Merge pull request #6332 from imgntn/bubblwand_links ... Update Bubblewand Model References	2015-11-06 13:28:27 -08:00
James B. Pollack	1d41ef868b	update bubblewand model refs	2015-11-06 13:11:06 -08:00
AlessandroSigna	fdd4a55057	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-06 12:47:04 -08:00
AlessandroSigna	6d3a79af83	changed the behaviour of Standard.LY input	2015-11-06 12:46:08 -08:00
samcake	703a6bdb95	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-06 12:38:07 -08:00
Clément Brisset	5d80dc0c90	Merge pull request #6324 from sethalves/smooth-hold-action-velocity ... smooth hold action velocity over 2 frames	2015-11-06 12:25:52 -08:00
Seth Alves	46b7b92b2f	prefix private member variables with _	2015-11-06 11:54:51 -08:00
samcake	a82c2d66ed	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-06 11:53:49 -08:00
Brad Davis	1dc392bb36	Merge pull request #6330 from Atlante45/master ... // FIXME incredibly evil....	2015-11-06 11:43:33 -08:00
samcake	640845c944	Merge pull request #6328 from jherico/rec2 ... Add recording classes	2015-11-06 11:39:14 -08:00
Brad Davis	0bf29a441f	Add recording classes	2015-11-06 11:14:46 -08:00
Atlante45	e630f3072e	Bit of cleanup	2015-11-06 11:14:10 -08:00
Atlante45	c53c0ec53f	Fix double delete on shutdown	2015-11-06 11:13:10 -08:00
Stephen Birarda	ed960b02ec	Merge pull request #6291 from zzmp/fix/script-engine-run-bail ... Bail early from ScriptEngine::run if stopped	2015-11-06 10:05:02 -08:00
AlessandroSigna	ced4061d76	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-06 09:47:06 -08:00
samcake	2f9c33dbfb	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-06 09:35:48 -08:00
samcake	46d9a14951	Work in progress, fixing the animation playback	2015-11-06 09:35:20 -08:00
samcake	63106f6991	Merge pull request #6322 from Atlante45/record ... Recording fixes from Clement.	2015-11-06 09:28:58 -08:00
Seth Alves	4ed8a1e5d1	changes to send an update to entity-server when AvatarActionHold releases an entity	2015-11-06 09:25:53 -08:00
James B. Pollack	11b01b3b9d	Merge pull request #6307 from jherico/barney ... Getting rid of HTTPS external dependencies	2015-11-05 20:53:43 -08:00
James B. Pollack	2fdc9202e4	Merge pull request #6313 from AlanZimmerman/playa ... Created playaSpawner	2015-11-05 20:47:00 -08:00
James B. Pollack	5713f19fa4	Merge pull request #6327 from AlessandroSigna/branchJS ... Examples of the new input mapping system	2015-11-05 20:06:16 -08:00
AlessandroSigna	715b183a3c	unified two ways to do the mapping in a single JS	2015-11-05 19:10:06 -08:00
AlessandroSigna	f9ebbea585	Merge branch 'master' of https://github.com/highfidelity/hifi into branchJS	2015-11-05 19:09:49 -08:00
AlessandroSigna	c6b42f5fbc	Added a second way to create mapping	2015-11-05 18:48:24 -08:00
AlessandroSigna	60cb736a48	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-05 18:47:36 -08:00
AlessandroSigna	23496617c1	Merge branch 'master' of https://github.com/AlessandroSigna/hifi	2015-11-05 17:13:02 -08:00
Atlante45	dbe25651cf	constify audio client loop	2015-11-05 16:57:51 -08:00
Atlante45	6c35ae48b0	Don't allocate big samples array in tight loop	2015-11-05 16:52:38 -08:00
Atlante45	ffafd3194e	Recording audio fixes	2015-11-05 16:46:59 -08:00
Stephen Birarda	5bc5b3ce62	Merge pull request #6325 from howard-stearns/agent-avatar-sequenceNumber ... Agent avatar sequenceNumber	2015-11-05 16:21:15 -08:00
Howard Stearns	aa1289bd7c	Update agent's outgoing avatar data packet with sequenceNumber as is now used in interface's MyAvatar.	2015-11-05 15:53:46 -08:00
Anthony Thibault	b6b596b8af	Merge pull request #6284 from howard-stearns/away ... Away/Pause	2015-11-05 15:28:47 -08:00
Seth Alves	28d4d29bb6	smooth hold action velocity over 2 frames	2015-11-05 15:07:00 -08:00
Seth Alves	29ce1d50ae	Merge pull request #6323 from ericrius1/eraseBoardFix ... Fixed bug where eraser wouldn't erase	2015-11-05 14:25:10 -08:00
ericrius1	f8de01a856	Fixed bug where eraser wouldn't erase	2015-11-05 14:14:49 -08:00
Atlante45	07b3597ae3	Fix recording scripts	2015-11-05 14:01:37 -08:00
Ryan Downe Karpf	c6c578e48c	Merge pull request #6321 from sethalves/fix-whiteboard ... whiteboard fixes	2015-11-05 13:28:21 -08:00