8331 commits

Author	SHA1	Message	Date
Seth Alves	bdc6bb3c2d	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-27 12:20:58 -07:00
Seth Alves	2e5049a190	fix bug caused by no-longer reusing a variable	2015-04-27 12:20:01 -07:00
Seth Alves	e14b4c6ad4	cleanups	2015-04-27 11:01:48 -07:00
Brad Davis	a12bfd95f4	Merge remote-tracking branch 'upstream/master' into ui-refactor ... Conflicts: libraries/render-utils/src/MatrixStack.h	2015-04-27 10:59:57 -07:00
Seth Alves	8278f52a79	cleanups	2015-04-27 10:59:51 -07:00
Seth Alves	2cdbe8bf7b	merge from upstream	2015-04-27 09:57:36 -07:00
Seth Alves	e007617112	hook up menu-items to control debug rendering of collision hulls and owned simulations	2015-04-27 09:56:24 -07:00
Seth Alves	26511575c2	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-27 06:44:59 -07:00
Brad Davis	3071be162a	Coding standards	2015-04-26 20:11:27 -07:00
Brad Davis	2e61b5a933	Coding standards	2015-04-25 16:59:43 -07:00
Brad Davis	0afe8c0e32	Coding standards	2015-04-25 16:46:05 -07:00
Brad Davis	7c16fd05c1	Merge branch 'master' into ui-refactor	2015-04-25 16:35:43 -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	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
Seth Alves	6e6793cbcc	remove debugging prints	2015-04-24 15:18:02 -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
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
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
Seth Alves	b40e78311b	disable hack to notice that the server is sending the same thing repeatedly	2015-04-24 11:00:06 -07:00
Seth Alves	1b84be6e10	attempting to have visual indicator of simulatorID	2015-04-24 10:55:43 -07:00
Seth Alves	6fdbce9ee3	oops	2015-04-24 09:29:57 -07:00
Seth Alves	c2422c2382	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-24 09:29:26 -07:00
Seth Alves	6d151ee3ed	try a different way of identifying when to claim simulation ownership of a moving entity	2015-04-24 09:29:05 -07:00
Brad Hefta-Gaub	22ff2ba1b8	Merge pull request #4687 from Atlante45/zone_shape_edit_js ... Zone ShapeType/CompoundShapeURL in edit.js	2015-04-24 09:08:56 -07:00