Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 13:44:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18149 commits 25 branches 0 tags 1.1 GiB
Commit graph

8864 commits

Author SHA1 Message Date
Philip Rosedale
e5f93d00ac remove unused utility functions 2014-10-12 20:42:15 -07:00
Philip Rosedale
dc09572776 remove unused functions 2014-10-12 20:17:20 -07:00
Philip Rosedale
bc6346c257 Removed unused constant, class 2014-10-12 20:14:51 -07:00
Philip Rosedale
a054408abb Merge branch 'master' of https://github.com/worklist/hifi 2014-10-12 17:04:37 -07:00
ZappoMan
a08ddecc3a fix shifting tickmarks 2014-10-10 22:06:12 -07:00
Ryan Huffman
42479b1ae2 Add joystickWithName for PrioVR 2014-10-10 18:03:08 -07:00
Ryan Huffman
a24b5c24a9 Update max axis value to reflect maximum negative value 2014-10-10 17:28:09 -07:00
Andrzej Kapolka
dc8dc112c9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-10 17:19:24 -07:00
Andrzej Kapolka
60da0f1567 Allow drawing cursor on dual contour surface, wired up material paint tool. 2014-10-10 17:18:52 -07:00
Philip Rosedale
9be2b33971 Hair draped for masks and driven by audio loudness 2014-10-10 17:06:11 -07:00
Ryan Huffman
762cc71d31 Update to SDL2 2014-10-10 17:03:10 -07:00
Andrzej Kapolka
1911cfd0be Basic ray/voxel intersection testing up and running. 2014-10-10 15:11:37 -07:00
Stephen Birarda
21114d5f56 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 14:30:43 -07:00
Stephen Birarda
df6f4d4c95 remove cara face tracking, cleanup warnings 2014-10-10 14:17:52 -07:00
David Rowe
edf8cb671d Add "reset sensors" menu item corresponding to the apostrophe key 2014-10-10 13:24:48 -07:00
Andrzej Kapolka
c8c09a1e7b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-10 13:02:10 -07:00
David Rowe
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -07:00
David Rowe
357d49d442 Fix building without Oculus library 2014-10-10 11:36:47 -07:00
David Rowe
b0f4bc0d1c Tidy up log messages 2014-10-10 11:08:15 -07:00
David Rowe
0a5fdee1f2 Use NULL rather than 0 for "no overlay" 2014-10-10 11:00:41 -07:00
David Rowe
aa37ba5dfd Use const parameters 2014-10-10 10:57:17 -07:00
David Rowe
64d9a96a2b Update SVG file location 2014-10-10 10:42:13 -07:00
Stephen Birarda
76d00f351d Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 09:28:14 -07:00
AndrewMeadows
2a8b002725 Merge pull request #3576 from ZappoMan/editToolsImprovements 
First cut at new rotation UI/UX
 2014-10-10 08:17:22 -07:00
Brad Hefta-Gaub
961590414c Merge pull request #3574 from PhilipRosedale/master 
Oculus fixed for 3rd person and fullscreen mirror view
 2014-10-09 21:30:18 -07:00
ZappoMan
8105ded4eb handle reloading a new url in billboard overlays 2014-10-09 21:12:05 -07:00
Andrzej Kapolka
7b0d002355 Working on ray/voxel intersection testing. 2014-10-09 19:51:02 -07:00
ZappoMan
e5572e9deb don't render if alpha is 0 2014-10-09 19:20:33 -07:00
Andrzej Kapolka
51ff4cf7bb Merge pull request #3567 from samcake/master 
Improve the TextRenderer::draw(), step 1
 2014-10-09 18:46:23 -07:00
