656 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	f45e182d33	fix CR feedback, add examples	2015-09-10 09:06:56 -07:00
Brad Hefta-Gaub	ede0a39b5b	prevent Script.include() from including the same file multiple times	2015-09-09 17:54:09 -07:00
Stephen Birarda	a3959109f1	resolve conflicts on merge with upstream/master	2015-09-08 15:18:39 -07:00
Brad Davis	5f1affaff9	Procedural skybox work	2015-09-08 14:31:16 -07:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Brad Davis	0f70797ab4	Merge pull request #5711 from ZappoMan/fixEntityScriptIncludes ... fix a bug in entity script includes and file based includes on windows	2015-09-03 21:21:42 -07:00
Brad Hefta-Gaub	b0f239b89d	also make sure local file includes work for non-entity scripts	2015-09-03 19:06:26 -07:00
Brad Hefta-Gaub	063320771c	fix a bug in entity script includes and file based includes on windows	2015-09-03 16:37:24 -07:00
Howard Stearns	41daea7d92	Merge pull request #5710 from sethalves/fix-stuck-avatars ... Fix stuck avatars	2015-09-03 16:26:07 -07:00
Seth Alves	0c8848a463	don't update _lastSendJointData if we didn't send	2015-09-03 15:41:40 -07:00
Seth Alves	36ca789d92	fix differential avatar-joint sending to work if more than 2 avatars are in the domain	2015-09-03 14:08:04 -07:00
Brad Davis	8dc3905767	Add common vector constants to JS, add some missing quaternion functionality	2015-09-03 11:51:35 -07:00
Stephen Birarda	e5a10e3174	resolve conflicts on merge with upstream/master	2015-09-01 17:07:32 -06:00
Seth Alves	76923583ee	Interface only sends joint data to avatar-mixer if they have changed enough since the last send	2015-09-01 13:31:34 -07:00
Atlante45	6657cecb7a	Merge branch 'protocol' of https://github.com/birarda/hifi into popup	2015-08-31 19:52:46 +02:00
Stephen Birarda	fa0abe2972	resolve conflicts on merge with upstream/master	2015-08-31 10:51:12 -07:00
Brad Davis	08e4fe2dc2	Revert "Add common vector constants to JS"	2015-08-28 16:26:56 -07:00
Brad Hefta-Gaub	1e2374da87	Merge pull request #5677 from jherico/bart ... Add common vector constants to JS	2015-08-28 13:43:13 -07:00
Brad Davis	2aa1976b5d	Add common vector constants to JS, add some missing quaternionin functionality	2015-08-28 13:05:39 -07:00
Atlante45	993217491f	Retry to load only on timeout	2015-08-28 20:35:39 +02:00
Ryan Huffman	2a4b25dd76	Update names of ResourceRequest enums	2015-08-27 22:23:06 -07:00
Stephen Birarda	1d6f43e0d0	cleaned up some warnings	2015-08-27 18:26:55 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Ryan Huffman	12d3cf557a	Remove assert in ScriptCache	2015-08-27 12:58:57 -07:00
Ryan Huffman	1d45293184	Fix lambda callback affinity in BatchLoader	2015-08-27 09:56:26 -07:00
Ryan Huffman	667db200c0	Cleanup BatchLoader	2015-08-27 09:39:12 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
Seth Alves	695ffa29c7	call setup_memory_debugger from common macros rather than from every CMakeLists.txt file	2015-08-26 11:09:59 -07:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
Ryan Huffman	3959928bbb	Update ResourceRequest::moveData to getData	2015-08-25 15:20:00 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Thijs Wenker	d84cf1859c	hook up the WebSocket error event directly	2015-08-22 02:18:21 +02:00
Thijs Wenker	0e255f4f3e	properly exposed WebSocketClass::ReadyState to the ScriptEngine	2015-08-22 01:59:44 +02:00
Thijs Wenker	9edba451eb	- remove webSockets from List after disconnect. ... - leave it up to the QtScript to delete the WebSocket / WebSocketServer objects	2015-08-22 01:33:22 +02:00
Thijs Wenker	d89ecc1e42	Move WebSocketServer to be accessable from Assignment-Client:Agent only.	2015-08-21 22:43:49 +02:00
Thijs Wenker	d3a6833133	delete WebSockets on ScriptEngine finish	2015-08-21 20:20:50 +02:00
Thijs Wenker	c7346209fb	fix memory leak	2015-08-21 19:44:43 +02:00
Thijs Wenker	fd82f05307	Merge branch 'master' of https://github.com/worklist/hifi into 20638	2015-08-21 19:29:38 +02:00
Thijs Wenker	e581a57320	WebSocket constructor could allow more then one parameter now, only the first one is used though.	2015-08-21 19:13:57 +02:00
Thijs Wenker	55fd847636	removed unused code, renamed UnitTest.ready() to UnitTest.done()	2015-08-21 19:07:33 +02:00
Brad Davis	8c7711168c	Merge pull request #5603 from sethalves/linux-memory-debugger ... memory debugging on linux	2015-08-20 19:19:24 -07:00
Stephen Birarda	e93b360908	expose options property to AI script interface	2015-08-20 12:12:43 -07:00
Seth Alves	c25082d86f	use -fsanitize=address in all code rather than just the top-level links	2015-08-20 10:14:16 -07:00
Ryan Huffman	5884fcb17b	Merge branch 'ordered-sending' into atp-server	2015-08-19 12:23:31 -07:00
Ryan Huffman	ebb4db134d	Temporarily disable assert in ScriptCache	2015-08-19 12:18:01 -07:00
Thijs Wenker	ecd368fac3	new style qt connectors	2015-08-19 20:00:06 +02:00
Thijs Wenker	07ae00f207	Close WebSocket properly after ScriptEngine finished running	2015-08-19 19:33:48 +02:00
Thijs Wenker	7f8506acc0	fix. switchup.	2015-08-19 00:54:00 +02:00
Thijs Wenker	1b6538cc59	fixes extra qualification errors Linux	2015-08-19 00:31:40 +02:00
Thijs Wenker	e43dc3f9fe	Completed implementation of WebSocket and WebSocketServer	2015-08-18 03:21:48 +02:00