36185 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	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
Atlante45	a07d7494f0	More OS X warning cleanup	2015-12-11 14:20:36 -08:00
Brad Hefta-Gaub	64dd36d140	Merge pull request #6503 from imgntn/ratsteer ... Add rats to Drylake environment	2015-12-11 13:08:03 -08:00
James B. Pollack	35da54fc6c	dead code and print statements	2015-12-11 11:51:32 -08:00
James B. Pollack	a31ba089c1	semicolons and print statements	2015-12-11 11:49:00 -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
Brad Hefta-Gaub	d918eca030	reset skybox on changing domains	2015-12-11 11:36:02 -08:00
Brad Hefta-Gaub	c417b2b462	Merge pull request #6627 from samcake/controllers ... Changing the path to the win sdk to x64	2015-12-11 11:33:53 -08:00
Brad Davis	f6652c0b2a	Merge pull request #6628 from ZappoMan/reloadMyAvatarOnContentReload ... reload own avatar on Content Reload	2015-12-11 11:23:47 -08:00
Brad Hefta-Gaub	a1a3c4470c	reload own avatar on Content Reload	2015-12-11 11:02:16 -08:00
Bradley Austin Davis	ae1345bb13	Adding nsight instrumenting to the QML render thread	2015-12-11 11:00:33 -08:00
samcake	93dbc92c61	Adding the correct selection of the winSDK based on the generator used	2015-12-11 10:59:36 -08:00
samcake	94b6ca4450	FIxing the bad lambda capture for local variables	2015-12-11 10:48:58 -08:00
samcake	8497931cb4	Changing the path to the win sdk to x64	2015-12-11 10:29:14 -08:00
Bradley Austin Davis	265bd8ee67	Moving QML rendering off the main thread	2015-12-11 10:28:31 -08:00
Andrew Meadows	6d7597e9fc	remove comments and remove dangling whitespace	2015-12-11 09:40:15 -08:00
Andrew Meadows	9231692d23	fix asset URL and windows cmake command for bullet	2015-12-11 09:40:15 -08:00
Andrew Meadows	cb65a6f640	fix cmake to build bullet-2.83	2015-12-11 09:40:15 -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