Sam Gateau
6687660d2f Fixing Andrzej's comments bis 2014-10-09 17:29:06 -07:00
Sam Gateau
1fc78e4277 Fixing Andrzej's comments 2014-10-09 17:18:51 -07:00
Stephen Birarda
31df339565 pipe username signature requirement through to DomainHandler 2014-10-09 16:53:22 -07:00
Philip Rosedale
f18faf9e3e removed commented code. 2014-10-09 16:46:06 -07:00
Philip Rosedale
2da4345b21 First person and mirror HMD view almost fixed 2014-10-09 13:32:35 -07:00
Sam Gateau
86c20b26eb Adding proper TODO and comments 2014-10-09 12:20:46 -07:00
Sam Gateau
d080d6347b Fixing const usage on a template function 2014-10-09 11:10:04 -07:00
Sam Gateau
b0c02311c0 Fixing include filename case 2014-10-09 10:56:41 -07:00
Sam Gateau
adc4e8c513 Fixing unix file format issues with msdev2010 2014-10-09 10:39:28 -07:00
samcake
9f0936de53 Improve the TextRenderer::draw(), first step 
- Introduce a managed Buffer for data to be used on the GPU. THis is the first type of resource (second will be texture) that we plan to    use in the graphics engine in the long term. this is an api agnostic replacement to QGLBuggerObject
  It's in the new file gpu/Resource.h(.cpp)

- Add two gpu::Buffers in the TextRenderer that collect all the glyph vertices (coords + texcoords + color) during the for loop on the string characters of the TextRenderer::draw(). Right now the text glyphs are then drawn in one draw call (and not one per character) at the end of the function.

THe step 2 plan is to keep on collecting all the glyphs from all the TextRenderer::Draw() issued during one frame and to draw all of them in a single drawcall. We decided to split the task in 2 so it's easier to review.
 2014-10-09 10:17:50 -07:00
ZappoMan
2004159778 implement basic support for planar overlay type intersections 2014-10-08 20:29:53 -07:00
Brad Hefta-Gaub
c9c3ab985a Merge pull request #3565 from PhilipRosedale/master 
Simplify camera class to have no interpolation, simpler structure
 2014-10-08 17:06:21 -07:00
Brad Hefta-Gaub
80e82c95ca Merge pull request #3560 from birarda/xbox-controller 
allow a call to Joysticks.reset to reset SDL while interface is running
 2014-10-08 17:06:12 -07:00
Philip Rosedale
01bef6be6d remove unused cameraPushback variable 2014-10-08 15:28:29 -07:00
Andrzej Kapolka
19ec68309b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-08 15:22:17 -07:00
Andrzej Kapolka
37eff685bc Remove the "render lower detail as points" option. It doesn't seem too 
promising.
 2014-10-08 15:11:55 -07:00
Andrzej Kapolka
b5b82ed387 Provide the option to display lower detail metavoxel data as points. 2014-10-08 14:05:14 -07:00
Stephen Birarda
ce505c1b0c add a missing HAVE_SDL wrap on setter in Joystick 2014-10-08 12:09:40 -07:00
Clément Brisset
e4f5f11429 Merge pull request #3557 from birarda/master 
fix for window modalities
 2014-10-08 11:53:48 -07:00
David Rowe
05915ae134 Make calibration message update its location more often 2014-10-08 11:53:07 -07:00
Andrzej Kapolka
049a00b85b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-08 11:51:10 -07:00
Stephen Birarda
8e2d41f37f remove deadzone handling from Joystick class 2014-10-08 11:41:07 -07:00
AndrewMeadows
4873528068 Merge pull request #3543 from birarda/domain-tunnel 
handle local socket changes when moving networks for auto networked domains
 2014-10-08 11:36:56 -07:00
Stephen Birarda
17b9f4a37d allow a call to Joysticks.reset to reset SDL while interface is running 2014-10-08 11:34:45 -07:00
Philip Rosedale
12349a8854 Fix rearview mirror camera 2014-10-08 10:59:46 -07:00
Philip Rosedale
00c182ad7b Fix full screen mirror keyboard controls 2014-10-08 10:51:06 -07:00
Philip Rosedale
2636fdd3cb Fix third person camera distance 2014-10-08 10:23:45 -07:00
Stephen Birarda
b0a99c48a7 don't force metavoxel editor to stay on top 2014-10-08 10:05:13 -07:00
Stephen Birarda
a8a8b81386 don't make long and address bar modal so they don't steal input 2014-10-08 10:00:50 -07:00
Philip Rosedale
c4c9f4820d First pass at simplifying camera, removes interpolation to target and setbacks 2014-10-08 10:00:47 -07:00
Stephen Birarda
3794e166ad change LoginDialog modality so it doesn't steal input 2014-10-08 09:51:16 -07:00
AndrewMeadows
c56923d316 Merge pull request #3549 from ZappoMan/editToolsImprovements 
add tick marks to planar ellipse/circle overlays
 2014-10-08 09:33:34 -07:00
