Chris Collins
b9b90cc646
Merge pull request #9047 from jherico/stutter
...
Add stutter tracking
2016-11-11 11:39:00 -08:00
Brad Davis
162f24decd
Add stutter tracking for Oculus
2016-11-11 10:12:41 -08:00
Seth Alves
5629db9109
Merge pull request #9049 from birarda/max-min-av-scale
...
add a min/max avatar scale in domain-server settings
2016-11-11 06:11:02 -08:00
Brad Hefta-Gaub
6db3556dc5
Merge pull request #9048 from howard-stearns/disable-viewpoint-menus-in-hmd
...
Disable viewpoint menus in hmd
2016-11-10 17:52:50 -08:00
David Kelly
186451fcbe
Merge pull request #9027 from samcake/green
...
Fix crashes in OpenGLVersionChecker
2016-11-10 17:22:29 -08:00
Brad Davis
16060d50af
Merge pull request #9041 from jherico/disable_incremental
...
Remove incremental texture transfers
2016-11-10 15:43:20 -08:00
howard-stearns
b20d4a4b03
Merge branch 'master' of https://github.com/highfidelity/hifi into disable-viewpoint-menus-in-hmd
2016-11-10 15:15:51 -08:00
howard-stearns
4d18a3cc3d
expose menu enablement to javascript
2016-11-10 15:01:06 -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
90f55f0cd5
Add stutter tracking
2016-11-10 11:56:38 -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
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
839b1a3c5e
Added some jsdoc comments to the C++ source
2016-11-09 18:09:10 -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
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
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
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
Brad Hefta-Gaub
5454dca82e
Merge pull request #9030 from highfidelity/stable
...
Update master with Stable hotfix
2016-11-07 18:48:54 -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
Seth Alves
c8a654a915
Merge pull request #9006 from Atlante45/logging
...
Logging improvements
2016-11-07 13:35:13 -08:00
humbletim
144983a943
Merge remote-tracking branch 'upstream/master' into script-retry-improvements
2016-11-06 11:36:50 -05:00
humbletim
61452c21a2
bail early from irrecoverable retry situations
2016-11-06 10:31:28 -05:00
humbletim
2139e979da
map specific HTTP errors to corresponding ResourceRequest enums
2016-11-06 10:31:02 -05:00
Seth Alves
51f6b5af78
code review
2016-11-05 10:35:21 -07:00
Ryan Huffman
1a704f8d0a
Fix ScriptCacheSignalProxy not being properly cleaned up
2016-11-05 10:16:35 -07:00
Ryan Huffman
5287ec1eee
Fix includes hitting max retries locking the script up
2016-11-05 10:15:56 -07:00
Brad Hefta-Gaub
2684aed523
Merge pull request #8995 from AndrewMeadows/avoid-zero-quaternion
...
normalize quaternions submitted to C++ from JS
2016-11-04 14:34:42 -07:00
Atlante45
ae29fe8ab2
Logging improvements
2016-11-04 14:26:19 -07:00
Anthony J. Thibault
1732448d3c
Added tools/skeleton-dump tool
...
Debug tool that prints out the skeleton hierarchy of fbx files including joint indices, bindPose and defaultPoses.
The verbose option also prints the full FBX transformation set, pre/post rotations etc.
2016-11-04 13:52:16 -07:00
samcake
76aa541d4a
Adding the frame gpu and batch timer
2016-11-04 11:49:52 -07:00
Seth Alves
689fdfb35f
implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame
2016-11-04 11:44:42 -07:00
Seth Alves
e41fa94958
implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame
2016-11-04 11:42:31 -07:00
Brad Hefta-Gaub
9a774553ae
Merge pull request #8998 from AndrewMeadows/ellipsoids-sorta
...
use ConvexHull shape for irregular "spheres"
2016-11-04 11:39:32 -07:00
Seth Alves
727fe4bc21
Merge branch 'master' of github.com:highfidelity/hifi into fix-setLocalJointRotation-name
2016-11-04 10:04:56 -07:00
