36202 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	112dd4209b	prep for incoming	2015-12-14 17:27:01 -08:00
James B. Pollack	8bdced8576	more work	2015-12-14 16:51:12 -08:00
James B. Pollack	ea0ffa5899	support changing values for lights via message	2015-12-14 16:39:25 -08:00
James B. Pollack	18458a8431	test scene	2015-12-14 12:04:44 -08:00
James B. Pollack	1698e903c9	midday	2015-12-14 11:25:30 -08:00
James B. Pollack	0fa82a6449	Merge branch 'master' into light_mod	2015-12-14 10:13:09 -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
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	2815cb0fef	first cut at adding advanced and developer menu groupings	2015-12-12 18:12:36 -08:00
James B. Pollack	77969e1481	breaktime	2015-12-12 17:31:49 -08:00
James B. Pollack	231bcdb8f0	name some things better and cleanup	2015-12-12 17:22:57 -08:00
James B. Pollack	7cace24002	light editing framework	2015-12-12 17:14:43 -08:00
James B. Pollack	0fe4803b04	start	2015-12-12 16:17:00 -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
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
Atlante45	b8495a6912	Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win	2015-12-11 18:05:47 -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
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
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
Atlante45	0f49653da3	More OS X warning cleanup	2015-12-11 16:31:27 -08:00
Atlante45	146581714a	More warning fixes	2015-12-11 16:17:41 -08:00
Atlante45	f308ef7aa9	Move QOpenGL wrappers to the gl lib	2015-12-11 16:17:17 -08:00
samcake	68134aafe5	Fix the broken skybox and simplify a bit the vertex shader used	2015-12-11 16:14:55 -08:00
James B. Pollack	f61ce98527	Merge pull request #6635 from sethalves/fix-flashlight-crash ... don't crash when a child no longer has a containing element	2015-12-11 16:10:00 -08:00
Brad Hefta-Gaub	8f6b637909	Merge pull request #6634 from jherico/escrow ... Refactoring escrow due to long unsignaled syncs reported by Philip	2015-12-11 16:03:59 -08:00
Atlante45	d3224bfde3	More warning fixes	2015-12-11 16:03:44 -08:00
Brad Davis	1bcf42a799	Merge pull request #6629 from ZappoMan/resetSkyBoxOnDomainChange ... reset skybox on changing domains	2015-12-11 15:48:20 -08:00
Atlante45	da63357254	More warning fixes	2015-12-11 15:42:15 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Seth Alves	920e2941b9	don't crash when a child no longer has a containing element	2015-12-11 15:31:56 -08:00
Bradley Austin Davis	04b8251a83	Refactoring escrow due to long unsignaled syncs reported by Philip	2015-12-11 15:05:38 -08:00
Atlante45	f72eb679c6	More warning fixes	2015-12-11 15:04:33 -08:00
Ryan Huffman	66ed8dc053	Add AssignmentParentFinder to Agent	2015-12-11 14:51:14 -08:00
Atlante45	a07d7494f0	More OS X warning cleanup	2015-12-11 14:20:36 -08:00