18 commits

Author	SHA1	Message	Date
Stephen Birarda	9ddebc8d13	resolve conflicts on merge with upstream/master	2015-11-20 15:29:44 -08:00
Brad Hefta-Gaub	45e8ebbe8c	Merge pull request #6432 from huffman/lod-range ... Increase available range in LOD Tools	2015-11-19 09:40:10 -08:00
Ryan Huffman	f523cad0a9	Add lodTest.js for testing LOD settings	2015-11-19 09:24:29 -08:00
Brad Davis	98cc7408b1	Fixing issues found in AC playback test	2015-11-18 17:17:20 -08:00
Stephen Birarda	8e4d7c69ce	handle AudioInjectorManager for scripted ACs	2015-11-17 17:01:11 -08:00
Stephen Birarda	ab5c8e072f	handle blocked AudioInjectorManager for restart	2015-11-17 16:31:18 -08:00
Stephen Birarda	aa77c4894c	add an AudioInjectorManager for more efficient threading	2015-11-16 16:04:10 -08:00
James B. Pollack	b83b24b096	remove strange test file	2015-11-03 13:42:18 -08:00
Brad Davis	4e6f64833f	Conditional support from JS	2015-10-23 17:24:04 -07:00
Brad Davis	6cf0bdcffe	Testing function destination and fixing bug in rule ordering for multi-soure	2015-10-22 10:00:11 -07:00
Brad Davis	5d4cbfdacb	Resolving ambiguity between functions and inputs differently	2015-10-22 09:50:24 -07:00
Brad Davis	4938e5ea84	Fixing function based routes, makeAxis	2015-10-22 09:50:23 -07:00
Brad Davis	637654adea	Wiring up step yaw	2015-10-21 18:46:09 -07:00
Brad Davis	db0fa6b8ed	Update hydra mappings and test code	2015-10-16 17:23:09 -07:00
Brad Davis	aa8979570c	Working on 2D overlay mouse interaction	2015-10-02 00:35:37 -07:00
Brad Davis	92eeb564fe	PR comments	2015-09-10 20:57:43 -07:00
Brad Davis	aa989c3687	Fixing some entity race condition crashes	2015-09-10 20:53:17 -07:00
Brad Davis	3bc9e8c98d	Fixing some entity race condition crashes	2015-09-10 20:43:41 -07:00