Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:01:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49339 commits 25 branches 0 tags 1.1 GiB
Commit graph

20382 commits

Author SHA1 Message Date
David Kelly
643353a31e Initial push 
Works on windows, have not tried it on mac.  Lots more to do, but
need to get it pushed to remote just in case.
 2016-12-02 15:46:20 -08:00
Brad Davis
5cbf7588ac Fixes for building on MSVC 2015 / Qt 5.8 2016-12-02 14:58:09 -08:00
samcake
acdce95bba Merge pull request #9140 from jherico/polyline_threading_fix 
Possible polyline crash fix
 2016-12-02 14:16:14 -08:00
Chris Collins
6cb85e92b1 Merge pull request #9136 from samcake/hdr 
Fix a crash if current shader is null
 2016-12-02 09:14:07 -08:00
Brad Davis
12ccbdac0b Actually render polylines 2016-12-01 19:46:08 -08:00
Seth Alves
8fe7c3156a Merge pull request #9138 from hyperlogic/bug-fix/3dsmax-fbx-reader-fixes 
Support for the 3ds Max object offset feature
 2016-12-01 19:39:05 -08:00
Brad Hefta-Gaub
934148fea5 Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1 
Added jsdocs for MyAvatar
 2016-12-01 18:11:25 -08:00
Anthony J. Thibault
35eeaad590 Added jsdocs for MyAvatar 
Not complete by any means, but it's a start.
 2016-12-01 17:38:43 -08:00
Seth Alves
d2b32c3084 Merge pull request #9057 from druiz17/childParent 
fixed children of parent object not being added back when performing an undo
 2016-12-01 16:59:06 -08:00
Anthony J. Thibault
68b103b46b Fix for missing fields in static initializer. 2016-12-01 15:21:49 -08:00
Dante Ruiz
348c0c95e5 conforming to coding standard and better variable naming 2016-12-01 22:22:17 +00:00
Brad Davis
5bade2ef9a Add locking around the code that reads polyline entity data and builds GPU structures for them 2016-12-01 14:14:17 -08:00
Chris Collins
942850293e Merge pull request #9105 from druiz17/teleportBug 
Fix for unable to teleport to areas that you should
 2016-12-01 11:35:06 -08:00
Seth Alves
efe9571ab8 Merge pull request #8691 from highfidelity/out-of-body-experience 
Room Scale HMD comfort features.
 2016-12-01 11:09:39 -08:00
Dante Ruiz
0c9cd5803a added descendant checking 2016-12-01 10:54:26 -08:00
Dante Ruiz
c52f893273 isChildOfParent 2016-12-01 10:54:26 -08:00
samcake
ff39ec6753 fix a potential crash if the current shaderObject is null 2016-12-01 10:51:32 -08:00
Andrew Meadows
2bbe2be516 fix spelling: physcis --> physics 2016-12-01 10:50:10 -08:00
Andrew Meadows
ae699e2a65 add initializer for member variable 2016-12-01 10:41:40 -08:00
Andrew Meadows
445c730ca3 remove cruft, fix formatting and spelling 2016-12-01 10:38:13 -08:00
Andrew Meadows
333e9ec7f4 Merge pull request #9128 from Polyrhythm/ryan/v3-and-shader-helpers 
Vec3 and shader helpers
 2016-12-01 10:32:34 -08:00
Chris Collins
19b5e7cd86 Merge pull request #9054 from howard-stearns/third-person-lasers 
make hand-controller ui work in third person
 2016-12-01 10:11:12 -08:00
Atlante45
e6b9d3604d Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-12-01 09:45:50 -08:00
Brad Hefta-Gaub
e0bcbb08ff Merge pull request #9134 from samcake/blue 
Fix a bug when using the gpu::Batch::_glUniform*() calls  with a bad location
 2016-12-01 09:03:56 -08:00
sam
3d29187156 FIx a potential bug when using _glUniform calls with an invalid location 2016-12-01 02:44:04 -08:00
sam
6342762fde FIx a potential bug when using _glUniform calls with an invalid location 2016-12-01 02:39:52 -08:00
Anthony J. Thibault
e96676fea4 Support for the 3ds Max object offset feature 
FBXReader now supports the GeometricTranslation, GeometricRotation and GeometricScaling FBX fields.
These offsets are applied directly to the mesh vertices, as they are never animated and the rest of our
rendering and animation system would have difficulty supporting them otherwise.
 2016-11-30 18:28:55 -08:00
