17807 commits

Author	SHA1	Message	Date
Stephen Birarda	ba77aaf7ef	remove collision of isPlaying property and slot	2016-05-25 11:06:08 -07:00
Brad Hefta-Gaub	b8b39b962d	Merge pull request #7868 from jherico/entity_shape ... Add a generic shape primitive	2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub	bfb3f2cdfe	Merge pull request #7955 from sethalves/quiet-compiler ... quiet gcc 5 warnings	2016-05-23 19:44:21 -07:00
Clément Brisset	a8b359dd60	Merge pull request #7943 from birarda/api-recheck-on-fail ... refresh connection info for place/domain while not connected	2016-05-23 10:57:58 -07:00
Brad Hefta-Gaub	f69c0ce5e5	Merge pull request #7957 from jherico/procedural_skybox_fix ... fix broken procedural skybox when leaving and re-entering	2016-05-23 09:29:31 -07:00
Brad Davis	1f2f9da019	fix keys getting stuck	2016-05-22 23:34:45 -07:00
Brad Davis	11de8a52b2	fix broken procedural skybox when leaving and re-entering	2016-05-22 22:52:56 -07:00
Brad Davis	2c703e963c	More shapes	2016-05-22 19:48:59 -07:00
Brad Davis	cd1e910844	Add a generic shape primitive	2016-05-21 23:46:44 -07:00
Seth Alves	40e862cf9e	quiet gcc 5 warnings	2016-05-21 16:53:01 -07:00
Brad Hefta-Gaub	ac49feda22	Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS ... Conflicts: libraries/entities/src/EntityEditPacketSender.h	2016-05-21 09:23:45 -07:00
Seth Alves	637735bbc3	unmangle merge	2016-05-20 18:07:38 -07:00
Seth Alves	f91a2403be	merge from upstream	2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub	e012630db2	Merge pull request #7860 from birarda/place-referrer ... send lookup hostname to DS for split counts, correct number of DS connected users	2016-05-20 17:00:46 -07:00
Brad Hefta-Gaub	18613908df	Merge pull request #7800 from sethalves/no-fly-zones ... No fly zones	2016-05-20 16:59:55 -07:00
Brad Hefta-Gaub	dc29e97d32	Merge pull request #7870 from jherico/input_cleanup ... Update input plugins default active state & joint handling	2016-05-20 16:13:06 -07:00
Brad Hefta-Gaub	2062291810	Merge pull request #7926 from zzmp/fix/debug-script-crash ... fix crash on shutdown in debug	2016-05-20 15:35:32 -07:00
Brad Hefta-Gaub	9dded91af3	Merge pull request #7934 from AndrewMeadows/trim-convex-hulls ... reduce number of points in unreasonable convex hulls	2016-05-20 15:30:36 -07:00
Brad Hefta-Gaub	2a94b641e3	Merge pull request #7930 from zzmp/fix/zero-copy-crash ... fix crash from zero-sized copy	2016-05-20 15:11:00 -07:00
Andrew Meadows	2e30f0916c	remove debug logging and add some comments	2016-05-20 15:07:47 -07:00
Brad Davis	07562f72af	Doing a pass over the input plugins and controller code	2016-05-20 14:50:23 -07:00
Seth Alves	ff36b39067	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-20 14:38:53 -07:00
Brad Hefta-Gaub	770fab956f	remove dead code	2016-05-20 12:23:06 -07:00
Seth Alves	76f4a25694	move code that clears old scale and registration to after model is loaded	2016-05-20 11:40:46 -07:00
Stephen Birarda	33379824c8	clear place name if switching to a domain ID string	2016-05-20 11:25:26 -07:00
Stephen Birarda	5ab876114f	send hostname to DS with every DS packet to handle changes	2016-05-20 11:24:54 -07:00
Stephen Birarda	7110fe98eb	associate incoming place name with DomainServerNodeData	2016-05-20 11:24:54 -07:00
Stephen Birarda	51c16739f2	provide a getter for the place name in AddressManager	2016-05-20 11:24:54 -07:00
Andrew Meadows	83b8ef8131	clean up stream formatting of vec3 and friends	2016-05-20 09:41:26 -07:00
Andrew Meadows	f3fc00bc3a	add comment for why MAX_HULL_POINTS is 42	2016-05-20 09:41:26 -07:00
Andrew Meadows	5a826d696a	cleanup after code review	2016-05-20 09:41:26 -07:00
Andrew Meadows	9fae1a7edd	tweak log format	2016-05-20 09:41:26 -07:00
Andrew Meadows	7866fcf78c	trim high-point convex hulls	2016-05-20 09:41:26 -07:00
Brad Hefta-Gaub	95f7ea5609	Merge pull request #7922 from samcake/red ... improve performance of Light volume pass	2016-05-20 09:33:55 -07:00
Zach Pomerantz	4c8ff557db	Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash	2016-05-20 09:31:30 -07:00
Brad Hefta-Gaub	8760cd0807	Merge pull request #7929 from zzmp/fix/script-downloaded-shutdown ... fix crash on shutdown from scriptDownloaded callback	2016-05-20 09:31:04 -07:00
Brad Hefta-Gaub	25e7b9935e	Merge pull request #7932 from zzmp/fix/shadows ... fix shadow box that appears when flying	2016-05-20 09:30:29 -07:00
Zach Pomerantz	fff260c2b9	Guard against zero-sized gl buffer copy	2016-05-20 09:27:50 -07:00
Stephen Birarda	e8d7f9614a	refresh API info during re-connect - case 570	2016-05-19 17:59:42 -07:00
Brad Hefta-Gaub	a1ec6c2961	Merge pull request #7938 from sethalves/set-age-of-imported-to-zero ... fix age of imported entities	2016-05-19 17:53:31 -07:00
Brad Hefta-Gaub	d521cd82a0	Merge pull request #7908 from Atlante45/fix/settings ... fix settings getting reset	2016-05-19 17:53:15 -07:00
Seth Alves	1de9598243	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-19 16:37:40 -07:00
Brad Hefta-Gaub	cef4a49c35	Merge pull request #7867 from huffman/fix/query-octree-crash ... Fix crash in JurisdictionMap	2016-05-19 11:53:54 -07:00
Brad Hefta-Gaub	ac15097f47	Merge pull request #7834 from huffman/feat/user-agent-plugins ... Add system information to UserAgent in AccountManager requests	2016-05-19 11:53:14 -07:00
samcake	67929a018c	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-05-19 11:52:47 -07:00
Clément Brisset	cddf587d6b	Merge pull request #7919 from zzmp/fix/osx-warnings ... Fix OSX warnings	2016-05-19 11:11:30 -07:00
samcake	039bb3ac3c	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-05-19 10:21:38 -07:00
Seth Alves	7ea7bd3e1d	set created-time for imported entities to 'now'	2016-05-19 10:21:04 -07:00
samcake	2d7118dacc	clening up the code	2016-05-19 10:21:00 -07:00
samcake	d0c883f75a	Merge pull request #7923 from jherico/gpu_breakup2 ... breaking up OpenGL GPU backend	2016-05-19 10:02:42 -07:00