19394 commits

Author	SHA1	Message	Date
Howard Stearns	c795d2ca3b	Four-way discoverability. (Needs testing.)	2017-03-28 18:31:08 -07:00
howard-stearns	c2a49a582e	send credentials to local metaverse servers, and initial users data ... integration.	2017-03-28 16:44:16 -07:00
howard-stearns	37ab0b57a7	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-28 15:41:46 -07:00
Zach Fox	fce2049630	Trivial removal of commented code	2017-03-27 16:45:03 -07:00
howard-stearns	85347e3269	new location protocol	2017-03-27 15:55:05 -07:00
David Kelly	5c1e085e7b	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 11:29:18 -07:00
David Kelly	76657a670c	added notifications (faked user name for now), along with switch to avatar entities	2017-03-27 11:28:57 -07:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Anthony J. Thibault	f7de74109b	Added jsdoc documentation for some of MyAvatar properties and methods	2017-03-24 15:10:26 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Brad Hefta-Gaub	1972b140b9	Merge pull request #9976 from mittens/21215 ... Worklist #21215 - Removing Duplicate Status Icons for Submeshes	2017-03-24 08:52:12 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Zach Fox	3f95982f34	Fix bug due to incorrect merge...	2017-03-23 14:00:50 -07:00
Zach Fox	a231b57472	Merge pull request #9962 from birarda/cmake-with-space ... Fix failing POST_BUILD steps on Windows with spaces in build path	2017-03-23 11:41:38 -07:00
Zach Fox	98ee02f84f	Use OpacityMask instead of hack; fix connectionsTab	2017-03-23 10:49:31 -07:00
Zach Fox	a7623dcac8	Use OpacityMask instead of hack; fix connectionsTab	2017-03-23 10:48:44 -07:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
Zach Fox	692ef369c7	Attempted Stale PAL fix - hard to test!	2017-03-22 15:14:11 -07:00
Triplelexx	09cbace975	remove unused getBodyForwardDirection	2017-03-22 21:54:21 +00:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Zach Fox	bf191eabb7	Some new stale PAL behavior	2017-03-22 13:35:48 -07:00
trent	36619cd2e4	Fixed issue with duplicate physics status icons per sub-object.	2017-03-22 15:07:29 -04:00
Triplelexx	fd312f6bf8	rename fronts to forwards	2017-03-22 18:49:34 +00:00
Triplelexx	2515563a0b	change getFront to getForward	2017-03-21 22:35:07 +00:00
Triplelexx	8df0395754	change getFrontDirection to getForwardDirection	2017-03-21 22:28:12 +00:00
Triplelexx	b7980569cc	change all references of IDENTITY_FRONT to IDENTITY_FORWARD	2017-03-21 22:13:33 +00:00
Chris Collins	4c789c44aa	Merge pull request #9922 from birarda/bug/stuck-ess ... fix a couple of ESS issues during ES/ESS restart	2017-03-21 12:44:53 -07:00
Zach Fox	058faa8c0f	Row color bugfix	2017-03-21 10:03:51 -07:00
Ryan Huffman	13222468e3	Merge pull request #9712 from huffman/feat/edit-particle-icon ... Add particle system overlay in edit.js	2017-03-21 10:02:52 -07:00
Chris Collins	ea13151d55	Merge pull request #9945 from mnafees/21233 ... 21233: Remove Scripts Editor option from Edit menu and all related files	2017-03-21 08:01:36 -07:00
Zach Pomerantz	20ea13e00a	Merge pull request #9897 from zzmp/record/noise-gate ... Add AudioNoiseGate to recordings played through Interface	2017-03-21 00:21:20 -04:00
Stephen Birarda	c9d1916eea	fix for build with win path with spaces	2017-03-20 18:24:19 -07:00
Zach Fox	29e97381eb	PAL open, user leaves, gray out row	2017-03-20 17:20:28 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Zach Fox	d16acc5a7f	Stale PAL Notification	2017-03-20 15:24:49 -07:00
Stephen Birarda	a4d72c4e67	make AudioScriptingInterface a Dependency	2017-03-20 13:40:15 -07:00
Zach Fox	6c4b23195b	One-line warning fix...I swear I've done this before	2017-03-20 13:26:50 -07:00
Zach Fox	0506fc0033	New goTo() behavior; Fix goBack	2017-03-20 12:55:38 -07:00
Brad Hefta-Gaub	bc5d7d8698	Merge pull request #9851 from AndrewMeadows/simulation-ownership-2 ... zero velocity of deactivated dynamic entities	2017-03-20 10:20:11 -07:00
Brad Hefta-Gaub	af790d8474	Merge pull request #9875 from birarda/bug/spin-strafe ... fix double snap turn strafing	2017-03-20 10:08:05 -07:00
Chris Collins	af2748410d	Merge pull request #9932 from Triplelexx/21231 ... 21231 - Remove About Interface from File menu	2017-03-20 09:55:57 -07:00
Chris Collins	509057c6d8	Merge pull request #9941 from Triplelexx/21232 ... 21232 - Remove Mini Mirror from View menu	2017-03-20 09:55:37 -07:00
Chris Collins	ed27c550af	Merge pull request #9939 from ctrlaltdavid/21237 ... Disable Developer > Assets > ATP Asset Migration menu item	2017-03-20 06:29:33 -07:00
Chris Collins	2e6291f470	Merge pull request #9929 from ctrlaltdavid/21235 ... Replace Developer > Network > Disk cache editor with menu action	2017-03-20 06:26:36 -07:00
Mohammed Nafees	c460523980	Remove related icon files for Scripts Editor	2017-03-20 00:25:50 -04:00
Mohammed Nafees	3612b9fccc	Remove Edit > Scripts Editor and all related source files	2017-03-20 00:25:50 -04:00
Triplelexx	8e086a8fc8	fix build error	2017-03-18 03:51:55 +00:00
Triplelexx	a9b1a38665	remove Mini Mirror from View menu ... Avatar inputs only contains the audio meter now.	2017-03-18 00:53:13 +00:00