Stephen Birarda
7773a94df7 resolve conflicts on merge with upstream master 2014-10-08 09:27:16 -07:00
Sam Gateau
dda7c6699e backup current work on TextRenderer 2014-10-07 23:52:00 -07:00
Philip Rosedale
f4b9ccbceb remove unused camera functions 2014-10-07 21:51:46 -07:00
Andrzej Kapolka
04b628bede Added option to display Hermite data 2014-10-07 16:44:55 -07:00
Stephen Birarda
6e81bde7bd make position path clearer for address bar 2014-10-07 15:30:44 -07:00
Stephen Birarda
ec6b6999a0 fix for location hash in address bar 2014-10-07 15:29:57 -07:00
Andrzej Kapolka
604fc84232 More fiddling with averages. 2014-10-07 14:33:01 -07:00
Stephen Birarda
ea4c5a8900 repairs for new user scoped paths 2014-10-07 14:18:05 -07:00
Andrzej Kapolka
c9fb73ecf8 Playing around with using points to represent distant voxel surfaces. 2014-10-06 18:52:10 -07:00
Andrzej Kapolka
9fc0abe2b3 Working on metavoxel averaging. Still pretty rough. 2014-10-06 17:30:28 -07:00
David Rowe
ebf615fc30 Fix header declaration 2014-10-06 17:25:40 -07:00
Philip Rosedale
63730a37da Bring initial walk speed down for easier maneuvering around people 2014-10-06 15:26:47 -07:00
Stephen Birarda
b4cfce8ffa final NetworkAccessManager return repairs 2014-10-06 14:58:23 -07:00
Stephen Birarda
a358b4e2af repair another reference to NetworkAccessManager 2014-10-06 14:57:54 -07:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Philip Rosedale
8084c5c77d Merge pull request #3552 from AndrewMeadows/inertia 
Tweak low velocity avatar keyboard control.
 2014-10-06 14:56:38 -07:00
Stephen Birarda
2d3f3edcad Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-06 14:31:39 -07:00
Andrew Meadows
6aba2359ed Tweak low velocity avatar keyboard control. 2014-10-06 14:27:43 -07:00
Leonardo Murillo
65b559ca3d Missed one 2014-10-06 15:21:51 -06:00
ZappoMan
12deec928c add tick marks to planar ellipse/circle overlays 2014-10-06 14:15:22 -07:00
Andrzej Kapolka
0d5f81c062 Merge pull request #3540 from samcake/temp0 
replacing glutSolidSPhere by a cached Geometry
 2014-10-06 12:23:44 -07:00
Sam Gateau
ba2d072a65 fix syntax issues for constant names and the CmakeLists.txt useless change 2014-10-06 12:15:36 -07:00
Sam Gateau
4f26c9e0fa fix formatting and syntax issues 2014-10-06 11:06:23 -07:00
Leonardo Murillo
0b7ff18970 Changes in non-Js code 2014-10-06 11:24:10 -06:00
Stephen Birarda
f89b225da2 handle local socket changes by monitoring every so often 2014-10-06 09:17:25 -07:00
AndrewMeadows
85a2d297d4 Merge pull request #3535 from stojce/20061 
CR for Job #20061 - Style our address bar / "go to" UI
 2014-10-06 07:57:00 -07:00
AndrewMeadows
a91d66d8bb Merge pull request #3533 from stojce/20091 
CR for Job #20091 - Windows : Popup to download update is unreadable on Windows (see attached screenshot)
 2014-10-06 07:53:44 -07:00
Andrew Meadows
01a3eaa26b added experimental MyAvatar.setSkeletonOffset() 
for improved walk animations
 2014-10-05 19:10:55 -07:00
