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

2601 commits

Author SHA1 Message Date
Stephen Birarda
6626787ae5 have mouse press/release fire HFActionEvent 2014-10-27 11:40:33 -07:00
Pete
8d97a20bd9 Worklist #20074 
- Add new Preferences item for Oculus Max FPS, defaults to 75, range is
[30, 95]
- Load and save this value appropriately
- When VR mode is enabled/disabled, set the Render Target Framerate to
this value/unlimited
 2014-10-26 21:14:20 -07:00
Stojce
61c80183ad fix for mirror size on different scale resloutions 2014-10-26 08:12:07 +01:00
David Rowe
c6463abfb8 Prevent keys captured by script from being used as menu shortcuts 2014-10-25 09:22:30 -07:00
David Rowe
5f91f583e8 Merge branch 'master' into 19976 
Conflicts:
	interface/CMakeLists.txt
 2014-10-24 20:34:45 -07:00
David Rowe
f373719f02 Don't include speech recognition if building with Visual Studio Express 2014-10-24 20:12:23 -07:00
Philip Rosedale
2dff75dac1 Merge pull request #3665 from stojce/20143 
CR for Job #20143 - BUG:  Rearview mirror rendering at wrong size
 2014-10-24 19:45:26 -07:00
Sam Gateau
80a87b3b44 framerate is as fast as the display can go 2014-10-24 17:50:31 -07:00
David Rowe
38524b3349 Merge branch 'master' into 19976 2014-10-24 15:43:55 -07:00
Sam Gateau
9f6454f570 Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2014-10-23 15:20:20 -07:00
Sam Gateau
ac269e16c0 start working on the target framerate control 2014-10-23 13:19:34 -07:00
stojce
4e75837a64 Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-23 14:26:13 +02:00
Clément Brisset
bf9d467328 Merge pull request #3638 from huffman/entity-tools-updates 
Entity tool fixes
 2014-10-22 17:40:21 -07:00
Stephen Birarda
7b0f1477a1 expose AvatarList to Interface SE, add avatarWithDisplayName method 2014-10-22 15:28:04 -07:00
Ryan Huffman
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -07:00
stojce
a3707a09ae fix mirror ratio on retina 2014-10-22 09:42:55 +02:00
David Rowe
524c413681 Enable SpeechRecognizer menu item and JavaScript object for Windows 2014-10-20 13:52:37 -07:00
Andrzej Kapolka
e98b99fe84 Merge pull request #3622 from birarda/domain-tunnel 
work around double login issue by generating keypair on each launch
 2014-10-17 18:05:45 -07:00
Stephen Birarda
5ecdb58e20 generate a new keypair on every interface launch 2014-10-17 16:55:50 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
AndrewMeadows
4fbc589606 Merge pull request #3598 from birarda/domain-tunnel 
initial pass at using keypairs for username verification for basic domain-server ACL
 2014-10-16 10:49:03 -07:00
Stephen Birarda
fcd73858b8 remove Faceplus as a face tracker option 2014-10-15 15:13:52 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Stephen Birarda
69402e275c use DER format for generated keys in RSAKeypairGenerator 2014-10-14 11:51:58 -07:00
Stephen Birarda
d0f91c5c2e remove old mechanism for octree payments 2014-10-14 11:38:50 -07:00
Stephen Birarda
912512936e add RSAKeypairGenerator to generate a 2048-bit keypair 2014-10-14 11:36:40 -07:00
Stephen Birarda
cca8b68d2e update location and profile paths for new format 2014-10-14 10:40:58 -07:00
Stephen Birarda
20f97792bf Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-14 09:26:11 -07:00
Sam Gateau
153d3b532b merged with upstream, all clear 2014-10-14 00:19:19 -07:00
Sam Gateau
113fb1908a fix the first issues 2014-10-13 23:28:43 -07:00
samcake
700ec5cf79 Rendering resolution can be different than the native window resolution 
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
  Get rid of the ui to change the mode

- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt

- In the paintGL, in the default rendering path:
  the rendering Framebuffers are resized to the window.size * renderResolutionScale.
  The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
  at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport

- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
 2014-10-13 18:00:50 -07:00
