19829 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	84573d373b	Merge pull request #9070 from huffman/fix/docs ... Add jsdoc to Camera	2016-11-15 13:46:16 -08:00
Seth Alves	d73fc1681c	Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race	2016-11-15 09:11:06 -08:00
Brad Hefta-Gaub	5dd33c8dce	fix for mac min openGL version	2016-11-14 20:58:09 -08:00
Brad Hefta-Gaub	86430e4121	Merge pull request #8960 from samcake/red-backup-many-stereo-paths ... Introduce Instanced Stereo Drawcall	2016-11-14 18:30:42 -08:00
Ryan Huffman	5fd1ae64b0	Begin adding entities jsdoc	2016-11-14 16:54:55 -08:00
Seth Alves	43b73f0380	Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race	2016-11-14 10:00:46 -08:00
Chris Collins	e599e13809	Merge pull request #9063 from sethalves/fix-some-crash-on-exits ... Fix some crash on exits	2016-11-14 09:20:03 -08:00
Brad Hefta-Gaub	cc6d68ffdf	Merge pull request #8973 from humbletim/fix-batched-script-keys ... Use matching hash keys for input/output when batch-loading scripts.	2016-11-14 08:13:32 -08:00
Brad Hefta-Gaub	dd23fcc0c9	Merge pull request #9008 from hyperlogic/feature/debug-draw-marker-color ... Add color support to debug draw marker rendering	2016-11-14 08:12:57 -08:00
Seth Alves	92e24e6ded	code review	2016-11-13 16:09:57 -08:00
Seth Alves	9868ddd602	global/static QStrings in plugins appear to cause crashes during shutdown	2016-11-13 10:22:14 -08:00
Seth Alves	804f25740d	these qDebugs happen too late and cause a crash	2016-11-13 10:21:27 -08:00
Seth Alves	5133ce0548	print a debug message when skipping evaluation of a previously included url	2016-11-12 10:50:21 -08:00
Seth Alves	55d894bd6f	Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race	2016-11-12 07:38:07 -08:00
Chris Collins	0876dbc809	Merge pull request #9050 from sethalves/last-edited-by ... lastEditedBy property for entities	2016-11-11 16:02:18 -08:00
Chris Collins	6581a51bc9	Merge pull request #9052 from davidkelly/dk/2226 ... Add ability to mute user	2016-11-11 16:02:08 -08:00
Ryan Huffman	2203607044	Merge pull request #9056 from Atlante45/networking ... Protect against empty packet lists	2016-11-11 15:28:46 -08:00
Clément Brisset	e38da75115	Merge pull request #9053 from huffman/feat/whitelist-ac-ip ... Add AC ip address whitelist to domain server	2016-11-11 15:03:21 -08:00
Atlante45	a38846aeed	Protect against empty packet lists	2016-11-11 14:32:52 -08:00
Chris Collins	b9b90cc646	Merge pull request #9047 from jherico/stutter ... Add stutter tracking	2016-11-11 11:39:00 -08:00
Ryan Huffman	e1466c0d47	Fix NULL -> nullptr	2016-11-11 10:21:58 -08:00
Brad Davis	162f24decd	Add stutter tracking for Oculus	2016-11-11 10:12:41 -08:00
David Kelly	9c8f22e0e7	straight to audio mixer ... since we can get the canKick there too. (doh)	2016-11-11 09:30:58 -08:00
Seth Alves	db99295989	Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race	2016-11-11 06:40:31 -08:00
Seth Alves	15c247fc5e	quiet warnings	2016-11-11 06:37:22 -08:00
Seth Alves	899dec8b10	Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by	2016-11-11 06:11:49 -08:00
Seth Alves	5629db9109	Merge pull request #9049 from birarda/max-min-av-scale ... add a min/max avatar scale in domain-server settings	2016-11-11 06:11:02 -08:00
Brad Hefta-Gaub	6db3556dc5	Merge pull request #9048 from howard-stearns/disable-viewpoint-menus-in-hmd ... Disable viewpoint menus in hmd	2016-11-10 17:52:50 -08:00
David Kelly	186451fcbe	Merge pull request #9027 from samcake/green ... Fix crashes in OpenGLVersionChecker	2016-11-10 17:22:29 -08:00
Seth Alves	576eed9941	use a mutex to avoid a smaller race	2016-11-10 17:12:06 -08:00
David Kelly	285520dff7	Initial cut ... No script work yet, just first stab at underpinnings	2016-11-10 16:24:35 -08:00
Seth Alves	aef39ce6fa	block until follow-on includes are finished but still avoid multiple evaluation of included urls	2016-11-10 16:06:53 -08:00
Brad Davis	16060d50af	Merge pull request #9041 from jherico/disable_incremental ... Remove incremental texture transfers	2016-11-10 15:43:20 -08:00
Seth Alves	850361f222	lastEditedBy property for entities	2016-11-10 15:26:28 -08:00
howard-stearns	b20d4a4b03	Merge branch 'master' of https://github.com/highfidelity/hifi into disable-viewpoint-menus-in-hmd	2016-11-10 15:15:51 -08:00
howard-stearns	4d18a3cc3d	expose menu enablement to javascript	2016-11-10 15:01:06 -08:00
Stephen Birarda	6f442a74b1	request settings from agents and debug results	2016-11-10 14:43:15 -08:00
Stephen Birarda	64d9fa0f39	clamp avatar scale to domain limit in avatar mixer	2016-11-10 14:19:32 -08:00
Chris Collins	5b91c8f32b	Merge pull request #8984 from sethalves/fix-setLocalJointRotation-name ... fix names of model-entity joint setters	2016-11-10 13:39:14 -08:00
Stephen Birarda	77ede81fc9	limit MyAvatar scale to limits from domain settings	2016-11-10 13:27:13 -08:00
Brad Davis	90f55f0cd5	Add stutter tracking	2016-11-10 11:56:38 -08:00
Brad Hefta-Gaub	ff559aa4a1	Merge pull request #9042 from hyperlogic/feature/jsdoc ... Generate JS documentation from comments in C++ source	2016-11-10 10:17:39 -08:00
Brad Davis	db98a742b6	Remove incremental transfers	2016-11-10 08:35:35 -08:00
Seth Alves	f6318fe619	Merge pull request #9043 from ZappoMan/avatarEntityGreifingVector ... add support for whitelist entity scripts	2016-11-10 08:17:30 -08:00
Brad Hefta-Gaub	8758e4a9ba	add support for whitelist entity scripts	2016-11-09 19:17:24 -08:00
samcake	0ab4a781f5	Back to the correct code	2016-11-09 18:25:37 -08:00
samcake	c01b39b54b	And test that again	2016-11-09 18:16:51 -08:00
Anthony J. Thibault	839b1a3c5e	Added some jsdoc comments to the C++ source	2016-11-09 18:09:10 -08:00
samcake	941e5a57b1	trying a test with 4.4 as the minimum gl context to be able to break on Intel integrated	2016-11-09 17:25:46 -08:00
samcake	f5fd4bf8d1	Merge pull request #9014 from jherico/texture_derez ... Re-enable downsampling for non-sparse textures	2016-11-09 17:18:03 -08:00