David Rowe
32399d8620 Delete calibration message if exit VR display while calibrating 2014-10-04 20:07:37 -07:00
David Rowe
6992b41c5c Fix avatar rotation erroneously initiating HMD calibration 2014-10-04 19:53:00 -07:00
David Rowe
817da8ca05 Display a static billboard prompting user to hold still to calibrate HMD 2014-10-04 19:33:24 -07:00
David Rowe
614f5314f2 Add some property setters to the billboard overlay 2014-10-04 19:32:20 -07:00
David Rowe
fc24d96947 Make overlays accessible from C++ code 2014-10-04 19:31:52 -07:00
Sam Gateau
bd5c6517a5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
	interface/src/ui/overlays/Sphere3DOverlay.cpp
 2014-10-03 17:31:05 -07:00
Stephen Birarda
5203113b41 separate ICE ID and domain ID for reconnections to moved domains 2014-10-03 17:01:33 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
Stephen Birarda
e32de3208d Merge pull request #3538 from birarda/hydra-crash 
fix for path for hydras in installer release
 2014-10-03 15:34:25 -07:00
Stephen Birarda
2ce2c9e953 add a missing slash in path for release hydra support 2014-10-03 15:33:51 -07:00
Andrzej Kapolka
7c942e1010 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-03 13:53:11 -07:00
Andrzej Kapolka
78825f0c4d Fix for normalization crash. 2014-10-03 13:52:50 -07:00
David Rowe
0a4bc2bc48 Add VR display auto-calibration user message calculations 2014-10-03 13:47:11 -07:00
David Rowe
d3b37684cd Add VR display auto-calibration logic 2014-10-03 13:46:41 -07:00
Stephen Birarda
52ec949aac Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-03 11:26:23 -07:00
Stephen Birarda
ea0a1a4fb6 don't store domain hostname, leverage AddressManager only 2014-10-03 10:46:05 -07:00
Stephen Birarda
96aacab8ab load Address from settings to get back to domain and path 2014-10-03 10:42:15 -07:00
Stephen Birarda
f27105100a have AddressManager know its current domain and current path 2014-10-03 10:29:02 -07:00
Philip Rosedale
56c71b667b Merge pull request #3530 from ZappoMan/editToolsImprovements 
Experimental Version of new Entity Editing UI/UX
 2014-10-03 10:26:09 -07:00
ZappoMan
6846426f23 CR feedback 2014-10-03 10:13:56 -07:00
ZappoMan
cd6adb8f28 CR feedback 2014-10-03 10:13:09 -07:00
ZappoMan
f6b8a51074 CR feedback 2014-10-03 10:03:54 -07:00
ZappoMan
46d96c22fa CR feedback 2014-10-03 10:01:58 -07:00
ZappoMan
602404c569 CR feedback 2014-10-03 09:55:29 -07:00
ZappoMan
4ab0a8e13d CR feedback 2014-10-03 09:49:54 -07:00
ZappoMan
00799e39e1 CR feedback 2014-10-03 09:48:54 -07:00
ZappoMan
467e9b1831 CR feedback 2014-10-03 09:47:17 -07:00
ZappoMan
515789927b fix float defines from CR feedback 2014-10-03 09:43:46 -07:00
Philip Rosedale
84b2bc14c0 Merge pull request #3526 from ey6es/metavoxels 
Tweaks to the way dual contour edits are performed, added cuboid shape and made snapping to grid optional for boxes.
 2014-10-03 09:08:18 -07:00
