14698 commits

Author	SHA1	Message	Date
samcake	a60ef4fb5a	Finalize the names	2015-12-15 18:32:30 -08:00
samcake	c2feec16de	Cleaning the code	2015-12-15 18:24:16 -08:00
samcake	d2ebaef69e	Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template	2015-12-15 18:18:42 -08:00
samcake	2bbd5d86b8	cleaning indentation	2015-12-15 09:46:18 -08:00
samcake	e70ab472af	Merging with upstream master/graphics	2015-12-14 18:38:29 -08:00
samcake	84d1e3b123	Merged with upstream master	2015-12-14 18:30:24 -08:00
samcake	a50b14dfae	Merging with upstream graphics	2015-12-14 18:18:39 -08:00
samcake	3554f54e17	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-14 17:38:56 -08:00
samcake	ed2d45d0b6	HMD Mirror looks correct	2015-12-14 16:18:44 -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
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
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
Brad Hefta-Gaub	63c3f7c1a7	Merge pull request #6637 from Atlante45/warnings-win ... Warning cleanup	2015-12-12 13:00:55 -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	b3acde4462	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-11 17:49:00 -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	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
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
Atlante45	d3224bfde3	More warning fixes	2015-12-11 16:03:44 -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
Atlante45	a07d7494f0	More OS X warning cleanup	2015-12-11 14:20:36 -08:00
Brad Hefta-Gaub	30fd96b509	Merge pull request #6613 from jherico/threaded_qml ... Moving QML rendering off the main thread	2015-12-11 11:43:04 -08:00
Bradley Austin Davis	ae1345bb13	Adding nsight instrumenting to the QML render thread	2015-12-11 11:00:33 -08:00
samcake	94b6ca4450	FIxing the bad lambda capture for local variables	2015-12-11 10:48:58 -08:00
Bradley Austin Davis	265bd8ee67	Moving QML rendering off the main thread	2015-12-11 10:28:31 -08:00
Brad Hefta-Gaub	a7a924153a	Merge pull request #6617 from huffman/entity-query-keyhole ... Add keyhole radius to OctreeQuery	2015-12-11 09:35:46 -08:00
Brad Hefta-Gaub	b5e07d9af5	Merge pull request #6625 from howard-stearns/scriptable-anim-var-triggers ... Scriptable anim var triggers	2015-12-11 09:21:15 -08:00
Brad Hefta-Gaub	ff49ed7a65	Merge pull request #6621 from samcake/controllers ... Fixing the Collision Geometry display	2015-12-11 09:15:52 -08:00