2610 commits

Author	SHA1	Message	Date
Atlante45	ae3bcc8f06	No more .f	2014-11-19 16:53:39 -08:00
dev	ce50152863	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-19 01:06:33 -08:00
dev	4028e66c08	trying to fix the lighting issue in stereo and fix the display name size and orientation	2014-11-18 18:59:54 -08:00
Stephen Birarda	2274b35d08	connect to sandbox domain by default	2014-11-18 15:35:11 -08:00
David Rowe	bb15fc138c	Fix Bandwidth Details dialog opening if click meter's pos when UI hidden	2014-11-15 09:28:40 -08:00
Sam Gateau	0973d197cf	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 12:25:00 -08:00
Brad Hefta-Gaub	1d14f94cb0	Merge pull request #3797 from huffman/entity-tool-properties ... Entity Tools - Properties window, Tool window, Various fixes	2014-11-14 11:48:57 -08:00
Sam Gateau	cc78000641	introduce the concept of side thorugh out the rendering traversal	2014-11-14 11:22:11 -08:00
Ryan Huffman	28eebd3fa5	Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties	2014-11-14 10:53:18 -08:00
Ryan Huffman	604b1b620b	Move dock window to ToolWindow	2014-11-14 10:52:08 -08:00
Stephen Birarda	903cd05ff8	put newlines back in interface log	2014-11-14 10:39:45 -08:00
Sam Gateau	f09b58c255	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 10:05:01 -08:00
Sam Gateau	642f436fba	first draft of factorizing the rendering traversal for both sides in stereo	2014-11-14 09:56:36 -08:00
Brad Hefta-Gaub	27c37f3a4e	Merge pull request #3784 from ctrlaltdavid/20157 ... CR for Job #20157 - Enable "Get Overlay properties" from javascript	2014-11-13 20:43:38 -08:00
Ryan Huffman	6b2a497810	Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes	2014-11-13 17:48:17 -08:00
Ryan Huffman	03f155bcd8	Add tool window	2014-11-13 17:47:02 -08:00
David Rowe	8076bfea72	Merge branch 'master' into 20157 ... Conflicts: interface/src/ui/overlays/Text3DOverlay.cpp	2014-11-13 14:53:57 -08:00
Stephen Birarda	e10d132f75	avoid Qt QTimer thread bug by putting SoundCache on same thread	2014-11-13 14:47:28 -08:00
Sam Gateau	7e2c4c0561	SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint	2014-11-13 10:57:32 -08:00
ZappoMan	13f08e65d1	Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering ... Conflicts: interface/src/renderer/Model.h	2014-11-12 19:31:27 -08:00
Sam Gateau	c0496fd466	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2014-11-12 16:52:34 -08:00
Sam Gateau	d3a7b011bf	defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design. And cleaned the dead code in Application.cpp	2014-11-12 16:52:11 -08:00
Sam Gateau	8fb04af59d	defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design	2014-11-12 16:40:45 -08:00
Brad Hefta-Gaub	70c463695a	Merge pull request #3779 from PhilipRosedale/master ... Remove buckyBalls and faceshift lean-to-drive	2014-11-12 16:26:50 -08:00
Brad Hefta-Gaub	331e9d6558	Merge pull request #3775 from birarda/lobby ... repairs to local audio injection	2014-11-12 16:26:38 -08:00
David Rowe	8c3bedae9d	Add position vector and color object script value examples ... OverlayPropertyResult type is needed to successfully move QScriptValue objects from QScriptEngine in Overlays to QScriptEngine in script.	2014-11-12 14:33:52 -08:00
Philip Rosedale	6af2b7aadf	remove buckyballs and face shift lean driving (should be a script if desired)	2014-11-12 07:33:59 -08:00
Sam Gateau	5f0fdeccb2	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2014-11-12 00:27:12 -08:00
Sam Gateau	b716a512c6	Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level	2014-11-12 00:26:44 -08:00
Stephen Birarda	b7b371ba61	resolve conflicts on merge with upstream master	2014-11-11 20:53:24 -08:00
Stephen Birarda	9bd870f4b0	fix hifi url handling after update to 5.3.2	2014-11-11 20:45:04 -08:00
Sam Gateau	7a9f45d34f	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2014-11-11 16:40:11 -08:00
Sam Gateau	668c5e298d	clean up the Transform class and the rendering path in Model.cpp	2014-11-11 16:39:00 -08:00
Stephen Birarda	0e30c65e60	handle cleanup of local injection, volume	2014-11-11 15:12:11 -08:00
Stephen Birarda	d0e8c294da	handle passing of local audio interface to AudioInjector	2014-11-11 11:22:16 -08:00
Ryan Huffman	bedd9c76f2	Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool ... Conflicts: examples/newEditEntities.js	2014-11-11 10:48:49 -08:00
Ryan Huffman	a1d771a0be	Rename WebWindow to WebWindowClass	2014-11-11 10:03:14 -08:00
Sam Gateau	ad51416c28	move the transform class files to the Shared library, still problem with negative scale composition	2014-11-11 09:54:35 -08:00
Andrzej Kapolka	5f89b6e00e	The spec actually says that the 'L' (should have been 'LL' anyway) isn't ... necessary; the compiler will know to read the constant as a long long.	2014-11-10 11:58:52 -08:00
Sam Gateau	7ccb7495c7	Merge and resolve conflict on APplication.cpp	2014-11-10 10:07:24 -08:00
Sam Gateau	631ed9da78	let's start reusing the Batch per model from frame to frame	2014-11-10 10:04:19 -08:00
Brad Hefta-Gaub	fc89f92097	Revert "Revert "Fix build warning""	2014-11-07 21:53:56 -08:00
Brad Hefta-Gaub	09490b58b4	Revert "Fix build warning"	2014-11-07 21:47:28 -08:00
David Rowe	94d82455a0	Fix build warning	2014-11-07 19:56:54 -08:00
Andrzej Kapolka	cd110d6048	Fix for invalid projection matrix on startup.	2014-11-07 14:35:01 -08:00
Andrzej Kapolka	7008012492	Trigger fixes.	2014-11-07 14:20:31 -08:00
Andrzej Kapolka	a4db244182	Mirror/warning fixes.	2014-11-07 13:57:20 -08:00
Stephen Birarda	f1a238a6c2	piping for local UI sounds	2014-11-07 10:08:09 -08:00
ZappoMan	55576e7f9d	fix crash in mouse messages while quitting	2014-11-06 17:53:22 -08:00
ZappoMan	bceab4ead9	clear all octree related state when disconnecting from a domain	2014-11-06 17:25:49 -08:00