stojce
a1d3e3289c close icon size fix 2014-10-03 14:51:29 +02:00
stojce
429ddd7115 address bar style fix 2014-10-03 14:30:03 +02:00
stojce
6d9091e35f Merge branch 'master' of https://github.com/highfidelity/hifi into 20091 2014-10-03 14:22:13 +02:00
stojce
420326b212 Layout changes 2014-10-03 14:21:05 +02:00
stojce
be5f348e22 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-10-03 14:03:13 +02:00
stojce
f2095dacbd more dialog fixes 2014-10-03 13:45:26 +02:00
ZappoMan
023916e7e5 Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements 2014-10-03 04:25:24 -07:00
ZappoMan
f59185c00b allow 3d overlays to be ignored from ray intersection 2014-10-03 03:02:54 -07:00
ZappoMan
175e5d5f79 add ray picking to 3D overlays 2014-10-02 20:44:49 -07:00
ZappoMan
a04941bcd5 removed some old debug 2014-10-02 17:56:31 -07:00
Andrzej Kapolka
c67f421ea9 Generate additional vertices with different normals when normals differ by 
"crease" angle.
 2014-10-02 17:25:44 -07:00
Ryan Huffman
5813e3098c Remove redundant code 2014-10-02 16:30:30 -07:00
Ryan Huffman
1976d1f1e2 Update runningScripts layout and add tip message 2014-10-02 16:27:02 -07:00
Ryan Huffman
fe8909ff0e Change reloadAllScripts shortcut 2014-10-02 16:26:32 -07:00
ZappoMan
d666f9ce98 Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements 
Conflicts:
	examples/editModels.js
 2014-10-02 15:17:59 -07:00
Stephen Birarda
8cb258e14c don't use just filename when searching in application framework 2014-10-02 14:35:54 -07:00
Stephen Birarda
262054d0eb handle ICE requirement in address manager response 2014-10-02 14:18:17 -07:00
Andrzej Kapolka
27099f6dcd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-02 13:03:00 -07:00
Andrzej Kapolka
4e19cc21f6 Remove the "box edit" in favor of using the spanner edit. 2014-10-02 13:01:39 -07:00
Andrzej Kapolka
bce0147776 Added aspect fields to cuboids. 2014-10-02 12:51:56 -07:00
Stephen Birarda
138e57bcd8 don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD 2014-10-02 11:16:25 -07:00
ZappoMan
5bcbfe96b8 add alpha color support to billboard overlay 2014-10-02 10:19:08 -07:00
ZappoMan
b2e725c964 add dashed line support to cube overlay 2014-10-02 10:18:42 -07:00
Stephen Birarda
172ee3d7dc add failsafe for hydra load, look in app frameworks folder 2014-10-02 09:06:29 -07:00
Andrzej Kapolka
42e95f2b38 Working on spanner metavoxel edits. 2014-10-01 18:46:23 -07:00
stojce
9c926d9e67 Layout changes 2014-10-02 00:17:57 +02:00
stojce
afc27b8a8b Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-10-01 23:36:30 +02:00
Andrzej Kapolka
1ca212f43d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-01 11:55:27 -07:00
ZappoMan
94c2540db0 add dashed line drawing to Base3DOverlay and 3d line and rectangle overlays 2014-10-01 09:45:20 -07:00
ZappoMan
7a9be9e5b9 implement support for localRenderAlpha property in the rendering portion of entities 2014-10-01 09:43:59 -07:00
Philip Rosedale
8f40780af0 Merge pull request #3517 from ctrlaltdavid/20048 
CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift
 2014-09-30 21:06:45 -07:00
Andrzej Kapolka
14267e3902 Layout tweak. 2014-09-30 15:42:33 -07:00
Andrzej Kapolka
add7ad4d4e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-30 15:21:27 -07:00
Andrzej Kapolka
5d2f6b98e2 Added erase buttons, initialize color editor on creation. 2014-09-30 15:20:24 -07:00
Andrzej Kapolka
70847ff3f9 Allow painting boxes that aren't grid-aligned; merged color and material 
tools.
 2014-09-30 14:53:19 -07:00
ZappoMan
c3b0700601 introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane 2014-09-30 14:52:44 -07:00
Thijs Wenker
fd21d100f6 line indention fixes 2014-09-30 22:37:29 +02:00
Thijs Wenker
bacad6bcd2 Merge branch 'editmodels_js-model-list' of https://github.com/thoys/hifi 2014-09-30 22:33:50 +02:00
Thijs Wenker
110e26a9e9 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-30 22:32:35 +02:00
Thijs Wenker
7f34079d8f cleared comment 2014-09-30 22:31:41 +02:00
Philip Rosedale
e624058c14 Merge pull request #3514 from birarda/hydra-crash 
fix for debug build without sixense library
 2014-09-30 13:24:17 -07:00
