Commit graph

48340 commits

Author SHA1 Message Date
Stephen Birarda
53769f4edf change scale for avatar if domain limited scale changes 2016-11-10 14:58:04 -08:00
Stephen Birarda
9fdde49d14 clamp target scale changes on both ends 2016-11-10 14:54:42 -08:00
Stephen Birarda
6f442a74b1 request settings from agents and debug results 2016-11-10 14:43:15 -08:00
Stephen Birarda
64d9fa0f39 clamp avatar scale to domain limit in avatar mixer 2016-11-10 14:19:32 -08:00
Chris Collins
5b91c8f32b Merge pull request #8984 from sethalves/fix-setLocalJointRotation-name
fix names of model-entity joint setters
2016-11-10 13:39:14 -08:00
Stephen Birarda
77ede81fc9 limit MyAvatar scale to limits from domain settings 2016-11-10 13:27:13 -08:00
Brad Davis
c7d68aa9cf Add stutter stat logging 2016-11-10 13:15:35 -08:00
Brad Davis
90f55f0cd5 Add stutter tracking 2016-11-10 11:56:38 -08:00
Chris Collins
cd0416b5e9 Merge pull request #9039 from humbletim/fix-users-online-interactions
Disable Users Online interactions while window is hidden.
2016-11-10 10:37:13 -08:00
Brad Davis
e2991c3665 Change minimum cores to 3 to enable OpenVR 2016-11-10 10:35:05 -08:00
Brad Hefta-Gaub
af2f6e831a Merge pull request #9044 from birarda/higher-mute-permissions
elevate permissions required for mute environment to kick
2016-11-10 10:18:06 -08:00
Brad Hefta-Gaub
ff559aa4a1 Merge pull request #9042 from hyperlogic/feature/jsdoc
Generate JS documentation from comments in C++ source
2016-11-10 10:17:39 -08:00
Stephen Birarda
563322d08d add min and max avatar scale to domain-server settings 2016-11-10 10:04:01 -08:00
Anthony J. Thibault
d111f7c409 Moved jsdoc folder from scripts to tools directory 2016-11-10 09:33:56 -08:00
Stephen Birarda
f56a5d1d98 elevate permissions required for mute environment 2016-11-10 09:23:01 -08:00
Brad Davis
db98a742b6 Remove incremental transfers 2016-11-10 08:35:35 -08:00
Seth Alves
f6318fe619 Merge pull request #9043 from ZappoMan/avatarEntityGreifingVector
add support for whitelist entity scripts
2016-11-10 08:17:30 -08:00
Brad Hefta-Gaub
8758e4a9ba add support for whitelist entity scripts 2016-11-09 19:17:24 -08:00
samcake
0ab4a781f5 Back to the correct code 2016-11-09 18:25:37 -08:00
samcake
c01b39b54b And test that again 2016-11-09 18:16:51 -08:00
Anthony J. Thibault
940edd4a6d Added interface/src/scripting dir to doc search path 2016-11-09 18:09:42 -08:00
Anthony J. Thibault
839b1a3c5e Added some jsdoc comments to the C++ source 2016-11-09 18:09:10 -08:00
Anthony J. Thibault
5b244357e0 Add jsdoc readme and plugin 2016-11-09 18:03:42 -08:00
samcake
941e5a57b1 trying a test with 4.4 as the minimum gl context to be able to break on Intel integrated 2016-11-09 17:25:46 -08:00
samcake
f5fd4bf8d1 Merge pull request #9014 from jherico/texture_derez
Re-enable downsampling for non-sparse textures
2016-11-09 17:18:03 -08:00
Brad Davis
4ae6cbad7b Merge pull request #9035 from druiz17/vrmenu
Fixed unable to remove menus from VrMenu context
2016-11-09 16:28:53 -08:00
Seth Alves
a907d1b5b3 Merge pull request #9038 from ZappoMan/avatarEntityGreifingVector
remove scripts from avatar attached entities for other avatars
2016-11-09 14:31:52 -08:00
Brad Hefta-Gaub
770bf35d2b CR feedback 2016-11-09 14:31:18 -08:00
Brad Hefta-Gaub
cf3d1011f4 remove scripts from avatar attached entities for other avatars 2016-11-09 12:26:57 -08:00
Brad Davis
f7d1b3c823 Fix non-incremental transfers when sparse enabled 2016-11-09 12:13:35 -08:00
Brad Davis
192c72ff99 Update menu, initial state for texture management 2016-11-09 12:09:25 -08:00
Bradley Austin Davis
9e929ca629 Re-enable downsampling for non-sparse textures 2016-11-09 12:09:24 -08:00
samcake
b7381c30cb Including the fix for the bad Major Version number from David K 2016-11-09 10:38:44 -08:00
humbletim
35f857ef9d inhibit user interactions when window is disabled 2016-11-09 13:21:24 -05:00
samcake
0f39934ec3 Merge branch 'master' of https://github.com/highfidelity/hifi into green 2016-11-08 14:52:21 -08:00
samcake
a4e75b4dcf FIx an obvious mistake, good catch MR Zappoman 2016-11-08 14:51:48 -08:00
Howard Stearns
666d2dd2fc Merge pull request #9031 from davidkelly/dk/2178
Log snapshot upload and user story creation errors
2016-11-08 12:11:16 -08:00
Howard Stearns
0a56f7c4fe Merge pull request #9009 from howard-stearns/fix-numeric-keyboard-for-window-prompt
fix numeric keyboard for hmd Window.prompt
2016-11-08 12:05:13 -08:00
Dante Ruiz
4b087a2718 fixed unable to remove menus from vrmenu context 2016-11-08 12:03:53 -08:00
Dante Ruiz
7f355c48b1 saving work progress 2016-11-08 12:03:53 -08:00
Ryan Huffman
5dab2ac2a7 Add margin to left and right side of users.js 2016-11-08 09:47:09 -08:00
Ryan Huffman
284b458148 Increase margin at bottom of users.js 2016-11-08 09:46:47 -08:00
David Kelly
1766ebab2c Added a bit more logging 2016-11-08 09:08:34 -08:00
Brad Hefta-Gaub
5454dca82e Merge pull request #9030 from highfidelity/stable
Update master with Stable hotfix
2016-11-07 18:48:54 -08:00
David Kelly
3105299670 Log snapshot upload and user story creation errors
Plus, if the body of the error is empty, put something in there so
the script will not think it was successful.
2016-11-07 18:13:10 -08:00
Chris Collins
31ff26368d Merge pull request #9029 from highfidelity/hotfix-steam-auto-updater
Disable Sandbox auto-update popup when the application is running from Steam
2016-11-07 17:21:19 -08:00
Chris Collins
4700c80e38 Merge pull request #9003 from hyperlogic/feature/skeleton-dump-tool
Added tools/skeleton-dump tool
2016-11-07 16:17:43 -08:00
Chris Collins
eec8e2f19b Merge pull request #9000 from samcake/punk
Add Frame Timing and GPU memory to the Stats and user activity log
2016-11-07 16:17:20 -08:00
Atlante45
f34cf64f3e Disable updater on Steam 2016-11-07 16:09:56 -08:00
samcake
86a569651c Add more precuation when extracting the opengl version in the openGLVersionChecker to avoid crashing 2016-11-07 14:45:26 -08:00