Ryan Jones
7b0756c745 remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions 2016-11-30 16:37:04 -08:00
Ken Cooke
452f081366 Add support for WAV assets with arbitrary sample rate, not just 48khz. Fast path when already 24khz. 2016-11-30 14:56:11 -08:00
Zach Pomerantz
8a6dcdeb68 mix audio with single node list read lock 2016-11-30 16:37:34 -05:00
samcake
c3db2704ed Merge pull request #9126 from jherico/gl_debugging 
Working on OpenGL debuggability
 2016-11-30 10:51:58 -08:00
Ken Cooke
7ad384d731 reformat to meet Coding Standard, more explicit license 2016-11-30 10:44:27 -08:00
Dante Ruiz
1b20cc8bd0 more clean up 2016-11-30 18:28:50 +00:00
Dante Ruiz
104cbbff7e clean up 2016-11-30 18:26:06 +00:00
Atlante45
1d8c97b337 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-30 10:22:16 -08:00
Dante Ruiz
34d24b947e better implementation 2016-11-30 18:03:11 +00:00
David Rowe
a75d0b3fe8 Merge branch 'master' into 21089 2016-11-30 14:50:51 +13:00
Anthony J. Thibault
78559934a1 Merge branch 'master' into third-person-lasers 2016-11-29 16:38:34 -08:00
Ryan Jones
fe774a8530 adjust whitespace 2016-11-29 15:41:50 -08:00
Ryan Jones
3ccc493871 add helpers for v3 and shaders 2016-11-29 15:40:20 -08:00
Ken Cooke
812d28dbff Fix compiler warnings 2016-11-29 14:39:49 -08:00
Ken Cooke
68085947a0 replace tabs with spaces 2016-11-29 14:12:41 -08:00
Brad Davis
63b3b7250d Restore correct pipeline shader slot setup 2016-11-29 14:02:58 -08:00
Brad Davis
a98e49c892 Fix build errors 2016-11-29 14:02:15 -08:00
Brad Davis
3b07e31eab Working on OpenGL debuggability 2016-11-29 13:15:56 -08:00
Ken Cooke
5d05fd389f First-order Ambisonic renderer, optimized for AVX2 2016-11-29 12:53:19 -08:00
Brad Hefta-Gaub
881e0cba11 Merge pull request #9117 from samcake/red 
Potentially address the crash when no vertex format is specified
 2016-11-29 09:23:43 -08:00
Zach Pomerantz
e6dfc5204d expose mutex in LimitedNodeList 2016-11-28 17:13:21 -05:00
Howard Stearns
030f0d7103 Merge pull request #9114 from howard-stearns/bubble-state 
bubble state
 2016-11-28 12:16:39 -08:00
samcake
803a399bb6 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-11-28 11:58:17 -08:00
samcake
1974ded050 Potentially address the crash when no vertex format is specified 2016-11-23 16:37:06 -08:00
howard-stearns
b37feb20de signal from ignoreNodesInRadius 2016-11-23 11:23:06 -08:00
howard-stearns
00b94860cf Merge branch 'master' of https://github.com/highfidelity/hifi into bubble-state 2016-11-23 11:02:12 -08:00
samcake
9478f242d8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-23 10:35:32 -08:00
howard-stearns
8b9efb461e bubble state 2016-11-23 10:22:24 -08:00
Chris Collins
8246e3be4b Merge pull request #9109 from samcake/red 
Fix the bad binding for polyline
 2016-11-22 17:32:04 -08:00
samcake
3d0b557af6 Fix the bad binding for polyline 2016-11-22 13:01:02 -08:00
samcake
d764eebc79 removing dead code 2016-11-22 12:10:56 -08:00
Brad Hefta-Gaub
1970deab92 Merge pull request #9107 from kencooke/audio-win7-fix 
Audio fix for Windows 7
 2016-11-22 11:31:34 -08:00
Dante Ruiz
daf12047ca removed unnessary comments 2016-11-22 18:55:20 +00:00
Dante Ruiz
2dfb745443 made some chnages 2016-11-22 18:53:03 +00:00
samcake
c494479290 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-22 10:16:08 -08:00
samcake
dfc0b7beac adressed reveiw comments 2016-11-22 10:15:49 -08:00
Ken Cooke
d69d77d0ee Refactor the audio device format detection. Only use the native format when Qt can correctly determine it. 2016-11-21 21:36:17 -08:00
David Kelly
811fc0afbe Merge pull request #9096 from howard-stearns/location-cleanup 
location cleanup to make people more aware of their sandbox placename
 2016-11-21 17:33:34 -08:00
