18 commits

Author	SHA1	Message	Date
David Rowe	2731c13a5c	Merge remote-tracking branch 'upstream/master' into 21249	2017-04-15 09:51:16 +12:00
Stephen Birarda	7b48feca66	address code review comments	2017-04-14 11:53:53 -07:00
David Rowe	5676364aec	Fix missing return value in Recording.saveRecordingToAsset()	2017-04-06 18:50:15 +12:00
Stephen Birarda	c7a28a527a	cleanup Agent recording handling, make loadRecording async	2017-04-04 10:56:25 -07:00
Brad Hefta-Gaub	618f37eb06	fix crash in recording playback when clip loader fails	2017-02-22 11:14:22 -08:00
Stephen Birarda	1ece9aac26	remove extension from asset upload task	2016-03-08 12:08:02 -08:00
Brad Davis	3738f21936	Fix occasional deadlock in loading recordings	2015-11-23 22:34:17 -08:00
EdgarPironti	ebbed7c525	Save clip to asset - removing last fix	2015-11-20 18:23:36 -08:00
EdgarPironti	df2153186d	Fixes	2015-11-20 16:07:31 -08:00
EdgarPironti	e70f6855aa	Fixes	2015-11-20 16:07:30 -08:00
EdgarPironti	35365f9157	Fixes	2015-11-20 16:07:30 -08:00
EdgarPironti	1db6d0e3c1	Upload QByteArray	2015-11-20 16:07:29 -08:00
EdgarPironti	1b18d3656f	Save clip to asset	2015-11-20 16:07:29 -08:00
Brad Davis	cc2a7cbda8	Force synchronous loading of clips in JS	2015-11-20 11:51:08 -08:00
Brad Davis	e187aaedcb	Load recorded clips from URLs, not file paths	2015-11-19 15:56:37 -08:00
Brad Davis	5b8047ded4	Make recording and playback work in interface, playback in agent	2015-11-18 14:04:45 -08:00
samcake	368f19b4e2	Merging with todays upstream and checking	2015-11-17 18:58:10 -08:00
Sam Gateau	5b92929833	Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client	2015-11-17 09:32:22 -08:00

Renamed from interface/src/scripting/RecordingScriptingInterface.cpp (Browse further)