Thijs Wenker
eed6e2e8f6 - Edit -> Model List menu option 
- Combo items can be JS objects now, write a toString() function for each JS object to describe them
 2014-09-30 22:11:21 +02:00
Andrzej Kapolka
001af5f982 Simplify the message situation by removing color-only edits. 2014-09-30 12:17:35 -07:00
Andrzej Kapolka
e01113d2a7 Simplifications suggested by Andrew. 2014-09-30 12:01:44 -07:00
Stephen Birarda
39ee62608b ensure HAVE_SIXENSE is defined to define _sixenseLibrary 2014-09-30 11:35:53 -07:00
ZappoMan
7fc6eecca7 added support for dashed lines for 3D Circle overlays 2014-09-30 11:27:16 -07:00
ZappoMan
16cdc2614f added circle overlays 2014-09-30 10:06:39 -07:00
David Rowe
673afca11b Update camera object's position and orientation with actual Rift values 2014-09-30 10:05:59 -07:00
Andrzej Kapolka
3c1f3b77a7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-29 19:14:47 -07:00
Andrzej Kapolka
802b14d5ab Use Jacobi eigenvalue algorithm to get eigenvalues/eigenvectors. 2014-09-29 19:14:17 -07:00
Stephen Birarda
e512b05e62 add extra debug for hydra library initialization 2014-09-29 17:28:50 -07:00
Stephen Birarda
f047c2dff0 have OS X hydra support be disabled by default 2014-09-29 17:08:06 -07:00
ZappoMan
bffd236640 add glowLevel, and pulse to all overlays 2014-09-29 16:44:40 -07:00
Stephen Birarda
2fbd249d9f fix reset password link for LoginDialog 2014-09-29 16:38:10 -07:00
Stephen Birarda
3c236cc60a resolve conflicts on merge with upstream master 2014-09-29 16:00:50 -07:00
David Rowe
1bffaa262d Reference camera object rather than copy it 2014-09-29 15:46:22 -07:00
AndrewMeadows
c8882d68dd Merge pull request #3503 from birarda/domain-wizard 
lock changes to settings in the domain-server master config file
 2014-09-29 15:41:29 -07:00
Andrzej Kapolka
4c617c6d55 Stop using the emissive color for glow. 2014-09-29 14:51:45 -07:00
Andrzej Kapolka
72ff908bd3 Fix for metavoxel crashes on Windows. I was expecting the scope of a 
temporary object to last until the next line; turns out VC++ can destroy
it in the middle of evaluating the line.
 2014-09-29 14:37:11 -07:00
Stephen Birarda
a847c2d80d move url handling to after settings load debug 2014-09-29 13:15:28 -07:00
Stephen Birarda
3fbf141686 handle avatar location changes after avatar position has been reloaded 2014-09-29 13:14:25 -07:00
Stephen Birarda
1f4c0b6340 wrap sixenseExit call in HAVE_SIXENSE ifdef 2014-09-29 13:09:25 -07:00
Stephen Birarda
db0bfd53ae make the sixense library name a constant 2014-09-29 12:58:40 -07:00
Stephen Birarda
f7a17b7dec dynamically load sixense lib on OS X to make avoiding hid_init crash easier 2014-09-29 12:58:01 -07:00
Andrzej Kapolka
9855fbcfb4 Don't bother using a callback to render the eye vectors; just rely on the 
post-lighting call to Avatar::render, like everything else.  This should fix
the crash that Philip was seeing (presumably due to avatars' being deleted
during the draw process).
 2014-09-29 11:45:12 -07:00
