49634 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	8a35afd3ac	Merge branch 'master' into PAL_AdminLabel	2017-01-18 14:46:08 -08:00
Zach Fox	7f57251a0e	Remove logs also removed in Master	2017-01-18 13:38:19 -08:00
David Kelly	3b70fa08a3	Merge pull request #9417 from davidkelly/dk/palLogSpam ... Removing some PAL-related interface log spam	2017-01-18 13:20:57 -08:00
Zach Fox	f8dd7f5433	Cleanup	2017-01-18 12:55:25 -08:00
Zach Fox	e9d3c36873	Final commit?	2017-01-18 12:55:25 -08:00
Zach Fox	1175752e1d	Cleanup after rebase	2017-01-18 12:55:24 -08:00
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
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
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
Zach Fox	59ff970d5b	CR feedback	2017-01-17 15:01:02 -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
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
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
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
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
Seth Alves	f900629cdb	Merge pull request #9390 from sethalves/load-models-in-keyhole ... fix physics not starting up when a model is close behind	2017-01-16 18:06:23 -08:00
humbletim	827aa68d3f	cleanup pass	2017-01-16 19:50:25 -05:00
Chris Collins	1df13d6a56	Merge pull request #9399 from howard-stearns/hand-controll-grab-update ... handControllerGrab update loop change	2017-01-16 16:41:02 -08:00
humbletim	c9fd650e70	update to support click/far-click toggling and userData.disabled setting	2017-01-16 19:37:31 -05:00
Chris Collins	5f34ad3596	Merge pull request #9400 from AndrewMeadows/fix-cauterization-hack ... don't render non-skinned meshes on head when in first person	2017-01-16 15:47:52 -08:00
Zach Fox	1e8effdcc4	Packet verison bump	2017-01-16 15:28:53 -08:00
Zach Fox	e72c25736e	Cleanup	2017-01-16 15:21:18 -08:00
Andrew Meadows	fd28457807	fix cauterization hack	2017-01-16 15:13:28 -08:00
howard-stearns	0a3236dcc9	handControllerGrab update loop change	2017-01-16 14:54:32 -08:00
Zach Fox	e98a40c30e	Does this work?	2017-01-16 14:43:30 -08:00
Zach Fox	3b56f46206	Style changes	2017-01-16 13:18:24 -08:00
Zach Fox	079e5c4296	Merge pull request #9397 from zfox23/FB-2814 ... Fix FB-2814 "Users.requestUsernameFromID() doesn't work for yourself"	2017-01-16 12:54:28 -08:00
Zach Fox	e22c1ac30e	Fix the bug	2017-01-16 11:48:51 -08:00
David Kelly	95aad3140d	Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal ... Manage audio interval timer in PAL	2017-01-16 11:29:05 -08:00
Zach Fox	32e330320e	Cleanup after rebase	2017-01-16 11:26:57 -08:00
Stephen Birarda	1993e358d6	Merge pull request #9318 from birarda/ovr-platform-entitlement ... handle OVR Platform entitlement checks	2017-01-16 11:16:31 -08:00