24649 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eric Levin	d930c942ff	changed dice script to only play sound locally on collision, to avoid every client which sees collision injecting audio and creating that overloud effect	2015-05-04 10:16:50 -07:00
Stephen Birarda	7eb965f24f	Merge pull request #4756 from thoys/patch-4 ... Fix for RealSense menu item	2015-05-04 12:46:25 -04:00
Stephen Birarda	96b75b57fe	Merge pull request #4754 from Atlante45/fix_local_injector_on_win ... Fix local injector modifying system volume	2015-05-04 12:45:06 -04:00
Stephen Birarda	274e98974b	Merge pull request #4734 from Atlante45/ac_fix ... Fix for bot_procedural	2015-05-04 12:44:08 -04:00
Stephen Birarda	efb4d34598	Merge pull request #4755 from Atlante45/quiet_compiler ... Quiet compiler	2015-05-04 12:43:13 -04:00
Thijs Wenker	9a6e442b25	Fix for RealSense menu item ... This was missed while moving to the new MenuWrapper class.	2015-05-04 18:07:48 +02:00
Atlante45	fc1519c078	Quiet compiler	2015-05-04 16:49:33 +02:00
Clément Brisset	6b04ceffba	Merge pull request #4752 from sethalves/quiet-compiler ... Quiet compiler	2015-05-04 15:09:13 +01:00
Atlante45	1dcc2f7988	Fix local injector modifying system volume	2015-05-04 15:53:58 +02:00
Seth Alves	0341caad95	quiet compiler	2015-05-03 11:10:52 -07:00
Seth Alves	b2583298a9	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-05-03 10:45:55 -07:00
Philip Rosedale	d7cc76e48b	Merge pull request #4735 from jherico/menu_fix ... Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events	2015-05-02 00:35:49 -07:00
Philip Rosedale	0f22b9beb8	Merge pull request #4741 from sethalves/box-stacking-1 ... move common debugging rendering into a new class	2015-05-02 00:34:44 -07:00
Brad Hefta-Gaub	6c4a4d0cdc	Merge pull request #4749 from samcake/temp1 ... Fix the dark objects rendering in porto and apartment due to the tga texture files not loaded correctly	2015-05-01 17:39:17 -07:00
Brad Hefta-Gaub	c8cbaa2fc0	Merge pull request #4746 from huffman/update-zone-image ... Update add-zone icon in edit.js	2015-05-01 17:34:34 -07:00
Brad Hefta-Gaub	417810c683	Merge pull request #4744 from huffman/show-zone-boundaries ... Add draw zone boundaries bool	2015-05-01 17:34:15 -07:00
Stephen Birarda	8a3853f1d0	Merge pull request #4745 from sethalves/dont-crash-on-null-sessionid ... session id can be null. don't crash	2015-05-01 20:08:52 -04:00
Stephen Birarda	c273ea7d46	Merge pull request #4748 from sethalves/shutdown-harder ... try harder to make sure all the assignment-client children stop	2015-05-01 20:08:29 -04:00
Seth Alves	9f1cb2a4e5	fix kill/terminate order	2015-05-01 16:56:39 -07:00
Seth Alves	23c44500d8	no magic numbers	2015-05-01 16:45:04 -07:00
Sam Gateau	f9802a1072	IMprove the message	2015-05-01 16:39:25 -07:00
Seth Alves	4eac60b463	try harder to make sure all the assignment-client children stop	2015-05-01 16:34:44 -07:00
Sam Gateau	2382183075	FIxed the bug about the tga not loading by recognizing the file format type from the filename extension and passing the info to the QImage::fromData()	2015-05-01 16:09:41 -07:00
Ryan Huffman	ddec694393	Update add-zone icon in edit.js	2015-05-01 15:38:06 -07:00
Seth Alves	560d89b38a	session id can be null. don't crash	2015-05-01 14:56:03 -07:00
Sam Gateau	66a1d1f597	Merge branch 'temp1' of https://github.com/samcake/hifi into temp1	2015-05-01 13:38:38 -07:00
Sam Gateau	7874de9924	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-05-01 13:37:29 -07:00
Sam Gateau	1b558e7390	investigating the semi transparent textured bug	2015-05-01 13:37:04 -07:00
Seth Alves	5390630497	Merge pull request #4743 from huffman/sphere-color ... Add support for changing sphere color in edit.js	2015-05-01 13:17:46 -07:00
Ryan Huffman	8ed5284dfa	Add drawZoneBoundaries get/set to EntitiesScriptingInterface	2015-05-01 12:52:59 -07:00
Ryan Huffman	51c2a8273e	Add drawZoneBoundaries	2015-05-01 12:52:40 -07:00
samcake	1448ab21b6	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-05-01 12:04:34 -07:00
samcake	c8e5b35de9	Fixing typo	2015-05-01 12:04:15 -07:00
Brad Hefta-Gaub	62ba82198c	Merge pull request #4737 from samcake/temp1 ... Fix the shadow Bug on Mac and the errors on shader compilation	2015-05-01 12:01:00 -07:00
Seth Alves	4f483afd10	Merge pull request #4742 from huffman/osx-warnings ... Update compiler flags to produce warnings on non-gnu compilers	2015-05-01 12:00:57 -07:00
Ryan Huffman	7f84b27880	Add support for changing sphere color in edit.js	2015-05-01 11:59:39 -07:00
Seth Alves	6139fc0d73	Merge pull request #4738 from huffman/entity-naming ... Add 'name' property to entities	2015-05-01 11:58:30 -07:00
Seth Alves	bd1f77b8f3	cleanups	2015-05-01 11:35:14 -07:00
Seth Alves	ea1ec0186e	stop doing useless multiple inheritance	2015-05-01 11:31:58 -07:00
Ryan Huffman	0883bde1be	Update compiler flags to produce warnings on non-gnu compilers	2015-05-01 11:29:23 -07:00
Ryan Huffman	c506c36d7c	Fix initialized-out-of-order warnings for name property	2015-05-01 11:26:43 -07:00
Seth Alves	b47184de78	oops	2015-05-01 11:21:27 -07:00
Seth Alves	452d78805e	oops	2015-05-01 11:20:50 -07:00
Seth Alves	b443ce5d3e	oops	2015-05-01 11:20:34 -07:00
Seth Alves	a31e2dc309	oops	2015-05-01 11:18:56 -07:00
Seth Alves	3765ace7ef	move common debugging rendering into a new class	2015-05-01 11:17:46 -07:00
Seth Alves	f3d1b964e3	Merge branch 'master' of github.com:highfidelity/hifi into box-stacking-1	2015-05-01 11:16:58 -07:00
samcake	2bf7387723	Merge pull request #4733 from sethalves/box-stacking ... improve display of owned boxes and models when simulation-ownership debug menu is enabled	2015-05-01 11:00:28 -07:00
Sam Gateau	67b923eb89	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-05-01 10:42:39 -07:00
Seth Alves	00fd7208b5	Merge branch 'master' of github.com:highfidelity/hifi into box-stacking-1	2015-05-01 10:22:19 -07:00