12351 commits

Author	SHA1	Message	Date
ZappoMan	ea98581d22	reorganize files to cleanup headers	2015-06-17 09:18:00 -07:00
ZappoMan	b5731135dd	cleanup	2015-06-17 09:08:41 -07:00
ZappoMan	2356a071dd	some cleanup	2015-06-17 08:48:04 -07:00
ZappoMan	006899d73f	more hacking almost working	2015-06-16 22:23:14 -07:00
ZappoMan	569971582d	more hacking on trying to port atmospheres to the new pipeline	2015-06-16 18:39:35 -07:00
ZappoMan	722ac618f5	Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix	2015-06-16 17:08:15 -07:00
ZappoMan	167e7d1377	first cut at atmospheres in batch (doesn't work)	2015-06-16 14:05:14 -07:00
Andrew Meadows	7721f6de96	Merge pull request #5134 from birarda/master ... add goBack and goForward to AddressManager	2015-06-16 13:50:20 -07:00
Philip Rosedale	7ead2bc46b	Merge pull request #5120 from ctrlaltdavid/20576 ... DO NOT MERGE - QA for #20576 - Play sound when mic is muted	2015-06-16 13:27:01 -07:00
Stephen Birarda	1af4b1c54c	cleanup handleUrl call, add disabling of Menu items	2015-06-16 13:17:13 -07:00
Stephen Birarda	8e46043f14	add fixed back/forward, buttons to menu	2015-06-16 08:41:21 -07:00
Leonardo Murillo	c065269ba7	Merging with upstream	2015-06-15 11:58:52 -06:00
ZappoMan	648f9bebdf	add LOD stats to the default stats	2015-06-12 15:58:26 -07:00
Philip Rosedale	c834937472	Merge pull request #5122 from huffman/fix-rear-view-mirror ... Fix rear view mirror	2015-06-12 15:49:38 -07:00
Philip Rosedale	b628df45bc	Merge pull request #5121 from ZappoMan/attemptRevertOverlaysBork2 ... REVERT recent changes to overlays that seem to be breaking stuff	2015-06-12 13:50:53 -07:00
Ryan Huffman	ad77374732	Fix setting of _renderMode	2015-06-12 13:03:33 -07:00
ZappoMan	0cdc2b53fe	Revert "Merge pull request #5106 from jherico/render_cursor" ... This reverts commit 4d18bd7cec, reversing changes made to 24fda9a733.	2015-06-12 12:57:24 -07:00
David Rowe	e16116ce78	Have auto mute mic upon losing camera tracking disabled by default	2015-06-12 12:33:42 -07:00
ZappoMan	87951ff7b3	quick hack to fix stats texture bleed through	2015-06-12 11:24:56 -07:00
Atlante45	228f8c2e61	Fix a few items rendering without pipeline	2015-06-12 17:34:16 +02:00
Howard Stearns	27f40ea881	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -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 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	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
Sam Gondelman	0e8ec81837	fixed lambda capture	2015-06-11 09:41:59 -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
Seth Alves	4216308b9b	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-10 19:05:25 -07:00
Seth Alves	eccf4eb8a8	hold action works	2015-06-10 17:05:49 -07:00
ZappoMan	139855f487	handle remove attachment case	2015-06-10 16:13:17 -07:00
ZappoMan	e06422825a	mostly getting attachments working again	2015-06-10 15:46:54 -07:00
Seth Alves	1c0c7f0fe3	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-10 15:30:28 -07:00
Sam Gateau	1f62fb4b6f	Adding standard vertex and pixel shaders for drawing texture in applicationOverlay	2015-06-10 15:24:29 -07:00
Bradley Austin Davis	1dfc9c89eb	Fix doubled cursor on OSX	2015-06-10 13:57:48 -07:00
Leonardo Murillo	3bd0c7bd87	Code Review changes	2015-06-10 14:35:52 -06:00
Brad Davis	ca1af77763	Working on cursor manager	2015-06-10 13:24:56 -07:00
Leonardo Murillo	869461a01b	Code Review changes	2015-06-10 14:14:00 -06:00
Leonardo Murillo	8f72763f17	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-10 13:18:20 -06:00
Seth Alves	3dcc6c9b8c	make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus.	2015-06-10 12:04:44 -07:00
Brad Davis	7374fb84e8	Working on fixing overlays with team-teaching merge	2015-06-10 09:36:14 -07:00