26696 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Leonardo Murillo	80ab2f31f4	typo	2015-06-16 14:49:55 -06:00
Leonardo Murillo	e1fb01e6dd	Fixing bug on platforms for which we don't release	2015-06-16 14:49:19 -06: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	b0b52ddcd2	Merge pull request #5082 from murillodigital/auto-updater ... Checkpoint towards auto updater	2015-06-16 16:06:19 -04:00
Leonardo Murillo	917aa5db6d	Code review changes	2015-06-16 13:21:40 -06:00
Leonardo Murillo	6fcdb83d46	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-16 12:54:32 -06:00
Philip Rosedale	ab73905832	Merge pull request #5130 from ZappoMan/fixRayPicking ... fix detailed ray picking against models	2015-06-15 13:45:28 -07:00
ZappoMan	1c3b484466	fix detailed ray picking against models	2015-06-15 12:48:51 -07:00
Brad Hefta-Gaub	03409fa7d8	Merge pull request #5128 from sethalves/unreasonably-deep-recursion ... unreasonably deep recursion	2015-06-15 11:47:00 -07:00
Seth Alves	5f3b902798	remove debugging print	2015-06-15 11:24:29 -07:00
Seth Alves	c1668553fd	make sure that the root node always appends an entity count (even if it's zero). This keeps the unreasonably-deep-recursion warnings from happening	2015-06-15 11:22:07 -07:00
Leonardo Murillo	c065269ba7	Merging with upstream	2015-06-15 11:58:52 -06:00
Philip Rosedale	0b4d4c24d4	Merge pull request #5119 from ericrius1/paintingOptimizations ... added lifetime to painted lines to prevent huge model.json files when…	2015-06-14 21:47:56 -07:00
Philip Rosedale	c113b4620d	Merge pull request #5107 from howard-stearns/draggable-toolbar ... Draggable toolbar	2015-06-14 21:46:49 -07:00
Clément Brisset	214f07d5f4	Merge pull request #5123 from ZappoMan/LODstats ... add LOD stats to the default stats	2015-06-13 16:02:48 +02: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	81d003bdb8	Add post-scale to view matrix when in mirror mode	2015-06-12 13:05:10 -07:00
Ryan Huffman	66a65e3675	Update model to select clockwise backface culling program when in mirror mode	2015-06-12 13:04:02 -07:00
Ryan Huffman	ad77374732	Fix setting of _renderMode	2015-06-12 13:03:33 -07:00
ZappoMan	1feceec0c7	Revert "Fix broken identity transforms on OSX" ... This reverts commit 9262839564.	2015-06-12 12:57:37 -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
David Rowe	c369e305f8	Include dialTone.js in default scripts	2015-06-12 12:33:30 -07:00
David Rowe	f0b6b0f548	Play sound upon microphone being muted	2015-06-12 12:33:17 -07:00
David Rowe	546442ff9a	Fix sound URLs ... Three slashes needed for Windows.	2015-06-12 12:32:40 -07:00
Philip Rosedale	6d0335055e	Merge pull request #5117 from ZappoMan/bugfix ... quick hack to fix stats texture bleed through	2015-06-12 11:59:21 -07:00
Philip Rosedale	243b9ee8cf	Merge pull request #5118 from ZappoMan/cullingBugs ... fix some avatar part culling issues	2015-06-12 11:59:03 -07:00
Eric Levin	7ee609396c	added lifetime to painted lines to prevent huge model.json files when lots of people draw in one domain. Got rid of gaps in lines when switching line entities	2015-06-12 11:58:43 -07:00
ZappoMan	becd9646f2	Merge branch 'master' of https://github.com/highfidelity/hifi into cullingBugs	2015-06-12 11:43:08 -07:00
ZappoMan	7d7db65fd1	fix avatar mesh boxes not staying in sync with avatar position	2015-06-12 11:42:38 -07:00
ZappoMan	87951ff7b3	quick hack to fix stats texture bleed through	2015-06-12 11:24:56 -07:00
Brad Hefta-Gaub	a5b28660ad	Merge pull request #5113 from Atlante45/debug ... Fix text entities wrapping	2015-06-12 11:23:31 -07:00
ZappoMan	4ed147418a	quick hack to fix stats texture bleed through	2015-06-12 11:19:30 -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