Dante Ruiz
a176c624ab fixed teleport bug 2016-11-21 23:04:07 +00:00
howard-stearns
066a518142 expose metaverse url to javascript and use it rather than hardcoding 2016-11-21 13:07:38 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
Brad Davis
728f8aa238 Reduce logspam, change some debug output to warning 2016-11-21 11:56:32 -08:00
howard-stearns
5b216578d7 Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-21 11:47:30 -08:00
samcake
31232a1078 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-21 11:30:26 -08:00
Dante Ruiz
1ba769b0ef teleportBug 2016-11-21 10:38:20 -08:00
Brad Hefta-Gaub
ac6a1088f9 Merge pull request #9099 from ZappoMan/personalSpace 
first cut at personal space feature
 2016-11-19 16:57:33 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
Brad Davis
362976645b Fix HMD UI glow lines 2016-11-18 17:42:56 -08:00
Brad Davis
3074be7ad0 Glow line replacement without geometry shader 2016-11-18 17:42:55 -08:00
Chris Collins
e9563ef9af Merge pull request #9095 from birarda/mac-perms 
add hardware address based permissions to domain-server
 2016-11-18 17:28:11 -08:00
howard-stearns
da56457c4a Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-18 17:13:32 -08:00
howard-stearns
f1806eb649 server protocols 2016-11-18 17:05:14 -08:00
Seth Alves
8ee1fac367 don't try to render until mesh is ready 2016-11-18 16:33:48 -08:00
Seth Alves
b2a28147c0 more time 2016-11-18 15:36:29 -08:00
Seth Alves
47062d29f5 cleanups 2016-11-18 15:27:45 -08:00
Seth Alves
3278478a60 cleanups 2016-11-18 15:26:16 -08:00
Seth Alves
a66a1d392e hack to avoid crash 2016-11-18 15:24:19 -08:00
Seth Alves
f5536a01a7 Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-buffer-size 2016-11-18 14:09:44 -08:00
Stephen Birarda
47f82a8046 send the mac address with domain-server check in 2016-11-18 13:50:11 -08:00
Chris Collins
c81b0fc018 Merge pull request #9091 from kencooke/audio-multichannel 
Multichannel audio support
 2016-11-18 13:32:59 -08:00
Seth Alves
1714d4fe06 fix build 2016-11-18 05:40:57 -08:00
samcake
a07523ca31 Merge with Upstream 2016-11-17 18:31:05 -08:00
Seth Alves
8530156227 experimenting 2016-11-17 16:06:35 -08:00
Seth Alves
028be0f830 Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-buffer-size 2016-11-17 14:14:08 -08:00
Seth Alves
1eb17b9786 fix bug that caused polyvox rendering to mishandle its gpu buffers 2016-11-17 14:11:09 -08:00
Ken Cooke
fd08936fb3 Improved failure logs 2016-11-17 13:42:43 -08:00
Brad Hefta-Gaub
36d8e6d64d Merge pull request #9074 from hyperlogic/bug-fix/web-entity-limit-fix 
Bug fix for blank webEntities during long sessions
 2016-11-17 13:02:18 -08:00
Brad Hefta-Gaub
91f90400a9 Merge pull request #9088 from sethalves/fix-polyvox-memory-leak 
fix polyvox memory leak
 2016-11-17 12:23:13 -08:00
Anthony J. Thibault
38ac6fff03 Hand Controller rendering is camera relative 
Basically, when using the third person camera in HMD mode.  If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.

To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.

These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.

These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
 2016-11-17 11:33:12 -08:00
Seth Alves
1f9598f295 Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-memory-leak 2016-11-17 08:44:52 -08:00
Ken Cooke
ec53c6a030 Add support for mono or multichannel audio output. 
At the end of the audio pipeline, optional upmix/downmix to the device channel format.
 2016-11-17 06:56:49 -08:00
samcake
7c003ce865 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-16 19:13:22 -08:00
samcake
9031e65aa5 Merge and fix the bug!!! 2016-11-16 19:12:56 -08:00
Brad Hefta-Gaub
22303d8e5b Merge pull request #9086 from jherico/disable_glow_line 
Disable glow line temporarily while fixing implementation
 2016-11-16 18:16:55 -08:00
