David Rowe
fd467caf86
Add "Open Folder" button to file browser dialog
2016-05-30 14:19:25 +12:00
Brad Hefta-Gaub
b3a43c40a9
remove audio test file
2016-05-29 14:16:30 -07:00
Brad Hefta-Gaub
2ed95542a9
use sound file from S3
2016-05-29 13:56:09 -07:00
Brad Hefta-Gaub
1fb8f659a7
add test content
2016-05-29 13:33:24 -07:00
Brad Hefta-Gaub
f65f99a3e0
fix warning
2016-05-29 12:34:57 -07:00
Brad Hefta-Gaub
7fd531541c
simplify
2016-05-29 12:08:10 -07:00
Brad Hefta-Gaub
1e7cd06d0e
add audio peak limiter to audio mixer
2016-05-28 20:34:27 -07:00
samcake
3fe9b67e45
FIxing the reflection jittering by moving the normal into world space
2016-05-27 19:24:56 -07:00
Brad Hefta-Gaub
cb3dfa0457
Merge pull request #7983 from ZappoMan/fixShapes
...
fix shapes to property polymorph and persist
2016-05-27 17:56:25 -07:00
Brad Hefta-Gaub
0ec7eae58c
fix shapes to property polymorph and persist
2016-05-27 16:59:42 -07:00
Zach Pomerantz
b280eebd03
Only count users against max capacity
2016-05-27 15:51:41 -07:00
Brad Davis
ac5912df01
Fix crash on shutdown of SteamVR
2016-05-27 13:40:47 -07:00
Brad Hefta-Gaub
76940bad34
Merge pull request #7897 from howard-stearns/reset-hud-on-driving
...
reset hud on driving
2016-05-27 10:40:12 -07:00
Howard Stearns
5b6660e7ea
Default preference to false.
2016-05-27 10:35:46 -07:00
Howard Stearns
e4d36cc2c2
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-27 10:32:01 -07:00
Howard Stearns
abd2b150f5
Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving
2016-05-27 10:31:42 -07:00
Chris Collins
3e79b67612
Merge pull request #7977 from hyperlogic/bug-fix/avatar-lod
...
Bugfix for avatar LOD
2016-05-27 10:15:26 -07:00
Andrew Meadows
1132b4666a
Merge pull request #7975 from jherico/shared_shapes
...
Moving shape definition to a shared location
2016-05-27 07:28:11 -07:00
Chris Collins
8ad572a269
Merge pull request #7976 from birarda/session-id-with-place-request
...
send session ID in AccountManager without curly braces
2016-05-26 15:59:18 -07:00
Brad Davis
6a962d7aab
Unix build fix
2016-05-26 15:51:36 -07:00
Stephen Birarda
1ec421350d
send the UUID session ID without curly braces
2016-05-26 14:56:51 -07:00
Anthony J. Thibault
b4d14f06d8
Bugfix for avatar LOD
...
If an avatar was LOD'ed out, it would never become visible again, because the bounds of the skeleton model were never again.
This ensures that the model bound is updated, even when the avatar is LOD'ed away.
2016-05-26 14:35:17 -07:00
howard-stearns
9ff1a695f0
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-26 13:52:23 -07:00
Chris Collins
4120ed9f0b
Merge pull request #7964 from ZappoMan/protocolVersionCheck
...
check for all protocols matching when connecting to a domain
2016-05-26 13:02:18 -07:00
Brad Davis
2c02c963d4
Moving shape definition to a shared location
2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub
88813c47f0
Merge pull request #7960 from howard-stearns/fix-hand-controllers-after-input-changes
...
Fix hand controller pointer after input changes.
2016-05-26 12:16:23 -07:00
Brad Hefta-Gaub
8ec425106a
Merge pull request #7968 from birarda/audio-is-playing
...
fix collision of isPlaying property and slot for AudioInjectors
2016-05-26 12:06:00 -07:00
howard-stearns
991da9e248
fix cut-paste error in settings.
2016-05-26 09:51:55 -07:00
Andrew Meadows
402b7f2282
address review feedback
2016-05-25 20:53:43 -07:00
Howard Stearns
029c76f489
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-25 20:40:03 -07:00
Andrew Meadows
2efec2a878
fix warning on windows about 64 to 32 bit cast
2016-05-25 19:31:21 -07:00
Andrew Meadows
e8e059c637
better variable names and fewer magic numbers
2016-05-25 19:31:21 -07:00
Andrew Meadows
21ef30d410
fix warning on windows build
2016-05-25 19:31:21 -07:00
Andrew Meadows
7ee4dea4ca
remove magic number
2016-05-25 19:31:21 -07:00
Andrew Meadows
78357057b6
return non-zero on error, add verbose option
2016-05-25 19:31:21 -07:00
Andrew Meadows
7d7c991447
connect progress callback
2016-05-25 19:31:21 -07:00
Andrew Meadows
0647f5b2d0
attempt to close open mesh parts
2016-05-25 19:31:21 -07:00
Andrew Meadows
f8e2cf8064
cleanup vhacd-util logging and variable names
2016-05-25 19:31:21 -07:00
Howard Stearns
8e6853bec6
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-hand-controllers-after-input-changes
2016-05-25 18:54:29 -07:00
Brad Hefta-Gaub
485c8aceac
Merge pull request #7942 from sethalves/fix-edit-js-restart
...
fix a race that keeps some scripts from restarting
2016-05-25 17:22:17 -07:00
Brad Hefta-Gaub
78b6a6c661
Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
f2acc82899
Merge pull request #7971 from birarda/session-id-with-place-request
...
optionally include the metaverse session ID as HTTP header when sending usage data
2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub
06cb625d09
Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision
...
Improved Avatar Mixer Rotation Precision
2016-05-25 17:14:12 -07:00
Brad Hefta-Gaub
7131920312
Merge pull request #7966 from ctrlaltdavid/20932
...
make file dialog resizable and movable
2016-05-25 17:13:55 -07:00
Brad Hefta-Gaub
0a96b144e3
Merge pull request #7970 from birarda/api-recheck-on-fail
...
clear AddressManager previous lookup on 404
2016-05-25 17:13:44 -07:00
samcake
b76cda3c89
Merge pull request #7945 from Geenz/20901
...
20901: Add Range Based Light Attenuation
2016-05-25 16:39:01 -07:00
Brad Hefta-Gaub
84f541285f
Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
2016-05-25 15:01:15 -07:00
David Rowe
2f3fa80b96
Add Clipboard.getContentsDimensions() JavaScript method
2016-05-26 09:52:22 +12:00
Seth Alves
3184304179
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart
2016-05-25 14:14:09 -07:00
Seth Alves
cb40cfbead
Merge pull request #7972 from jherico/entity_shape_protocol_fix
...
Fix broken protocol for shapes
2016-05-25 14:13:15 -07:00