Stephen Birarda
eb7ee36168 use two dashes for url as command line option 2014-09-29 10:29:40 -07:00
stojce
2486a24c90 possible fix for Windows login and address-bar modal dialog 2014-09-29 18:26:25 +02:00
David Rowe
6375e42d88 Configure Leap controller per HMD option when controller is created 2014-09-28 17:19:14 -07:00
David Rowe
5c406a0e06 Add "Leap Motion on HMD" developer menu option 2014-09-28 17:18:46 -07:00
Brad Hefta-Gaub
a701bcea7b Merge pull request #3502 from ctrlaltdavid/20055 
Make default eye model calculation be reliable
 2014-09-28 12:06:03 -07:00
Clément Brisset
6d3bdd862b Merge pull request #3501 from ey6es/metavoxels 
Use the rather elaborate technique described in the Rice papers to find the minimizing point for each cell.
 2014-09-27 19:52:42 -07:00
David Rowe
dbf6daf80c Fix default eye model calculation to be reliable 2014-09-27 11:25:37 -07:00
Andrzej Kapolka
681bb60d03 Could extra comments. 2014-09-26 20:24:24 -07:00
Andrzej Kapolka
1cbbcdaedc Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-26 20:11:47 -07:00
Atlante45
7d78584aee Fix chat shortcut 2014-09-26 20:11:14 -07:00
Andrzej Kapolka
8ebb2a7fb4 Ridiculously complicated minimization code. 2014-09-26 19:32:41 -07:00
Philip Rosedale
9b228c9e37 Merge pull request #3497 from ZappoMan/entityPropsRescale 
add rescale support to entity properties UI
 2014-09-26 16:42:15 -07:00
ZappoMan
cbc502553b add rescale support to entity properties UI 2014-09-26 16:25:24 -07:00
Stephen Birarda
bd73c950ac cleanup for eyePosition ifdef HAVE_LIBOVR 2014-09-26 15:44:10 -07:00
Stephen Birarda
7c738edbd8 Merge pull request #3488 from PhilipRosedale/master 
Correct eye contact for Oculus users
 2014-09-26 15:42:03 -07:00
Stephen Birarda
3cbfad69cd fix indentation issues for merged AddressBarDialog classes 2014-09-26 14:32:59 -07:00
Stephen Birarda
5b2b0c47c0 Merge pull request #3483 from stojce/20061 
Code Review for Job #20061
 2014-09-26 14:24:44 -07:00
AndrewMeadows
7f7861671e Merge pull request #3471 from ctrlaltdavid/20055 
Code Review for Job #20055
 2014-09-26 14:00:33 -07:00
Andrzej Kapolka
aa0b3a18ef Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-26 13:53:23 -07:00
Andrzej Kapolka
efa22d931f If we're rendering the billboard, don't render the body. 2014-09-26 13:48:11 -07:00
Andrzej Kapolka
3fe6e30632 Working on QR decomposition. 2014-09-26 13:43:28 -07:00
David Rowe
c0419c61f4 Fix missing constructor initialization 2014-09-26 09:15:17 -07:00
David Rowe
aa9511c263 Position Rift camera at avatar model's mid-eye location 2014-09-25 22:49:12 -07:00
Philip Rosedale
597871442e fix linux build fail 2014-09-25 17:39:53 -07:00
Philip Rosedale
3fd1ab40e4 remove magic number 2014-09-25 16:17:05 -07:00
Philip Rosedale
1d4b86d85b Blink first with one eye and at slightly different speeds, look back and forth exactly at eyes when receiving gaze in Oculus 2014-09-25 16:00:56 -07:00
stojce
5610cfeb34 CR fixes 2014-09-26 00:57:56 +02:00
stojce
6a3bc8f255 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-25 23:57:19 +02:00
Philip Rosedale
693bc11868 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-25 11:59:14 -07:00
Philip Rosedale
7836fd8a85 Add world space eye locations (for making eye contact) to the oculus manager 2014-09-25 11:58:41 -07:00
AndrewMeadows
697c7f6a61 Merge pull request #3481 from ZappoMan/collidingEntities 
First cut at colliding entities
 2014-09-25 09:38:50 -07:00
Brad Hefta-Gaub
84630a8f74 Merge pull request #3484 from huffman/20024 
Code Review for Job #20024
 2014-09-25 09:33:58 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub
