David Rowe
38524b3349
Merge branch 'master' into 19976
2014-10-24 15:43:55 -07: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
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
