Commit graph

27078 commits

Author SHA1 Message Date
Philip Rosedale
bffc1a38a7 Separate DC offset rejection, and call it all the time 2015-06-18 12:33:05 -07:00
Brad Davis
0cdee2d6ec preprocessor error on Linux/Mac 2015-06-18 12:14:55 -07:00
Sam Gateau
fb42613344 Fixing transparency that i just broke 2015-06-18 20:25:51 +02:00
Brad Hefta-Gaub
b008b810e1 Merge pull request #5145 from Atlante45/text
Bring back display names
2015-06-18 11:25:45 -07:00
David Rowe
1047703718 Tidy address bar code
Re-enable and reposition mouse drag areas
Remove unused graphics assets
Remove unused includes
2015-06-18 11:18:56 -07:00
Brad Davis
4404917003 Fix HMD projection post-merge 2015-06-18 11:16:25 -07:00
Howard Stearns
37d6e21ce3 Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound 2015-06-18 11:16:16 -07:00
Seth Alves
7d707447ca move multi-line function out of header 2015-06-18 11:07:50 -07:00
Seth Alves
97eeb20625 Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual 2015-06-18 11:04:24 -07:00
David Rowe
c88ba2c6d1 Increase the saccade interval 2015-06-18 10:41:51 -07:00
Howard Stearns
fdf5860c4f Refactor playSound. 2015-06-18 10:39:58 -07:00
Brad Davis
cd325f7bf4 Merge pull request #5157 from ZappoMan/fixOpenGLDependency
first cut and removing openGl dependency in shared
2015-06-18 10:21:38 -07:00
David Rowe
0c7c5f6301 Limit the speed of eye saccades 2015-06-18 10:21:36 -07:00
Seth Alves
53b5c8e6e7 more merge fallout 2015-06-18 10:19:12 -07:00
Sam Gondelman
3baf6d80ae removed magic numbers from mouseLook.js 2015-06-18 10:10:54 -07:00
Seth Alves
f9618ca2cb implicit cast 2015-06-18 10:07:12 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Sam Gondelman
f752534f7c actionEvent signal, captureActions, began work on hmdControls.js 2015-06-18 09:52:36 -07:00
ZappoMan
383a2c3d63 another attempt 2015-06-18 09:43:39 -07:00
ZappoMan
673e1ee0cc first cut and removing openGl dependency in shared 2015-06-18 09:30:34 -07:00
Atlante45
26e8c490c3 constexpr not handled on windows 2015-06-18 15:23:54 +02:00
Atlante45
5166d833a7 Make array size a constexpr 2015-06-18 15:23:53 +02:00
Atlante45
d0f27f1648 Change display names size 2015-06-18 15:23:53 +02:00
Atlante45
c38fa46eb1 Increase anti z-fighting value 2015-06-18 15:23:53 +02:00
Atlante45
045a6a6ad9 Use render args frustum 2015-06-18 15:23:52 +02:00
Atlante45
30fbd37645 Transmit normal to text rendering shader 2015-06-18 15:23:52 +02:00
Atlante45
be261cd038 Increase anti z-fighting value 2015-06-18 15:23:52 +02:00
Atlante45
fb6de91cbe HACK Prevent head hight value explosion 2015-06-18 15:23:51 +02:00
Atlante45
3b41a8f209 Cancel display names roll
This is annoying in HMD
2015-06-18 15:23:51 +02:00
Atlante45
e1b5a3c204 Fix display name transform
They now have a fixed pixel size and ar pixel aligned
2015-06-18 15:23:51 +02:00
Atlante45
1cab853f18 Better guard Transform scale 2015-06-18 15:23:50 +02:00
Atlante45
8a3a7e5b7f Reorder triangle strip 2015-06-18 15:23:50 +02:00
Atlante45
a9d2bb1e1c Coding standard 2015-06-18 15:23:50 +02:00
Atlante45
254f05072f Fix inverted if 2015-06-18 15:23:49 +02:00
Atlante45
70a020c7e3 BevelRect use triangle strips 2015-06-18 15:23:49 +02:00
Atlante45
d7b9a1b032 Cleanup TextRenderer3D methods args 2015-06-18 15:23:49 +02:00
Atlante45
47634a48a6 Make renderDisplayName const 2015-06-18 15:22:49 +02:00
Atlante45
ca98b378df Adjust sdf frag shader alpha correctly 2015-06-18 15:22:49 +02:00
Atlante45
bdaf8a8a32 Fix bevel quads 2015-06-18 15:22:48 +02:00
Atlante45
e8e1f81880 Make Batch copy constructor explicit 2015-06-18 15:22:48 +02:00
Atlante45
a486ed1a57 Add _glUniform1i to Batches 2015-06-18 15:22:48 +02:00
Sam Gateau
5d33cd00b3 Merge branch 'daft' of https://github.com/samcake/hifi into daft 2015-06-18 13:12:12 +02:00
samcake
89fe1c47be preping for debug the jobs 2015-06-18 13:02:06 +02:00
Brad Davis
5c4fa77acd Merge branch 'temp' into overlay 2015-06-18 00:59:31 -07:00
Brad Davis
d9452cfd2e Merge branch 'gpu-error-tweak' into overlay 2015-06-18 00:54:48 -07:00
Brad Davis
dfea571e62 Removing a 'using namespace' from a header and tweaking error checking code 2015-06-18 00:54:35 -07:00
Brad Davis
acdf7c48d9 Adding more explicit error checking 2015-06-18 00:53:19 -07:00
Brad Davis
84c3dab3d8 Fixing error in stats qml parsing 2015-06-18 00:23:40 -07:00
Brad Davis
a8d3dc7218 Updating oglplus version 2015-06-17 23:50:38 -07:00
Brad Hefta-Gaub
db56e15410 Merge pull request #5155 from sethalves/fix-line-data-handling
Fix line data handling
2015-06-17 22:47:53 -07:00