Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 14:11:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44066 commits 75 branches 59 tags 1.2 GiB
Commit graph

44066 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
SamGondelman
4fb8eac8ea much better way of fixing script 2016-06-03 18:12:47 -07:00
David Rowe
2eaf401bd6 Fix spurious data being submitted from changed permissions in new row 2016-06-04 12:39:55 +12:00
James B. Pollack
27594e6df2 remove afro 2016-06-03 17:07:08 -07: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
Zach Pomerantz
09e0a2ced7 Parse basic metadata into DomainMetadata 2016-06-03 15:13:09 -07:00
SamGondelman
2367cb1995 fixing input mapping for vive/touch grip button/trigger, script needs fixing 2016-06-03 15:07:21 -07:00
Zach Pomerantz
e04c6e8c44 Add description/hosts/rating to settings UI 2016-06-03 15:00:43 -07:00
Zach Pomerantz
209ace1b86 Include anonymously connected user metadata 2016-06-03 15:00:43 -07:00
Zach Pomerantz
55e5c1f6e0 Declare metadata descriptors 2016-06-03 15:00:42 -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
James B. Pollack
e87cb2bd54 Merge remote-tracking branch 'upstream/master' into moreshelfstuff 2016-06-03 14:24:33 -07:00
James B. Pollack
9c63a6417e fix attached entities manager and add to default scripts 2016-06-03 14:24:07 -07:00
Anthony J. Thibault
9292a9ce0b Added MyAvatar.hmdLeanRecenterEnabled property 
Used to disable the 'room-scale' avatar re-centering code.
Disabling this can prevent sliding when the avatar is supposed to be sitting or mounted on a stationary object.

Also, removed a bunch of old, unused leaning and torso twisting code.
 2016-06-03 13:56:32 -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
SamGondelman
c1eab61241 sdl haptics aren't working, but might be a bug in sdl: http://stackoverflow.com/questions/23974908/why-is-sdl-hapticopenfromjoystick-not-working-in-sdl-2 2016-06-03 11:22:06 -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
SamGondelman
e2c4b4d306 added haptic support to sdl and touch (needs testing) 2016-06-03 10:17:08 -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
e891a53ddd Merge pull request #8002 from Atlante45/fix/avatar-collision-sounds 
Fix Avatar collision sounds triggering all the time.
 2016-06-02 20:35:06 -07:00
Atlante45
e2fa734024 Set collision threashold to walking speed 2016-06-02 19:15:55 -07:00
Seth Alves
0e3e2ea331 Merge branch 'ui' of github.com:sethalves/hifi into permissions-grid 2016-06-02 19:13:05 -07:00
Atlante45
4e8b61dea0 Limit collision injectors count to 3 2016-06-02 19:12:37 -07:00
David Rowe
f2e5b6056f Make table switches smaller 2016-06-03 14:03:19 +12:00
Seth Alves
d1abdb07ab Merge branch 'ui' of github.com:sethalves/hifi into permissions-grid 2016-06-02 18:20:27 -07:00