49853 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	d067ba7dcc	Alan's feedback	2017-01-18 12:55:24 -08:00
Zach Fox	9d19aa3c79	Checkpoint	2017-01-18 12:55:24 -08:00
Zach Fox	202d4e8107	Checkpoint	2017-01-18 12:55:24 -08:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
Ryan Huffman	3b5b88e719	Move MessageID to AssetUtils	2017-01-18 11:17:13 -08:00
Ryan Huffman	d85f27e992	Add Entities.getServerScriptStatus	2017-01-18 11:15:59 -08:00
Ryan Huffman	8137c59ef7	Add support for sending requests to entity script server	2017-01-18 11:15:29 -08:00
Philip Rosedale	d60d183c8c	Merge pull request #9403 from humbletim/21118 ... Code Review for Job #21118 - Add on/off switch to ambisonic/ambient sound emitter	2017-01-18 10:29:01 -08:00
Brad Hefta-Gaub	5036781b81	Merge pull request #9406 from jherico/atp_core_usage ... Consume fewer cpu cores in AssetServer when interface is running locally	2017-01-18 06:50:48 -06:00
humbletim	6320d872b4	remove commented code	2017-01-18 02:57:13 -05:00
humbletim	f88b39918f	switch to messaging for toggle notifications; cleanup	2017-01-18 02:54:42 -05:00
humbletim	1048c2a3bf	apply default userData values; add error checking; throttle toggle clicks	2017-01-18 01:40:28 -05:00
Brad Davis	a593a2116a	Removing magic numbers	2017-01-17 18:15:40 -08:00
Brad Davis	cbc89e77ab	Consume fewer resources in AssetServer when interface is running locally	2017-01-17 18:15:39 -08:00
David Kelly	f5300d3862	Removing some PAL-related interface log spam ... Probably more, but these _seem_ to be the worst	2017-01-17 17:06:18 -08:00
Atlante45	20b7bb0c54	EntityScriptServer tracks server scripts	2017-01-17 16:41:56 -08:00
Zach Fox	7a568ed8a7	Merge pull request #9401 from zfox23/PAL_DisplayName ... PAL: Editable Display Names & Immediate Update	2017-01-17 16:00:41 -08:00
Atlante45	97e9bfff36	Remove Viewer API for entity server scripts	2017-01-17 15:40:05 -08:00
Atlante45	ff3f175fb7	Fix typos	2017-01-17 15:39:54 -08:00
Clément Brisset	57d324a9e9	Merge pull request #8 from huffman/feat/entity-server-script-property ... Add serverScripts entity property	2017-01-17 15:37:07 -08:00
Ryan Huffman	340eeb94fa	Add return type to lambdas in EntityTreeRenderer	2017-01-17 15:24:14 -08:00
samcake	246dcbd0c0	Removing the warning	2017-01-17 15:01:27 -08:00
Zach Fox	59ff970d5b	CR feedback	2017-01-17 15:01:02 -08:00
Ryan Huffman	71e039951c	Add reload server scripts button to edit.js	2017-01-17 14:47:57 -08:00
Ryan Huffman	812aaee48c	Add Entities.reloadServerScripts	2017-01-17 14:47:57 -08:00
Ryan Huffman	142c7da523	Add serverScripts property support to edit.js	2017-01-17 14:47:06 -08:00
Ryan Huffman	b0c2a9d614	Add serverScripts entity property	2017-01-17 14:47:06 -08:00
David Kelly	341ac685e9	Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists ... remove ignored avatars from PAL when they disconnect	2017-01-17 14:21:36 -08:00
Atlante45	1212fefa61	Check for avatar collision in assignment as well	2017-01-17 13:47:45 -08:00
Atlante45	8d199ded15	Check collision against the right owner	2017-01-17 13:47:45 -08:00
Atlante45	5db37fff95	More entity script server work	2017-01-17 13:47:45 -08:00
Atlante45	529286b2ea	More EntityScriptServer work	2017-01-17 13:47:45 -08:00
Atlante45	163d65d784	Setup basic EntityScriptServer	2017-01-17 13:47:45 -08:00
Ryan Huffman	d9e7c423f6	Merge pull request #9409 from birarda/granular-stats ... add 1s heartbeat interval command line switch	2017-01-17 13:21:42 -08:00
samcake	5ed3b48f9d	adding the checkbox to show the meta bounds from the debugDeferredLighting.js	2017-01-17 12:15:09 -08:00
David Kelly	9b1aaf3bfe	CR feedback	2017-01-17 12:09:47 -08:00
Zach Fox	246f5fb7f5	Add log; fix whitespace	2017-01-17 11:51:09 -08:00
Stephen Birarda	1e04aebb8d	add --fast-hearbeat command line switch for 1s stats	2017-01-17 11:25:40 -08:00
samcake	69f9053e61	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-17 10:55:10 -08:00
samcake	305e308575	avoiding the exclusive filtering behavior	2017-01-17 10:54:45 -08:00
David Kelly	2460e89a57	CR feedback	2017-01-17 09:53:04 -08:00
humbletim	7025ed5909	update test script to create a triggerable entity	2017-01-17 03:18:56 -05:00
humbletim	88b7f9ec9d	add ambient sound test	2017-01-17 01:44:03 -05:00
humbletim	27a2367634	update debugPrints	2017-01-17 01:27:48 -05:00
humbletim	c7a561aff9	trim extra debugging code	2017-01-17 01:23:03 -05:00
Philip Rosedale	b02a5f85ec	Merge pull request #9405 from ZappoMan/bugFix ... improve comment in domain settings	2017-01-16 20:47:43 -08:00
ZappoMan	5e49e8025a	improve comment in domain settings	2017-01-16 21:06:38 -06:00
David Kelly	6c07a9aece	remove debuggng logspam	2017-01-16 19:06:36 -08:00
samcake	960f4f0ead	Move the drawBOunds job to DrawTasks	2017-01-16 18:33:42 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00