Brad Hefta-Gaub
b0c87e9134 Merge pull request #9080 from jherico/buffer_leak 
Fix buffer leak in line entity
 2016-11-16 18:10:44 -08:00
Seth Alves
697369dece avoid crash on startup 2016-11-16 16:11:17 -08:00
Seth Alves
e83922f9e4 Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-memory-leak 2016-11-16 15:39:57 -08:00
Seth Alves
b9326affa3 Merge pull request #9087 from druiz17/parentID 
Fix - When avatar's parent is deleted, avatar does not move
 2016-11-16 15:30:52 -08:00
Seth Alves
a14ff22df3 update render-land bounds when polyvox moves 2016-11-16 15:10:43 -08:00
Dante Ruiz
66ff81f450 Another function name change 2016-11-16 22:32:15 +00:00
Seth Alves
d097fa7982 fix polyvox memory leak 2016-11-16 14:10:50 -08:00
Dante Ruiz
9c4ae9df5a function name change 2016-11-16 22:09:22 +00:00
Chris Collins
44b2b090df Merge pull request #9010 from samcake/orange 
Improve Input Stage Format switching in GL45Backend
 2016-11-16 14:00:17 -08:00
Dante Ruiz
ff7c11d48c Fixed avatar parent delete issue 2016-11-16 13:03:34 -08:00
howard-stearns
9f2b6dc40b location cleanup 2016-11-16 12:53:57 -08:00
Brad Davis
fa841620ab Disable glow line temporarily while fixing implementation 2016-11-16 12:50:47 -08:00
Ryan Huffman
75eafbb349 Add docs to Paths 2016-11-16 12:11:32 -08:00
Ryan Huffman
179eed5d11 Add Vec2 and Vec3 defiitions to jsdoc 2016-11-16 11:56:42 -08:00
Ryan Huffman
7e9df928f4 Add jsdoc comments to Menu 2016-11-16 10:49:50 -08:00
samcake
b74a1af5ba Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-11-16 10:48:30 -08:00
Anthony J. Thibault
066ddad25a Reduced MAX_CONCURRENT_WEB_VIEWS from 100 to 20. 2016-11-16 09:39:55 -08:00
samcake
982664dac5 Merging with upstream 2016-11-15 18:14:25 -08:00
Brad Davis
fda2cde006 Fix buffer leak in line entity 2016-11-15 14:16:54 -08:00
Brad Hefta-Gaub
84573d373b Merge pull request #9070 from huffman/fix/docs 
Add jsdoc to Camera
 2016-11-15 13:46:16 -08:00
David Rowe
9b270834dd Merge branch 'master' into 21089 2016-11-16 08:51:48 +13:00
Andrew Meadows
a04b7ae297 fix hover-drive in HMD 2016-11-15 11:45:09 -08:00
Ken Cooke
b19a44e046 On Windows, set audio format to match the internal mix format. 
This works around multichannel bugs in the Qt audio framework.
 2016-11-15 10:37:32 -08:00
samcake
80240123b9 Merging with upstream 2016-11-15 10:01:06 -08:00
Seth Alves
d73fc1681c Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-15 09:11:06 -08:00
Ken Cooke
30c189e624 channelCount math cleanup 2016-11-15 09:10:05 -08:00
samcake
9267f4eaaf Fix the merge with upstream and the new stereo drawcall, fix the timer reporting on mac and fix the openGLChecker quicking on mac 2016-11-15 00:40:39 -08:00
Brad Hefta-Gaub
5dd33c8dce fix for mac min openGL version 2016-11-14 20:58:09 -08:00
Brad Hefta-Gaub
86430e4121 Merge pull request #8960 from samcake/red-backup-many-stereo-paths 
Introduce Instanced Stereo Drawcall
 2016-11-14 18:30:42 -08:00
Anthony J. Thibault
eb401c125a Bug fix for blank webEntities during long sessions 
In prolonged sessions _currentWebCount would reach MAX_CONCURRENT_WEB_VIEWS and prevent new webEntities from being properly created and initialized.

The _currentWebCount inside of RenderableWebEntityItem would become inflated when buildWebSurface is called without a currentContext.
The early return did not properly take this into account.  Instead we move the increment after the early return and right before the _webSurface is actually created.
 2016-11-14 18:01:47 -08:00