ZappoMan
c7d544cd58 wire up collision signals 2014-10-13 14:36:06 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
David Rowe
958acfcfe0 Fix version logging include to include build number and write in log 2014-10-13 13:23:31 -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
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -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
Stephen Birarda
31df339565 pipe username signature requirement through to DomainHandler 2014-10-09 16:53:22 -07:00
Philip Rosedale
2da4345b21 First person and mirror HMD view almost fixed 2014-10-09 13:32:35 -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
Philip Rosedale
cdd60dead2 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-08 15:28:56 -07:00
Philip Rosedale
01bef6be6d remove unused cameraPushback variable 2014-10-08 15:28:29 -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
Philip Rosedale
c4c9f4820d First pass at simplifying camera, removes interpolation to target and setbacks 2014-10-08 10:00:47 -07:00
Philip Rosedale
f4b9ccbceb remove unused camera functions 2014-10-07 21:51:46 -07:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Sam Gateau
4f26c9e0fa fix formatting and syntax issues 2014-10-06 11:06:23 -07:00
David Rowe
32399d8620 Delete calibration message if exit VR display while calibrating 2014-10-04 20:07:37 -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
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
ZappoMan
175e5d5f79 add ray picking to 3D overlays 2014-10-02 20:44:49 -07:00
Stephen Birarda
262054d0eb handle ICE requirement in address manager response 2014-10-02 14:18:17 -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
David Rowe
673afca11b Update camera object's position and orientation with actual Rift values 2014-09-30 10:05:59 -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
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
f7a17b7dec dynamically load sixense lib on OS X to make avoiding hid_init crash easier 2014-09-29 12:58:01 -07:00
Stephen Birarda
eb7ee36168 use two dashes for url as command line option 2014-09-29 10:29:40 -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
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
David Rowe
aa9511c263 Position Rift camera at avatar model's mid-eye location 2014-09-25 22:49:12 -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
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
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
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
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
13d3eb02e3 report the 360 axis values in xbox.js 2014-09-23 17:19:57 -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
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
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
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
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
David Rowe
a11bf7f15b Decouple Rift head tracking from avatar's head position 
This makes the Rift's view reflect the user's physical movements exactly
while the avatar follows the movements as best it can.
 2014-09-22 11:02:12 -07:00
Andrzej Kapolka
8d3eef708a Move various avatar render bits to post-lighting section. 2014-09-19 13:13:05 -07:00
Andrzej Kapolka
08fda3bbef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-19 10:30:40 -07:00
Andrzej Kapolka
c6aad42f21 Move LocalLight to AvatarManager, apply it at the avatar level. 2014-09-18 17:09:53 -07:00
Andrzej Kapolka
c54e1c937c Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/src/avatar/Head.cpp
 2014-09-18 13:08:55 -07:00
David Rowe
ff8ea46e26 Hide menu bar when fullscreen in Rift VR display mode 2014-09-18 11:34:48 -07:00
Stephen Birarda
533a60c35e make sure OAuthWebViewHandler is ready before the NodeList is 2014-09-18 10:34:17 -07:00
Philip Rosedale
929e463e40 Merge pull request #3447 from birarda/webkit-dialogs 
add a DataWebDialog class to display auth'ed pages from data-web
 2014-09-18 09:48:22 -07:00
Stephen Birarda
d860b8e8db remove test DataWebDialog from Application 2014-09-18 09:22:14 -07:00
Stephen Birarda
e2c3b626b3 add a DataWebDialog for authenticated access to data-web html 2014-09-18 09:05:25 -07:00
Andrew Meadows
8359e672bb merge upstream/master into andrew/ragdoll 2014-09-17 17:56:35 -07:00
Stephen Birarda
7848c63fae handle name location shortcut explicitly to work around bug 2014-09-17 14:43:48 -07:00
Andrew Meadows
489871d0d6 added MyAvatar.setMotorVelocity() & friends for JS 2014-09-16 17:09:32 -07:00
Andrzej Kapolka
bfaac9eae1 Deferred lighting tweaks. 2014-09-15 18:38:10 -07:00
Andrzej Kapolka
580d591dc4 Working on getting glow to work with deferred lighting. 2014-09-15 17:11:36 -07:00
Andrzej Kapolka
0f3a020b5d Working on getting particles/entities to work with deferred lighting; 
normalize normals from buffer.
 2014-09-15 16:07:48 -07:00
Andrzej Kapolka
467a9582c7 Somehow my reverting the ambient occlusion effect didn't take. 2014-09-15 13:29:03 -07:00
Andrzej Kapolka
4475759461 Revert the normal-based ambient occlusion; I wasn't crazy about the look of 
it.  Will perhaps revisit later.
 2014-09-15 11:52:44 -07:00
