26640 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	a5b28660ad	Merge pull request #5113 from Atlante45/debug ... Fix text entities wrapping	2015-06-12 11:23:31 -07:00
Brad Hefta-Gaub	b11b1d408b	Merge pull request #5116 from jherico/osx_overlay_fix ... Fix broken identity transforms on OSX	2015-06-12 10:59:37 -07:00
Atlante45	30ae78e3b6	Rename getRowHeight	2015-06-12 19:50:32 +02:00
Atlante45	26dd067982	Advance with _leading on y	2015-06-12 19:44:40 +02:00
Atlante45	f3d3bd7bec	Remove _rowHeight	2015-06-12 19:44:15 +02:00
Philip Rosedale	e9362c9da7	Merge pull request #5115 from birarda/master ... don't build polyvox examples so Qt isn't required for it	2015-06-12 10:43:12 -07:00
Bradley Austin Davis	9262839564	Fix broken identity transforms on OSX	2015-06-12 10:33:52 -07:00
Stephen Birarda	128b086e82	don't build the polyvox examples	2015-06-12 10:25:34 -07:00
Clément Brisset	e4511e37f5	Merge pull request #5111 from ZappoMan/cullingBugs ... hack to fix culling bugs for some subMesh parts in the windmill scene	2015-06-12 18:53:46 +02:00
Brad Hefta-Gaub	a22b235618	Merge pull request #5114 from Atlante45/fix_lines ... Fix a few items rendering without pipeline	2015-06-12 09:10:01 -07:00
ZappoMan	c17ae593f0	CR feedback	2015-06-12 09:04:16 -07:00
Atlante45	228f8c2e61	Fix a few items rendering without pipeline	2015-06-12 17:34:16 +02:00
Atlante45	565bf8bcb2	Fix text entities wrapping	2015-06-12 15:41:37 +02:00
Philip Rosedale	f1b24a1df0	Merge pull request #5110 from howard-stearns/audio-hello-goodbye ... exit sound	2015-06-11 22:55:42 -07:00
ZappoMan	2fc0233096	hack to fix culling bugs for some subMesh parts in the windmill scene	2015-06-11 20:50:31 -07:00
ZappoMan	feb3f68a00	hack to fix culling bugs for some subMesh parts in the windmill scene	2015-06-11 20:49:19 -07:00
Howard Stearns	27f40ea881	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
Brad Hefta-Gaub	c0deff9fdc	Merge pull request #5097 from jherico/cursor_manager ... Cursor manager first pass	2015-06-11 18:05:43 -07:00
Brad Hefta-Gaub	c27c20c142	Merge pull request #5109 from birarda/master ... fix for sticking windows audio-mixer	2015-06-11 17:39:55 -07:00
Stephen Birarda	81460e48f4	fix for sticking windows audio-mixer	2015-06-11 17:25:27 -07:00
Brad Davis	87887b2609	Merge remote-tracking branch 'upstream/master' into cursor_manager	2015-06-11 16:56:04 -07:00
Brad Davis	09cfe004a1	Combining with new cursor render code	2015-06-11 16:55:23 -07:00
Brad Davis	9148b866bb	Merge branch 'render_cursor' into cursor_manager ... Conflicts: interface/src/ui/ApplicationOverlay.cpp	2015-06-11 16:19:57 -07:00
Brad Hefta-Gaub	4d18bd7cec	Merge pull request #5106 from jherico/render_cursor ... Fix overlay rendering in HMD	2015-06-11 16:01:48 -07:00
Stephen Birarda	f45c2a3e56	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-11 15:49:12 -07:00
Brad Davis	92f22bc6d5	Magic number and build errors	2015-06-11 15:40:16 -07:00
Brad Davis	d3cdbc389a	Code cleanup	2015-06-11 15:05:08 -07:00
Brad Davis	b7cd1ea72a	Merge remote-tracking branch 'upstream/master' into render_cursor	2015-06-11 15:04:56 -07:00
Brad Davis	bc206633f5	Fixing overlay rendering in HMD	2015-06-11 14:56:21 -07:00
Brad Hefta-Gaub	24fda9a733	Merge pull request #5085 from SamGondelman/master ... Exposing Input Key Binding To JavaScript	2015-06-11 14:41:34 -07:00
Andrew Meadows	a9e3c5e477	Merge pull request #5095 from jherico/vs2015 ... Supporting building on Visual Studio 2015	2015-06-11 13:38:18 -07:00
Andrew Meadows	a3c5ea1b58	Merge pull request #5088 from sethalves/actions ... spring action with rotation and position target, rework grab script to use it	2015-06-11 13:23:57 -07:00
Seth Alves	8ed9a3ca02	add handedness setting to avatar-hold action. update stick.js to allow use of hydra	2015-06-11 11:04:19 -07:00
Brad Hefta-Gaub	a1ee339765	Merge pull request #5103 from samcake/punk ... TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene	2015-06-11 10:17:38 -07:00
Brad Hefta-Gaub	684e93cf42	Merge pull request #5105 from Atlante45/debug ... Fix zones wireframe rendering	2015-06-11 10:17:28 -07:00
Clément Brisset	37cb757c5f	Merge pull request #5102 from ZappoMan/bugfix ... fix debug rendering transforms	2015-06-11 18:58:34 +02:00
Sam Gondelman	0e8ec81837	fixed lambda capture	2015-06-11 09:41:59 -07:00
ZappoMan	a878559e0c	fix transforms for items with non-default registration point	2015-06-11 09:38:45 -07:00
ZappoMan	47888b4671	fix transforms for items with non-default registration point	2015-06-11 09:34:56 -07:00
Atlante45	f4f5f16758	Fix zones wireframe rendering	2015-06-11 18:34:39 +02:00
ZappoMan	55ede2b398	Merge branch 'master' of https://github.com/highfidelity/hifi into bugfix	2015-06-11 09:10:05 -07:00
Brad Hefta-Gaub	2e746324d7	Merge pull request #5104 from AndrewMeadows/americium ... fix bug where grab.js moves mouse to upper left corner after pressing CTRL	2015-06-11 08:58:56 -07:00
Andrew Meadows	f77f3f1e1e	fix bug where grab.js moves mouse to screen corner ... when CTRL is pressed	2015-06-11 08:43:19 -07:00
Andrew Meadows	7d0000c537	fix warning about returning ref to temp variable	2015-06-11 08:38:03 -07:00
Sam Gateau	7685fe2229	Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool	2015-06-11 06:40:21 -07:00
Brad Davis	fa27550df4	Merge remote-tracking branch 'upstream/master' into render_cursor	2015-06-11 02:21:02 -07:00
Brad Davis	ef52035300	Working on functional overlays	2015-06-11 02:20:51 -07:00
Clément Brisset	d448a3be7f	Merge pull request #5101 from ZappoMan/fix-attachments ... Get avatar attachments rendering again	2015-06-11 10:35:49 +02:00
Brad Davis	ac0fc5d974	Working on oculus overlay code	2015-06-11 00:57:58 -07:00
Philip Rosedale	b32994b359	Merge pull request #5083 from ctrlaltdavid/20551 ... CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace	2015-06-10 22:32:25 -07:00