Ryan Huffman
5fd1ae64b0 Begin adding entities jsdoc 2016-11-14 16:54:55 -08:00
Andrew Meadows
6bb3dd6830 Merge hifi/master into hifi/out-of-body-experience 2016-11-14 15:08:04 -08:00
David Rowe
1eeec2a3a1 Fix up script injection methods 2016-11-15 10:24:38 +13:00
David Rowe
e7d9f98ca4 Get script injection working in new marketplaces window 2016-11-15 09:23:51 +13:00
samcake
07e8238b0e REmove uneeded macros 2016-11-14 12:09:44 -08:00
samcake
f3e1ed4b88 Merging and cleaning up the code path for the 2 flavors of gl 2016-11-14 11:57:00 -08:00
samcake
b888af15e4 Fix merge 2016-11-14 11:15:27 -08:00
Seth Alves
43b73f0380 Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-14 10:00:46 -08:00
samcake
a05e42138c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-14 09:58:12 -08:00
Chris Collins
e599e13809 Merge pull request #9063 from sethalves/fix-some-crash-on-exits 
Fix some crash on exits
 2016-11-14 09:20:03 -08:00
Brad Hefta-Gaub
cc6d68ffdf Merge pull request #8973 from humbletim/fix-batched-script-keys 
Use matching hash keys for input/output when batch-loading scripts.
 2016-11-14 08:13:32 -08:00
Brad Hefta-Gaub
dd23fcc0c9 Merge pull request #9008 from hyperlogic/feature/debug-draw-marker-color 
Add color support to debug draw marker rendering
 2016-11-14 08:12:57 -08:00
Seth Alves
92e24e6ded code review 2016-11-13 16:09:57 -08:00
Seth Alves
9868ddd602 global/static QStrings in plugins appear to cause crashes during shutdown 2016-11-13 10:22:14 -08:00
Seth Alves
804f25740d these qDebugs happen too late and cause a crash 2016-11-13 10:21:27 -08:00
Seth Alves
5133ce0548 print a debug message when skipping evaluation of a previously included url 2016-11-12 10:50:21 -08:00
Seth Alves
55d894bd6f Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-12 07:38:07 -08:00
Chris Collins
0876dbc809 Merge pull request #9050 from sethalves/last-edited-by 
lastEditedBy property for entities
 2016-11-11 16:02:18 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226 
Add ability to mute user
 2016-11-11 16:02:08 -08:00
Ryan Huffman
2203607044 Merge pull request #9056 from Atlante45/networking 
Protect against empty packet lists
 2016-11-11 15:28:46 -08:00
Clément Brisset
e38da75115 Merge pull request #9053 from huffman/feat/whitelist-ac-ip 
Add AC ip address whitelist to domain server
 2016-11-11 15:03:21 -08:00
Atlante45
a38846aeed Protect against empty packet lists 2016-11-11 14:32:52 -08:00
Chris Collins
b9b90cc646 Merge pull request #9047 from jherico/stutter 
Add stutter tracking
 2016-11-11 11:39:00 -08:00
Ryan Huffman
e1466c0d47 Fix NULL -> nullptr 2016-11-11 10:21:58 -08:00
Brad Davis
162f24decd Add stutter tracking for Oculus 2016-11-11 10:12:41 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer 
since we can get the canKick there too.  (doh)
 2016-11-11 09:30:58 -08:00
Seth Alves
db99295989 Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-11 06:40:31 -08:00
Seth Alves
15c247fc5e quiet warnings 2016-11-11 06:37:22 -08:00
Seth Alves
899dec8b10 Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by 2016-11-11 06:11:49 -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
samcake
00addcad9e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-10 17:57:34 -08:00
samcake
1d3fc1b647 Fix a bad conversion to integer for negative values of the GRid COordinates 2016-11-10 17:57:11 -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
Seth Alves
576eed9941 use a mutex to avoid a smaller race 2016-11-10 17:12:06 -08:00
David Kelly
285520dff7 Initial cut 
No script work yet, just first stab at underpinnings
 2016-11-10 16:24:35 -08:00
