Seth Alves
d202a2bf11
better handling of missing settings keys
2016-06-06 11:59:39 -07:00
Seth Alves
a4e4093a18
split permissions into two sets, one for 'standard' ones and one for specific users
2016-06-06 10:39:47 -07:00
Seth Alves
880c4f18b5
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-05 08:27:59 -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 Hefta-Gaub
9ef7e82270
Merge pull request #8020 from highfidelity/revert-7991-aoighost_builddocs_securityfixes
...
Revert "Update the build docs for a better OpenSSL security posture."
2016-06-04 21:01:03 -07:00
Andrew Meadows
062711b202
Revert "Update the build docs for a better OpenSSL security posture."
2016-06-04 20:51:21 -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
Brad Hefta-Gaub
5390d50ab8
Merge pull request #8015 from kencooke/master
...
Replace the linear interpolation embedded in the .WAV/.RAW loader with high quality polyphase resampling.
2016-06-04 16:55:42 -07:00
Brad Hefta-Gaub
eeb08fb401
Merge pull request #8014 from imgntn/leaphands
...
add leap hands to /system
2016-06-04 16:43:30 -07:00
Brad Hefta-Gaub
0a79ab5ff8
Merge pull request #8017 from ctrlaltdavid/toolbar-positioning
...
Save toolbar position when moving it only when stopped moving it
2016-06-04 16:00:30 -07:00
David Rowe
b6cb5617d3
Save toolbar position when moving it only when stopped moving it
2016-06-05 08:55:27 +12:00
Seth Alves
15a52abf7b
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-04 11:07:08 -07:00
Seth Alves
dd009bf8b9
add some debugging prints. make blacklisting work
2016-06-04 11:06:37 -07:00
Seth Alves
be403865fc
don't request public keys for the standard psuedo-account-names
2016-06-04 10:44:59 -07:00
Seth Alves
80eeff5a64
bump packet versions. change how domainObject[RESTRICTED_ACCESS_FLAG] is decided
2016-06-04 10:32:07 -07:00
Seth Alves
adf893ea19
rename AgentPermissions to NodePermissions
2016-06-04 09:50:36 -07:00
Brad Hefta-Gaub
5805c0cf9e
Merge pull request #8016 from howard-stearns/do-not-send-stale-vive-data-as-valid-for-master
...
do not send stale vive data as valid after deactivating
2016-06-04 09:26:43 -07:00
Seth Alves
2977c4eab7
Merge branch 'permissions-grid-ui' of github.com:sethalves/hifi into permissions-grid
2016-06-04 09:08:44 -07:00
howard-stearns
849bee977a
Do not send stale vive data as valid after deactivating.
...
(cherry picked from commit e6cc1fabe0
2016-06-04 09:07:51 -07:00
Seth Alves
6870a16197
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-04 09:07:42 -07:00
Seth Alves
09b0e3eaaf
use constants rather than bare strings for standard psuedo-account-names
2016-06-04 09:07:34 -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
David Rowe
2eaf401bd6
Fix spurious data being submitted from changed permissions in new row
2016-06-04 12:39:55 +12:00
Andrew Meadows
e92f1a8c5a
Merge pull request #7991 from aoighost/aoighost_builddocs_securityfixes
...
Update the build docs for a better OpenSSL security posture.
2016-06-03 16:17:50 -07:00
James B. Pollack
da023bfbe3
leap
2016-06-03 15:40:04 -07:00
Seth Alves
4cad94216c
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-03 13:16:08 -07:00
Seth Alves
b88bba8672
add code to convert older domain-settings to current style
2016-06-03 13:15:53 -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
