Commit graph

43805 commits

Author SHA1 Message Date
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
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
Brad Hefta-Gaub
7ed35399e9 make the application of redundant physics update idempotent to improve action glitches 2016-06-02 18:01:23 -07:00
Atlante45
854bf82631 Raise and stretch collision sounds threshold 2016-06-02 17:37:36 -07:00
David Rowe
8a2685325b Make localhost, anonymous, and logged-in rows non-deletable 2016-06-03 12:06:51 +12:00
Seth Alves
41a8e9fa91 missed a protocol change 2016-06-02 16:53:52 -07:00
Atlante45
3ca158265a Make sure getVelocityChange returns the velocityChange 2016-06-02 16:44:13 -07:00
Brad Davis
bf734395e5 More invisible web entity fixes 2016-06-02 16:37:45 -07:00
Brad Davis
cc85ce9c01 fix crash on click on non-visible web-entity 2016-06-02 16:37:45 -07:00
David Rowe
fd77f8401c Style new code like old 2016-06-03 10:40:32 +12:00
Seth Alves
fc92268641 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-02 15:38:24 -07:00
David Rowe
21ba4f3394 Make editibility of switch columns be configurable 2016-06-03 10:27:38 +12:00
David Rowe
b36b1491af Restrict marking table rows dirty to table row switch events 2016-06-03 10:12:28 +12:00
Seth Alves
d010dc9699 keep localhost line from being added every save. added some debugging print stuff 2016-06-02 15:08:16 -07:00
Brad Hefta-Gaub
da983ffe68 Merge pull request #7986 from ctrlaltdavid/20937
make navigating directories in file browser dialog possible without double-clicking
2016-06-02 14:56:48 -07:00
Brad Hefta-Gaub
281c257d25 Merge pull request #7980 from zzmp/fix/max-capacity
fix domain max capacity to only count users (not scripted agents)
2016-06-02 14:54:16 -07:00
Brad Hefta-Gaub
4b2e2ca10a Merge pull request #7961 from AndrewMeadows/convexification
vhacd-util improvements
2016-06-02 14:52:10 -07:00
Brad Hefta-Gaub
326aa639fc Merge pull request #7995 from samcake/blue
Fix the jittering reflection bug and more Normal improvments
2016-06-02 14:13:44 -07:00
Brad Hefta-Gaub
62d3b171d7 Merge pull request #7985 from ZappoMan/addAudioLimiter
add audio peak limiter to audio mixer
2016-06-02 14:11:55 -07:00
Seth Alves
83cba2dd82 start on code to convert from settings version 1.2 to 1.3 2016-06-02 13:28:36 -07:00
Seth Alves
83f2c723eb collect permissions into their own data structure 2016-06-02 13:15:30 -07:00
Zach Pomerantz
a8228d42ee Improve max users explanation 2016-06-02 11:57:24 -07:00
David Rowe
e24ba4caf6 Code tidying 2016-06-02 05:47:07 -07:00
David Rowe
ce7fa51465 Make checkboxes in user permissions table editable 2016-06-02 05:47:01 -07:00
samcake
7de5b80179 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-06-01 17:52:36 -07:00
samcake
1dca62f752 Introducing a new technique for normal packing and fixing a bug on the normal buffer format 2016-06-01 17:51:53 -07:00
Seth Alves
ae0c8a96f2 code to unpack permissions into a usable data structure 2016-06-01 15:33:24 -07:00
Seth Alves
f082201941 working toward a grid on domain-server settigns page 2016-06-01 15:32:27 -07:00
Seth Alves
791744085a Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-01 09:15:47 -07:00
Peter Clemenko III
036fd0c4af Update the build docs for a better OpenSSL security posture. There are around 19 CVEs in the current recommended version. 2016-06-01 10:35:36 -04:00
David Rowe
b65938b631 Adjust default and minimum sizes 2016-06-01 16:23:26 +12:00
Brad Hefta-Gaub
35b80ba066 Merge pull request #7990 from ZappoMan/revert7943
Revert PR-7943
2016-05-31 21:21:12 -07:00
David Rowe
c4aed1ce06 Remove "Open Folder" button 2016-06-01 16:16:08 +12:00
Brad Hefta-Gaub
3119b654dc additional revert related change 2016-05-31 20:50:12 -07:00
Brad Hefta-Gaub
b8c80e2222 Revert "refresh API info during re-connect - case 570"
This reverts commit e8d7f9614a.
2016-05-31 20:39:16 -07:00
David Rowe
4da1c0ac4d Click on blank part of dialog to deselect item 2016-06-01 14:25:07 +12:00
David Rowe
eddfe4847a Select nothing by default when navigate up/down directory structure 2016-06-01 14:22:54 +12:00
Seth Alves
7810ed6313 working toward a permissions grid in domain-server settings 2016-05-31 16:56:08 -07:00
samcake
ae7d817705 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-05-31 15:38:07 -07:00
Andrew Meadows
1eb0b6a231 apply FBXGeometry.scaleOffset to mesh vertices 2016-05-31 11:38:58 -07:00
David Rowe
437607998f Adjust minimum size of file browser dialog to keep all buttons visible 2016-05-30 14:20:13 +12:00
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