Seth Alves
aef39ce6fa block until follow-on includes are finished but still avoid multiple evaluation of included urls 2016-11-10 16:06:53 -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
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -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
samcake
784a0540ed Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-10 10:05:03 -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
David Rowe
5eff7c9e15 Merge branch 'master' into 21089 2016-11-10 14:42:21 +13: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
67c99703ae Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-08 18:21:45 -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
samcake
af438ae31b Fix the buid 2016-11-07 17:56:54 -08:00
samcake
cab699464e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-07 17:31:06 -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
David Rowe
d33ac21aaa Merge branch 'master' into 21089 2016-11-08 08:23:10 +13:00
samcake
ff82fcae56 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-07 10:37:42 -08:00
Andrew Meadows
ccdf383151 Merge hifi/master into hifi/out-of-body-experience 2016-11-07 08:24:26 -08:00
humbletim
28eadc149f switch to apply normalizeURL only and move to top of for loop 2016-11-06 16:08:42 -05: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
sam
bcef138545 FIx the context stats 2016-11-04 18:59:30 -07:00
Anthony J. Thibault
620fd3713c Add color support to debug draw marker rendering 2016-11-04 17:09:25 -07:00
samcake
f274ef1a59 Merging back with upstream and trying to fix counter for them to be more stable 2016-11-04 16:56:03 -07:00
samcake
e12040a98a Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-04 14:54:18 -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
samcake
3db1831841 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2016-11-04 09:59:28 -07:00
samcake
7655f906f1 Starting adding a timer for the frame 2016-11-03 19:26:30 -07:00
Andrew Meadows
4b623f72c3 compute correct volume for ellipsoid 2016-11-03 18:05:50 -07:00
Andrew Meadows
0d2cec290d use convexHull for ellipsoidal "spheres" 2016-11-03 17:56:38 -07:00
Andrew Meadows
3ed3a74b7d oops, don't forget to remove the sqrt 2016-11-03 17:08:42 -07:00
Andrew Meadows
c9c0b9ebc4 tighten rejection of zero-length quaternions 2016-11-03 17:01:09 -07:00
Brad Hefta-Gaub
7cca8f0a66 Merge pull request #8993 from samcake/blue 
Prevent sparse texture on AMD gpus for now
 2016-11-03 16:48:52 -07:00
Brad Hefta-Gaub
4b1034a5e6 Merge pull request #8994 from ZappoMan/reduceTextureMax 
more conservative texture memory budget
 2016-11-03 16:30:04 -07:00
Andrew Meadows
757ec5fff4 normalize quaternions submitted from scriptland 2016-11-03 16:02:39 -07:00
samcake
1086585559 fixing the test to actually capture ati correctly and add the report to the ui 2016-11-03 15:15:05 -07:00
Clément Brisset
00a94bdd6d Merge pull request #8974 from huffman/feat/help-select-xbox-tab 
Update help window to auto select xbox or vive controller tab on availability of device
 2016-11-03 14:42:23 -07:00
samcake
ce89f811f3 better loggin of the sparse switch 2016-11-03 14:35:44 -07:00
samcake
4104aa6286 avoid warning? 2016-11-03 14:31:28 -07:00
Brad Hefta-Gaub
206f1ead1a Merge pull request #8990 from howard-stearns/centered-toolbar 
centered toolbar
 2016-11-03 14:18:32 -07:00
Brad Hefta-Gaub
c1841f9add more conservative texture memory budget 2016-11-03 14:10:07 -07:00
Ryan Huffman
413199459b Fix the name searched for in isViveControllerAvailable 2016-11-03 14:02:18 -07:00
Ryan Huffman
625c98820d Fix isSubdeviceContainingNameAvailable 2016-11-03 14:01:52 -07:00
Brad Hefta-Gaub
961e17bc48 Merge pull request #8989 from sethalves/fix-polyvox-bitrot 
fix a couple of minor polyvox problems
 2016-11-03 13:43:52 -07:00
Brad Hefta-Gaub
f10e43d148 Merge pull request #8992 from AndrewMeadows/fix-autoresize 
fix autoresize of Entities.addEntity() and fix Quat.lookAtSimple()
 2016-11-03 13:41:47 -07:00
samcake
6a39ad3b5a Prevent sparse texture on AMD gpus for now 2016-11-03 13:01:41 -07:00
howard-stearns
3a072b5bf9 tell desktop about preference changes 2016-11-03 12:17:28 -07:00
Brad Hefta-Gaub
e1837c90e2 Merge pull request #8991 from sethalves/fix-8981 
fix QVector<bool> packing when number of joints isn't a multiple of 8
 2016-11-03 10:59:06 -07:00
Seth Alves
339d6a55cf getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation 2016-11-03 10:06:07 -07:00