Andrzej Kapolka
af546e6b05 Fix for shadows in rear view mirror. 2014-09-12 19:18:31 -07:00
Andrzej Kapolka
e36ff0d238 Fix deferred lighting for rear view mirror. 2014-09-12 18:56:07 -07:00
Andrzej Kapolka
53933fc9c6 Working on deferred lighting for models. 2014-09-12 17:09:07 -07:00
Andrzej Kapolka
3d48a5b872 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-12 15:39:52 -07:00
Brad Hefta-Gaub
e69e90b5b4 Merge pull request #3405 from thoys/20017 
Code Review for Job #20017
 2014-09-12 15:34:50 -07:00
Stephen Birarda
3b21348a63 make sure AddressManager signal is connected to before file event 2014-09-12 15:22:51 -07:00
Stephen Birarda
29dae39ad7 handle location lookup for offline user or not found 2014-09-12 15:01:08 -07:00
Andrzej Kapolka
d0f30dfd45 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-12 14:44:45 -07:00
Thijs Wenker
df0cbd54fc Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 
Conflicts:
	interface/src/Application.cpp
 2014-09-12 23:04:05 +02:00
Brad Hefta-Gaub
b209b70094 Merge pull request #3404 from birarda/data-web-domain-lookup 
initial transition to new metaverse API
 2014-09-12 13:45:40 -07:00
Brad Hefta-Gaub
fc33de28a0 Merge pull request #3399 from huffman/19831 
Code Review for Job #19831
 2014-09-12 13:45:20 -07:00
Stephen Birarda
f0ead98a2a put back LocationScriptingInterface so it works prior to replacement 2014-09-12 13:28:18 -07:00
Thijs Wenker
dd47b7afc6 Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
 2014-09-12 22:04:21 +02:00
Stephen Birarda
348bcdb37a resolve conflicts on merge with upstream master 2014-09-12 11:23:16 -07:00
Stephen Birarda
93ff34baaa force address bar lookup through handleLookupString 2014-09-12 11:21:38 -07:00
Stephen Birarda
ab7df8679d fix broken hifi linking 2014-09-12 11:19:22 -07:00
Stephen Birarda
b77a3f4904 cleanup application file event handler 2014-09-12 10:15:51 -07:00
Stephen Birarda
1f2020d169 some url handling repairs, move existing error reply handlers to new format 2014-09-12 10:13:33 -07:00
Stephen Birarda
7896119228 remap two goToUrl calls to AddressManager 2014-09-12 09:56:40 -07:00
Andrzej Kapolka
76728e4fb1 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-11 18:07:33 -07:00
Andrzej Kapolka
e6f37544fd Use deferred lighting for voxels as well as metavoxels. 2014-09-11 18:06:56 -07:00
Philip Rosedale
8428b1a4ba Merge pull request #3401 from chansensturm/audio-noise 
New stereo audio panning object
 2014-09-11 17:53:55 -07:00
Craig Hansen-Sturm
ecae9d5e85 compiler warnings 2014-09-11 17:20:15 -07:00
Stephen Birarda
b56ea5c936 centralize path creation from position and orientation to AddressManager 2014-09-11 17:17:47 -07:00
Andrzej Kapolka
c2b58c9781 Move deferred lighting into its own class. 2014-09-11 16:39:17 -07:00
Stephen Birarda
de24842cf0 fix stuck drive keys for Avatar when modifier released 2014-09-11 11:48:26 -07:00
Ryan Huffman
4315d63fb5 Merge branch 'master' of github.com:highfidelity/hifi into 19831 2014-09-11 11:13:13 -07:00
Stephen Birarda
aaabe6b1e1 handle domain changes via address bar 2014-09-11 10:45:45 -07:00
Stephen Birarda
dd1b23044f hook meta+enter up to address bar display 2014-09-11 10:24:04 -07:00
Stephen Birarda
71f2c0b542 initial addition of the AddressManager with location switch hooked up 2014-09-11 10:14:00 -07:00
Andrzej Kapolka
fe249ef348 Make sure the frustum that we use for culling contains the current camera 
information.
 2014-09-10 15:51:10 -07:00
Andrzej Kapolka
423e6d0594 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-10 13:51:46 -07:00
Andrzej Kapolka
2cba7b37bf Attempting to fix 3DTV/Oculus deferred lighting/ambient occlusion. 2014-09-10 13:51:14 -07:00
wangyix
7a2897fb6b fixes/patches for win32/vs2013 startup and shutdown 2014-09-10 12:24:59 -07:00
Thijs Wenker
cb907c1891 GlobalServicesScriptingInterface added, functions and properties functional 2014-09-10 13:57:38 +02:00
Andrzej Kapolka
a9eb35448a Comment fix. 2014-09-08 15:39:20 -07:00