7348 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	a2d8f89426	Merge pull request #4358 from huffman/handle-sigint ... Add SIGINT handling to assignment-client	2015-02-27 22:13:10 -08:00
ZappoMan	31c96523fb	add support for transparency in RAW heightmaps	2015-02-27 15:57:46 -08:00
Ryan Huffman	11efcd70d8	Add SIGINT handling to assignment-client	2015-02-27 14:09:46 -08:00
Brad Hefta-Gaub	08dc883b0e	Merge pull request #4351 from huffman/update-light-properties ... Update light properties (primarily for editEntities.js)	2015-02-27 10:54:19 -08:00
Philip Rosedale	35205fbbf3	Merge pull request #4347 from samcake/temp1 ... Introducing the SunSkyStage	2015-02-27 10:37:02 -08:00
Philip Rosedale	df553ac65e	Merge pull request #4335 from sethalves/assignment-client-keep-a-spare-x ... Assignment client keep a spare	2015-02-27 07:39:06 -08:00
Sam Gateau	c7eeebe52c	and fixing a bug with shadowing of lightmapped surface	2015-02-26 18:07:43 -08:00
Seth Alves	b8322556a6	address code-review comments	2015-02-26 17:34:24 -08:00
Sam Gateau	f6a9bd1870	REfining the naming and introducing an orientation offset	2015-02-26 17:26:41 -08:00
Sam Gateau	e3b3c8e1ef	Setting the defalt at a better time of the day	2015-02-26 16:09:21 -08:00
Ryan Huffman	d60618a582	Remove unused variables from RenderableLightEntityItem::render	2015-02-26 14:58:06 -08:00
Ryan Huffman	dc2b670fa8	Remove extraneous comments	2015-02-26 14:46:05 -08:00
Sam Gateau	e77d4572fa	Merge branch 'temp1' of https://github.com/samcake/hifi into temp1	2015-02-26 12:03:39 -08:00
dev	b04dbf7a34	fixing compilation issue on macos	2015-02-26 11:27:40 -08:00
Ryan Huffman	e42b708b56	Update deferredLightingEffect::add*Light methods	2015-02-26 11:03:47 -08:00
Sam Gateau	38762e882e	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-26 10:53:26 -08:00
Sam Gateau	fcb293d0b2	CLean up before pr	2015-02-26 10:45:00 -08:00
Virendra Singh	19912930dd	Merge branch 'master' of https://github.com/highfidelity/hifi into 20305	2015-02-26 22:57:27 +05:30
Seth Alves	9f83eabaad	Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x	2015-02-26 09:21:53 -08:00
Philip Rosedale	c2e559342a	Merge pull request #4341 from AndrewMeadows/bispinor ... load non-moving dynamic objects as "inactive" in physics engine	2015-02-26 09:21:49 -08:00
Virendra Singh	b3fdb19cad	Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 ... Conflicts: BUILD.md BUILD_WIN.md	2015-02-26 22:16:35 +05:30
Sam Gateau	a757229c0e	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-25 19:18:01 -08:00
Sam Gateau	4959e2924e	add an example script to control the sun light	2015-02-25 19:17:38 -08:00
Sam Gateau	6b29e314c2	Adding the Stage of the Scene and exposing control of the sun light from javascript	2015-02-25 19:05:27 -08:00
Andrew Meadows	7b68916010	Merge pull request #4343 from ZappoMan/hangOnExit ... BUG FIX: Hang on exit	2015-02-25 17:02:26 -08:00
ZappoMan	05d7d47045	some cleanup	2015-02-25 16:32:48 -08:00
ZappoMan	5eecb6a837	correctly delete glbuffers	2015-02-25 14:44:10 -08:00
Seth Alves	128a38100f	Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x	2015-02-25 14:13:55 -08:00
Leonardo Murillo	006b3ed0ac	Merge pull request #4300 from birarda/dependencies ... NOT MERGEABLE - add some externals as cmake external projects	2015-02-25 13:22:49 -08:00
Brad Hefta-Gaub	e7b36166ec	Merge pull request #4340 from huffman/fix-repeat-captured-keys ... Make KeyEvent objects equal even if they have differing isAutoRepeat val...	2015-02-25 12:24:19 -08:00
Brad Hefta-Gaub	6d237f3f79	Merge pull request #4339 from huffman/fix-plane-pick ... Fix plane pick	2015-02-25 12:23:45 -08:00
Andrew Meadows	d85be49694	merge upstream/master into andrew/bispinor	2015-02-25 12:08:02 -08:00
Andrew Meadows	5776df1012	load dynamic obj as inactive when not moving	2015-02-25 12:07:19 -08:00
Ryan Huffman	660d9ad499	Make KeyEvent objects equal even if they have differing isAutoRepeat values	2015-02-25 10:28:45 -08:00
Ryan Huffman	14ec9b431e	Update findRayRectangleIntersection to set out variable distance	2015-02-25 10:26:44 -08:00
Seth Alves	a6c79203bd	Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x	2015-02-25 08:47:58 -08:00
Clément Brisset	b1e46c1bc8	Merge pull request #4337 from ZappoMan/crashonexit ... Fixes to various Crashes on shutdown	2015-02-25 08:47:36 -08:00
ZappoMan	e87df0017a	code review feedback	2015-02-25 08:26:54 -08:00
Brad Hefta-Gaub	97e2e65cb3	Merge pull request #4336 from AndrewMeadows/bispinor ... lower threshold for ignoring rotation updates	2015-02-24 20:13:22 -08:00
Brad Hefta-Gaub	0f4e098a61	Merge pull request #4334 from huffman/edit-ray-improvement ... Fix BillboardOverlay::findRayIntersection	2015-02-24 20:13:05 -08:00
Brad Hefta-Gaub	8b47de3150	Merge pull request #4329 from Seefo/master ... Cleaned up warnings on Windows	2015-02-24 20:08:56 -08:00
ZappoMan	f1017f8a5d	simplify waitTillDoneRunning	2015-02-24 17:45:22 -08:00
ZappoMan	310654831c	clean up comments remove dead code	2015-02-24 17:34:19 -08:00
Andrew Meadows	0456cb298f	lower threshold for ignoring rotation updates ... one hundred fold smaller	2015-02-24 17:16:00 -08:00
ZappoMan	eab09eaf28	removed extra debugging	2015-02-24 17:15:58 -08:00
Seth Alves	89ebb45c03	Revert "Merge pull request #4332 from birarda/master" ... This reverts commit 3230857b0d, reversing changes made to 1b669af79d.	2015-02-24 17:09:05 -08:00
ZappoMan	25ae001d3b	removed extra debugging	2015-02-24 17:05:44 -08:00
Ryan Huffman	03b10b6cb0	Add findRayRectangleIntersection	2015-02-24 17:00:30 -08:00
ZappoMan	9dcea38b2b	tweak some debugging	2015-02-24 16:23:39 -08:00
ZappoMan	8757600a5e	ifdef around massive debug output	2015-02-24 15:57:13 -08:00