36274 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	571ccb3c20	cleaning up the code	2015-12-14 17:14:45 -08:00
Anthony J. Thibault	617fda7832	ModelEntityItem: fix for incorrect joint mapping ... This could happen when switching the animation url between fbx files with different joint mappings. Only the first one would take effect. This should fix the issue in the demo domain, with the contorted doll model.	2015-12-14 17:07:53 -08:00
samcake	9f1f0798cb	cleaning up the code	2015-12-14 17:04:26 -08:00
samcake	ed2d45d0b6	HMD Mirror looks correct	2015-12-14 16:18:44 -08:00
Seth Alves	165c41d843	add a way to remember which entities couldn't be properly placed in octree due to missing parents	2015-12-14 14:19:19 -08:00
Anthony J. Thibault	3f0cdb3c02	Merge branch 'master' into tony/js-avatar-default-pose	2015-12-14 11:19:24 -08:00
Clément Brisset	205bc1b790	Merge pull request #6641 from ZappoMan/removeFeatureCruft ... Remove the blue sphere while speaking	2015-12-14 10:39:05 -08:00
samcake	1597d3d466	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2015-12-14 10:25:22 -08:00
samcake	2aad26154e	THis should fix the mirror and the skybox issue	2015-12-14 10:24:51 -08:00
Seth Alves	b9fc368857	Merge pull request #6633 from huffman/agent-spatial-finder ... Add AssignmentParentFinder to Agent	2015-12-14 09:35:27 -08:00
samcake	e005bb7b5a	MAybe a mirror solution ?	2015-12-14 09:25:32 -08:00
Seth Alves	008065ba38	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-14 09:15:56 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Brad Hefta-Gaub	248c94e638	Merge branch 'master' of https://github.com/highfidelity/hifi into removeFeatureCruft	2015-12-14 09:04:49 -08:00
Andrew Meadows	0b7b9dcfda	Merge pull request #6640 from ZappoMan/menuGroups ... first cut at adding advanced and developer menu groupings	2015-12-14 08:58:19 -08:00
Brad Hefta-Gaub	cf67e883ab	Merge pull request #6650 from ctrlaltdavid/win-build-instructions ... Update Windows build instructions for 64-bit builds	2015-12-13 19:29:42 -08:00
David Rowe	7190c26c40	Update Windows build instructions for 64-bit builds	2015-12-14 15:37:10 +13:00
Philip Rosedale	11fca6be6e	Merge pull request #6647 from kencooke/master ... Fix crash in "entry" from procedural skybox	2015-12-13 18:30:17 -08:00
Ken Cooke	67d6965f14	Revert "Fix the broken skybox and simplify a bit the vertex shader used" ... This reverts commit 68134aafe5.	2015-12-13 16:14:38 -08:00
Brad Hefta-Gaub	be058398a2	remove blue sphere while speaking	2015-12-13 12:02:39 -08:00
Seth Alves	270d5fc8e1	remove commented-out code	2015-12-13 06:44:34 -08:00
Seth Alves	f3acec5177	whitespace	2015-12-13 06:44:15 -08:00
Seth Alves	076e2b73a1	make AABox encoder and decode safer	2015-12-13 06:44:06 -08:00
Brad Hefta-Gaub	2815cb0fef	first cut at adding advanced and developer menu groupings	2015-12-12 18:12:36 -08:00
Seth Alves	da7aed8666	use parenting for near-grabbing	2015-12-12 14:48:07 -08:00
Seth Alves	7f11d2a4fe	whitespace	2015-12-12 14:45:02 -08:00
Brad Hefta-Gaub	868ed0dfbc	Merge pull request #6585 from AndrewMeadows/bullet-2.x ... upgrade to bullet-2.83	2015-12-12 13:05:38 -08:00
Brad Hefta-Gaub	63c3f7c1a7	Merge pull request #6637 from Atlante45/warnings-win ... Warning cleanup	2015-12-12 13:00:55 -08:00
Seth Alves	1492fd6090	merge from upstream	2015-12-12 12:37:57 -08:00
Seth Alves	24fb43e8cd	first steps toward a puffed-out query-box for child entities	2015-12-12 12:33:14 -08:00
Andrew Meadows	beeb3becd6	Merge pull request #6639 from sethalves/dont-simulate-model-too-soon ... don't simulate model until it has geometry	2015-12-12 07:33:22 -08:00
Sam Cake	6288e99798	Playing with mirror	2015-12-11 23:28:04 -08:00
Atlante45	b8495a6912	Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win	2015-12-11 18:05:47 -08:00
samcake	1ddbc15df4	Exploring how to solve the mirror fullscreen bug	2015-12-11 17:47:33 -08:00
Atlante45	eb8fc2e156	Fix last of the windows warnings	2015-12-11 17:37:36 -08:00
Seth Alves	8ec84bdde8	don't simulate model until it has geometry	2015-12-11 17:35:18 -08:00
Atlante45	7472673dae	More warning fixes	2015-12-11 17:23:12 -08:00
samcake	28d2868ede	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2015-12-11 17:10:12 -08:00
Clément Brisset	c160a98c5c	Merge pull request #6636 from samcake/controllers ... Fix the broken skybox and simplify a bit the vertex shader used	2015-12-11 17:06:33 -08:00
Atlante45	4bfa279b1b	Merge branch 'warnings-win' of github.com:Atlante45/hifi into warnings-win	2015-12-11 17:02:57 -08:00
Atlante45	b7ba3c5f17	More warning fixes	2015-12-11 17:02:03 -08:00
Atlante45	4fb72667b6	Fix stack manager warning	2015-12-11 16:43:48 -08:00
Atlante45	b7478c4594	Fix gcc warning	2015-12-11 16:38:19 -08:00
samcake	7ee066b9ed	Merge branch 'controllers' of https://github.com/samcake/hifi into red	2015-12-11 16:35:18 -08:00
Atlante45	c782b01fde	More warning fixes	2015-12-11 16:31:27 -08:00
Atlante45	d9583064f1	Move QOpenGL wrappers to the gl lib	2015-12-11 16:31:27 -08:00
Atlante45	8bd301e45e	More warning fixes	2015-12-11 16:31:27 -08:00
Atlante45	5300963183	More warning fixes	2015-12-11 16:31:27 -08:00
Atlante45	79fdb2e882	Fix warnings on windows 64bit	2015-12-11 16:31:27 -08:00
Atlante45	9e51947c25	More warning fixes	2015-12-11 16:31:27 -08:00