Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 09:20:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27091 commits 25 branches 0 tags 1.1 GiB
Commit graph

27091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Andrew Meadows
d88d9b2b88 Merge pull request #5141 from sethalves/overloaded-virtual 
use -Woverloaded-virtual with g++.  quiet compiler warnings
 2015-06-18 14:58:47 -07:00
Sam Gondelman
53bbd519a3 two new customizable actions for use in js 2015-06-18 14:37:09 -07:00
Brad Davis
68595ef5dc Delete sync object after use 2015-06-18 14:27:19 -07:00
Bradley Austin Davis
e75b1a6794 Merge branch 'temp' into overlay 2015-06-18 14:03:25 -07:00
Bradley Austin Davis
96ac5070f6 Adding some more protection to the viewport 2015-06-18 14:00:17 -07:00
Bradley Austin Davis
1bae1d6065 Changing font size for timings 2015-06-18 13:59:48 -07:00
Sam Gondelman
fd0efd91ff added shift action, added timers and fast mode to hmdControls.js 2015-06-18 13:59:37 -07:00
Bradley Austin Davis
100f7acddc Working on tooltip placement 2015-06-18 13:46:27 -07:00
Bradley Austin Davis
7bbaf026f3 use a monospace font on all platforms 2015-06-18 13:33:37 -07:00
Philip Rosedale
61a2196a30 Reduce error tolerances for ballistic prediction that trigger updating the server 2015-06-18 13:21:37 -07:00
Brad Davis
1243c54767 More merge bugs 2015-06-18 12:44:57 -07:00
Philip Rosedale
e46a820872 remove debug 2015-06-18 12:37:50 -07:00
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