Stephen Birarda
22b599b8cc
repair for persisting of Account to file after keypair generation
2014-10-14 14:21:18 -07:00
Atlante45
b227014510
Stupid mistake
2014-10-14 14:14:59 -07:00
Stephen Birarda
bac6961235
fix node auth url to be HTTPS
2014-10-14 14:01:41 -07:00
Stephen Birarda
f8c89d0790
upload the generated public key to data-web, add getter for private key
2014-10-14 13:51:41 -07:00
Ryan Huffman
a05e2ea168
Add entityCameraTools.js
2014-10-14 13:15:28 -07:00
Ryan Huffman
c332d94ae3
Add handle size based on distance in edit tools
2014-10-14 13:04:15 -07:00
Atlante45
2edc2eed6d
Changed arrows style
2014-10-14 12:31:17 -07:00
Atlante45
02b4b220b9
Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones
2014-10-14 12:16:20 -07:00
Atlante45
edea8da18f
Move array rows
2014-10-14 12:13:34 -07:00
Stephen Birarda
7ce806b746
fire off generation of key-pair in conjunction with login, store private key
2014-10-14 12:12:32 -07:00
Andrzej Kapolka
ff368f9848
Merge pull request #3592 from samcake/temp0
...
Rendering resolution can be different than the native window resolution
2014-10-14 11:56:50 -07:00
Stephen Birarda
e10475f2e2
Merge pull request #3594 from birarda/master
...
fix the security link in domain-server page
2014-10-14 11:54:20 -07:00
Stephen Birarda
7e116346cb
fix the security link in domain-server page
2014-10-14 11:53:07 -07:00
Stephen Birarda
5c465198c5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-10-14 11:52:06 -07:00
Stephen Birarda
69402e275c
use DER format for generated keys in RSAKeypairGenerator
2014-10-14 11:51:58 -07:00
Stephen Birarda
5f67194564
fix member variable order in Joystick class
2014-10-14 11:39:28 -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
David Rowe
a619d0460d
Show chat alerts in icon tray only if not already seen
2014-10-14 11:08:24 -07:00
David Rowe
5151563b79
Coding standard
2014-10-14 11:08:02 -07:00
Stephen Birarda
14d4dd1f4b
add a private key string to DataServerAccountInfo
2014-10-14 10:43:13 -07:00
Stephen Birarda
cca8b68d2e
update location and profile paths for new format
2014-10-14 10:40:58 -07:00
AndrewMeadows
2a35c4af4d
Merge pull request #3593 from huffman/20024
...
CR for Job #20024 - UI edits to Running Scripts dialog
2014-10-14 09:52:13 -07:00
AndrewMeadows
240280b9ac
Merge pull request #3591 from ey6es/metavoxels
...
Basic metavoxel scripting commands.
2014-10-14 09:47:24 -07:00
AndrewMeadows
3483497fab
Merge pull request #3575 from Atlante45/attenuation_zones
...
Audio zones and attenuation coefficients
2014-10-14 09:39:06 -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
samcake
e7af0cbe7f
Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application
2014-10-14 00:08:29 -07:00
Sam Gateau
113fb1908a
fix the first issues
2014-10-13 23:28:43 -07:00
Ryan Huffman
f178de3b2e
Merge branch 'master' of github.com:highfidelity/hifi into entity-tools
2014-10-13 21:25:47 -07:00
Atlante45
2c444338aa
Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones
2014-10-13 21:10:08 -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
Andrzej Kapolka
00490af837
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-13 17:59:35 -07:00
Clément Brisset
87d067c8f0
Merge pull request #3590 from ctrlaltdavid/extra-logging
...
Minor logging improvements
2014-10-13 16:20:43 -07:00
Clément Brisset
200c0e080e
Merge pull request #3589 from ZappoMan/editToolsImprovements
...
highlight grabber handles on hover
2014-10-13 16:19:57 -07:00
Clément Brisset
f6f187e7f0
Merge pull request #3587 from ctrlaltdavid/20101
...
CR for Job #20101 - Upload model file function is broken
2014-10-13 16:16:49 -07:00
Clément Brisset
9d050782cc
Merge pull request #3586 from ctrlaltdavid/20093
...
CR for Job #20093 - Add a menu item corresponding to the apostrophe key (reset sensors)
2014-10-13 16:14:04 -07:00
Andrzej Kapolka
fcbdf04c19
Apply alpha restrictions when we apply the edit.
2014-10-13 16:01:38 -07:00
Andrzej Kapolka
84022fd19d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-13 15:35:07 -07:00
Andrzej Kapolka
13efaba22c
Basic metavoxels example.
2014-10-13 15:34:38 -07:00
Andrzej Kapolka
60576bdcbd
Basic metavoxel scripting bits.
2014-10-13 15:05:16 -07:00
ZappoMan
d886f4c81a
removing particles
2014-10-13 14:47:48 -07:00
ZappoMan
02aa4bb4b6
removing particles
2014-10-13 14:45:50 -07:00
Stephen Birarda
05e8726491
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-10-13 14:41:50 -07:00
ZappoMan
2a281298f0
fix grenades
2014-10-13 14:36:17 -07:00
ZappoMan
c7d544cd58
wire up collision signals
2014-10-13 14:36:06 -07:00
ZappoMan
bb0479b466
removing particles from scripts
2014-10-13 14:19:57 -07:00
ZappoMan
fe759859e7
removing particles
2014-10-13 14:11:20 -07:00
ZappoMan
c36bcf2d7e
removing particles
2014-10-13 14:11:11 -07:00
ZappoMan
4c85e9f581
removing particles
2014-10-13 14:10:57 -07:00
