24480 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	82e3c4c587	Updating the build notes to refelect the new Qt version requirement	2015-04-25 16:26:15 -07:00
Seth Alves	2eebfb9cf1	merge from upstream	2015-04-25 12:50:16 -07:00
Seth Alves	d1d4b0f0ee	merge from upstream	2015-04-25 12:50:00 -07:00
Seth Alves	3ce65d297a	Merge pull request #4696 from Atlante45/fix_warnings ... Fix a few warnings	2015-04-25 12:43:47 -07:00
David Rowe	6071e44ba4	Regularize debug messages for Faceshift and DDE	2015-04-25 11:35:14 -07:00
David Rowe	c37eb3de8a	Fix DDE shutdown	2015-04-25 11:34:50 -07:00
David Rowe	736691e3ec	Refactor face tracking FPS calculation	2015-04-25 11:33:32 -07:00
Seth Alves	b69cba1aba	respond to code-review	2015-04-25 10:50:18 -07:00
Seth Alves	0fb1a83e3b	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
Seth Alves	81ff8a4448	count steps during which an EntityItem is moving but has no simulation owner. Once the count is high enough (how high is TBD), attempt to claim ownership	2015-04-25 07:17:21 -07:00
Seth Alves	48ec0c8339	formatting, re-enable code that causes an interface to attempt to claim a moving object with no current simulation-owner	2015-04-25 06:56:19 -07:00
Atlante45	ba507cef98	Fix a few warnings	2015-04-25 11:01:02 +02:00
Seth Alves	ac46f84291	cleanups	2015-04-24 18:36:41 -07:00
Brad Davis	9fbd5d79e4	Removing duplicate declaration	2015-04-24 17:46:56 -07:00
Seth Alves	03706359f5	cleanups	2015-04-24 17:44:52 -07:00
Seth Alves	218393a2b3	rather than keeping track of previous pos/rot sent by server, use a new flag that indicates that the values should be updated in the physics engine, but that the object should not be woken	2015-04-24 17:37:19 -07:00
Brad Davis	fdf2f8395d	Bad lambda type	2015-04-24 17:28:43 -07:00
Brad Davis	eb02bdc67f	Dangling function	2015-04-24 16:57:39 -07:00
Brad Davis	dab8761c71	Merge remote-tracking branch 'upstream/master' into ui-refactor	2015-04-24 16:46:48 -07:00
Brad Davis	e7b8efc2d9	Cleaning up unused stuff	2015-04-24 16:44:48 -07:00
Brad Davis	08d60c6a01	Fixing message dialog	2015-04-24 16:19:39 -07:00
Brad Davis	e5df17eb99	Merge pull request #4691 from ZappoMan/defaultAvatars ... fix default avatars on first run	2015-04-24 16:17:26 -07:00
Brad Hefta-Gaub	dbb1e3c820	Merge pull request #4682 from jherico/offscreen ... Attempting to fix backspace issue in new UI	2015-04-24 16:10:42 -07:00
Brad Hefta-Gaub	4fccb74855	Merge pull request #4692 from huffman/checkbox-fix ... Checkbox fix	2015-04-24 16:08:52 -07:00
Brad Hefta-Gaub	1d6001af53	Merge pull request #4694 from Atlante45/zone_use_avatar_pos ... Zones use avatar position not view frustum	2015-04-24 16:08:19 -07:00
Seth Alves	6e6793cbcc	remove debugging prints	2015-04-24 15:18:02 -07:00
Clément Brisset	23ac8b1c8c	Merge pull request #4693 from ctrlaltdavid/faceshift-fps ... Log Faceshift FPS after a reset	2015-04-24 23:59:37 +02:00
Andrew Meadows	3ecf959b3e	removed cached copies of damping and restitution	2015-04-24 14:50:37 -07:00
Seth Alves	2a8fbeca32	sync	2015-04-24 14:43:39 -07:00
Seth Alves	e7c6ee597a	sync	2015-04-24 14:36:05 -07:00
Seth Alves	ea250c037a	sync	2015-04-24 14:27:32 -07:00
Seth Alves	6b53fefebe	sync	2015-04-24 14:21:59 -07:00
Seth Alves	fea8d84618	sync	2015-04-24 14:09:10 -07:00
Seth Alves	ad85837b5a	sync	2015-04-24 13:44:34 -07:00
David Rowe	e33f3c9d00	Remove unnecessary #include	2015-04-24 13:42:56 -07:00
Ryan Huffman	547b0e5ee6	Update style of webview to only be set when 'fusion' exists	2015-04-24 13:42:03 -07:00
Ryan Huffman	6087a3e8a9	Revert "Add checkboxes.html" ... This reverts commit 4127ec8019.	2015-04-24 13:40:02 -07:00
Andrew Meadows	7cd9023e23	build Avatar shape on SkeletonModel load	2015-04-24 13:26:26 -07:00
Andrew Meadows	f09a67af6c	don't need temp variable	2015-04-24 13:26:26 -07:00
Andrew Meadows	79cb55eabc	rename setJointStates() --> initJointStates()	2015-04-24 13:26:26 -07:00
Andrew Meadows	c4395e75bb	cleanup and comments	2015-04-24 13:26:26 -07:00
Brad Davis	0a9398808f	CR comments	2015-04-24 13:25:30 -07:00
Brad Davis	99a6e1f86c	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
Atlante45	a4f03f8b1c	Zones use avatar position not view frustum	2015-04-24 22:16:21 +02:00
Seth Alves	902e84c711	sync	2015-04-24 13:10:38 -07:00
David Rowe	a141ebbf93	Log Faceshift FPS after a reset	2015-04-24 12:49:41 -07:00
Ryan Huffman	df591f9ad7	Set style of webview	2015-04-24 11:49:33 -07:00
ZappoMan	37928dcd6d	fix default avatars on first run	2015-04-24 11:30:18 -07:00
Seth Alves	a27f8f3f10	sync	2015-04-24 11:28:44 -07:00
Seth Alves	926694517f	sync	2015-04-24 11:07:45 -07:00