Brad Davis
c2aa9e7f61
Update SteamVR keyboard behavior
2016-06-07 21:52:21 -07:00
Brad Davis
eab611acc0
Enable Steam VR text input
2016-06-07 21:52:20 -07:00
Brad Davis
ca6e86e767
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-06-07 21:51:47 -07:00
Brad Hefta-Gaub
338557358d
Merge pull request #8035 from Atlante45/master
...
Fix OS X warning
2016-06-07 18:17:58 -07:00
Brad Hefta-Gaub
80100b1d34
Merge pull request #8000 from Atlante45/feat/plugins
...
Select/Disable plugins via command line args
2016-06-07 18:17:29 -07:00
Atlante45
71fb0e665f
Fix OSX warning
2016-06-07 16:46:32 -07:00
Brad Hefta-Gaub
30526374bc
Merge pull request #7996 from ctrlaltdavid/get-entity-children
...
add Entities.getChildrenIDs() method
2016-06-06 16:25:25 -07:00
Atlante45
399517fcbd
Activate Inputs after menus are setup
2016-06-06 13:28:36 -07:00
Atlante45
24bbb8db3f
Remove input plugin menu dependency
2016-06-06 13:28:36 -07:00
Atlante45
992fa63932
Allow ordered list of preferred plugins
2016-06-06 13:28:36 -07:00
Atlante45
932838b1e3
Setup preferred display plugin
2016-06-06 13:28:36 -07:00
Atlante45
d8493f960a
Add command line option to enable/disable plugins
2016-06-06 13:28:36 -07:00
Brad Hefta-Gaub
5190d8ab6b
Merge pull request #8023 from jherico/settings
...
Eliminate extraneous writes for unchanged values
2016-06-06 12:22:11 -07:00
Brad Hefta-Gaub
b4721ec57e
Merge pull request #7973 from ctrlaltdavid/clipboard-dimensions
...
add Clipboard.getContentsDimensions() JavaScript method
2016-06-06 12:03:10 -07:00
Brad Hefta-Gaub
11effb6feb
Merge pull request #8007 from hyperlogic/feature/avatar-recording-version
...
Add version number to avatar recording frame
2016-06-06 12:02:49 -07:00
Brad Hefta-Gaub
1782a6ba4a
Merge pull request #8011 from hyperlogic/bug-fix/remove-avatar-data-warning
...
Removed innocuous "AvatarData packet size mismatch" warning
2016-06-06 12:02:34 -07:00
Brad Davis
b7d1659852
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-06 09:32:33 -07:00
Brad Hefta-Gaub
f2bedc546f
Merge pull request #8019 from jherico/settings
...
Eliminate file IO contentions for settings
2016-06-04 21:04:50 -07:00
Brad Davis
bc81f00dc7
Eliminate extraneous writes for unchanged values
2016-06-04 20:47:10 -07:00
Brad Davis
65d8f65ed7
Fix unix builds, make settings ACID
2016-06-04 18:39:46 -07:00
Brad Davis
39dcd1f9bd
Eliminate file IO contentions for the settings
2016-06-04 17:55:30 -07:00
Brad Hefta-Gaub
d9542107c2
Merge pull request #8006 from AndrewMeadows/convexification-2
...
fix bad convex hull simplification
2016-06-04 16:58:03 -07:00
Ken Cooke
89bfa5bc09
fixed typo
2016-06-03 19:22:29 -07:00
Ken Cooke
280289045c
Revert change to reverb settings.
2016-06-03 18:48:23 -07:00
Ken Cooke
cd29aac185
Merge branch 'master' of github.com:kencooke/hifi
2016-06-03 18:42:30 -07:00
Ken Cooke
54293fdad0
Replace the linear interpolation embedded in the .WAV/.RAW loader with high quality polyphase resampling.
...
When downsampling 48khz to 24khz, linear interpolation creates aliasing distortion that is quite audible. This change greatly improves the audio quality for all sound assets.
2016-06-03 18:39:43 -07:00
Anthony J. Thibault
3a5d5aab01
Removed innocuous "AvatarData packet size mismatch" warning
...
This should not have been a warning, it is expected behavior when a BulkAvatarData packet is filled
with data from more then one avatar.
2016-06-03 14:33:50 -07:00
Anthony J. Thibault
8f9fc08226
Add version number to avatar recording frame
...
New recordings will have a version number of 1.
A missing version field indicates the initial version of 0.
Warn when playing back version 0 files which are no longer fully supported and fall back to default pose.
Playback of version 1 files should work as expected.
2016-06-03 11:08:05 -07:00
Andrew Meadows
c2317adf06
undo ambitious cleanup (try again another day)
2016-06-03 11:06:36 -07:00
Andrew Meadows
3280a2b967
fix indentation
2016-06-03 10:47:54 -07:00
Andrew Meadows
f17330ea82
diff method for capping convex hull point count
2016-06-03 10:47:54 -07:00
Andrew Meadows
c73757f740
use many colors for collision hull rendering
2016-06-03 10:47:54 -07:00
Andrew Meadows
2a3da60ed4
remove some magic numbers
2016-06-03 10:47:54 -07:00
Andrew Meadows
eff59d3fd3
build compound sub meshes shapes with less copying
2016-06-03 10:47:54 -07:00
Andrew Meadows
bce8879d7c
remove ShapeInfo::clearPoints()
...
use getPoints() by ref and then clear
2016-06-03 10:47:54 -07:00
Andrew Meadows
9dc0fa7796
don't automatically clear ShapeInfo points
2016-06-03 10:47:54 -07:00
Andrew Meadows
211bbb88e6
purge SHAPE_TYPE_ELLIPSOID which wasn't used
2016-06-03 10:47:54 -07:00
Andrew Meadows
7858ef84b3
don't copy points onto itself
2016-06-03 10:47:54 -07:00
Andrew Meadows
c066b4d4ac
purge collision shape for ParticleEffectEntityItem
2016-06-03 10:47:54 -07:00
Andrew Meadows
5d9e320dd7
purge SHAPE_TYPE_LINE
2016-06-03 10:47:54 -07:00
Andrew Meadows
654468619c
swap order of if-else blocks
2016-06-03 10:47:54 -07:00
Andrew Meadows
d591561a88
remove RenderableModelEntityItem::_points
...
use ShapeInfo::_points instead
2016-06-03 10:47:54 -07:00
Brad Hefta-Gaub
c85923c69b
Merge pull request #7956 from jherico/web_entity_crash
...
fix crash on click on non-visible web-entity
2016-06-03 10:29:55 -07:00
Brad Hefta-Gaub
2e4480ee15
Merge pull request #7979 from jherico/steam_vr_exit_fix
...
Fix crash on shutdown of SteamVR
2016-06-03 10:28:53 -07:00
Andrew Meadows
a22de76052
Merge pull request #8003 from ZappoMan/improveActionGlitches
...
fix glitches when observer client watches object with action
2016-06-03 09:35:12 -07:00
Brad Hefta-Gaub
1075ba1599
CR feedback
2016-06-03 08:01:09 -07:00
Brad Hefta-Gaub
7ed35399e9
make the application of redundant physics update idempotent to improve action glitches
2016-06-02 18:01:23 -07:00
Brad Davis
8c13ff4ee1
Pinned UI support
2016-06-02 17:24:25 -07:00
Brad Davis
068a462901
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-02 17:20:23 -07:00
Atlante45
3ca158265a
Make sure getVelocityChange returns the velocityChange
2016-06-02 16:44:13 -07:00