24437 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	ec2f54b90a	add a macro to recursively correctly handle resources	2015-04-27 16:02:52 -07:00
Andrew Meadows	c097a0038a	Merge pull request #4685 from sethalves/detect-ballistic ... various physics-related experiments	2015-04-27 12:41:50 -07:00
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
Brad Hefta-Gaub	90c47a6046	Merge pull request #4695 from jherico/ui-refactor ... New UI library, some bug fixes and features	2015-04-27 11:16:10 -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	b23427a3c8	hook up menu-items to control debug rendering of collision hulls and owned simulations	2015-04-27 10:32:47 -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
Brad Davis	c08fde8ecd	Merge pull request #4697 from sethalves/quiet-compiler ... quiet compiler, remove some trailing control-Ms	2015-04-27 09:26:01 -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	3ce65d297a	Merge pull request #4696 from Atlante45/fix_warnings ... Fix a few warnings	2015-04-25 12:43:47 -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
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
Brad Davis	0a9398808f	CR comments	2015-04-24 13:25:30 -07:00