712f88baa3 Merge pull request #3476 from birarda/xbox-controller 
add script support for general SDL controllers
 2014-09-25 09:25:08 -07:00
Philip Rosedale
fcc5eb9d0a Tuning of audio-driven mouths and brows to look better and not stay open 2014-09-24 16:37:55 -07:00
ZappoMan
6b8c9bba42 improved debug in entity renderer 2014-09-24 16:05:04 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00
Philip Rosedale
75e536235c Avatars look at your camera, not your avatar. Improvements to lookAt code 2014-09-24 14:38:44 -07:00
stojce
039deb8b42 added go button active state icon 2014-09-24 23:26:34 +02:00
Stephen Birarda
3ab24d6ea5 add a missing HAVE_SDL block 2014-09-24 11:59:44 -07:00
Stephen Birarda
875c1dba72 change name in header comment to match new class name 2014-09-24 08:40:39 -07:00
stojce
92cb17cbbe Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 
Conflicts:
	interface/src/Menu.h
 2014-09-24 09:25:04 +02:00
Stephen Birarda
9348888ae5 map PrioVR to new JoystickScriptingInterface 2014-09-23 17:42:48 -07:00
Stephen Birarda
13d3eb02e3 report the 360 axis values in xbox.js 2014-09-23 17:19:57 -07:00
Stephen Birarda
d50c81e4a1 add a property for number of buttons in Joystick 2014-09-23 17:10:25 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
stojce
8031454f61 use backslash to activate chat 2014-09-24 00:22:51 +02:00
stojce
c14bf84af8 layout fix 2014-09-24 00:14:00 +02:00
Stephen Birarda
900daf48eb initial working connection of an xbox gamepad 2014-09-23 14:48:44 -07:00
Ryan Huffman
1ee01fdab3 Merge branch 'master' of github.com:highfidelity/hifi into 20024 2014-09-23 14:10:00 -07:00
Philip Rosedale
729d3cf9bc Merge branch 'master' of https://github.com/worklist/hifi 2014-09-23 12:50:52 -07:00
Philip Rosedale
21a15cff2a Avatar can look at corrected position when looking at me 2014-09-23 12:50:47 -07:00
Brad Hefta-Gaub
b7245f8259 Merge pull request #3469 from ctrlaltdavid/20054 
Code Review for Job #20054
 2014-09-23 09:57:31 -07:00
Stephen Birarda
7bae88e996 fix for calls to glm sqrt with ints 2014-09-23 08:52:22 -07:00
stojce
5a7b7cca44 Add finish lookup event 2014-09-23 11:32:16 +02:00
Stephen Birarda
1007f528f0 Merge branch 'master' of https://github.com/highfidelity/hifi into move-locations 2014-09-22 17:42:59 -07:00
Stephen Birarda
5be045d612 remove LocationManager and NamedLocation, replace with DataWebDialog 2014-09-22 16:55:44 -07:00
Stephen Birarda
eb0f7da517 cleanup to snapshot class to reduce passing of variables 2014-09-22 16:14:06 -07:00
Andrzej Kapolka
18cb15ee7d Warning fixes. 2014-09-22 15:31:46 -07:00
David Rowe
f95e20153c Fix upright head model position calculation for avatar scale changes 2014-09-22 15:13:08 -07:00
Andrzej Kapolka
e6b0dc592b Don't save the billboard. 2014-09-22 15:03:25 -07:00
Andrzej Kapolka
aeb424cd71 Fix for billboards. 2014-09-22 15:01:39 -07:00
Stephen Birarda
e5a54116dc correctly return empty string for domain ID if it is null 2014-09-22 15:00:07 -07:00
Stephen Birarda
523a4e6ba2 allow moving of location from DataWebDialog for locations 2014-09-22 11:58:23 -07:00
stojce
cc83c2b2e0 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-22 20:52:17 +02:00
stojce
466dbdcee5 added address bar dialog 2014-09-22 20:51:19 +02:00
AndrewMeadows
a0b458fd1d Merge pull request #3465 from chansensturm/audio-noise 
New Audio Edit Buffer Object / Click Removal /  ....
 2014-09-22 11:38:42 -07:00