Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-21 11:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49797 commits 25 branches 0 tags 1.1 GiB
Commit graph

20499 commits

Author SHA1 Message Date
samcake
1ded581895 Merge pull request #9217 from zzmp/feat/render-forward-bounds 
Render bounds in Forward Render Task
 2016-12-16 14:57:14 -08:00
howard-stearns
3adc78fecc Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de sessionDisplayName set at server and passed to all clients (including 
oneself)
 2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506 adding profile stats relating to avatar CPU costs 2016-12-16 13:41:31 -08:00
David Kelly
126ae52cb4 Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS 2016-12-16 12:17:54 -08:00
samcake
5ce854612a Merge pull request #9213 from jherico/chrome_tracing 
Add support for chrome tracing output
 2016-12-16 09:37:55 -08:00
Brad Davis
a12b8b4b62 Cleanup dead code 2016-12-16 09:21:41 -08:00
Chris Collins
940ead46d0 Merge pull request #9214 from kencooke/audio-ambisonic-src 
Ambisonic resampler, optimized using AVX2
 2016-12-16 09:19:34 -08:00
David Kelly
7a346b99b9 Add CoreFoundation to libraries we link to on MacOS 
Turns out vhacd-util and ice-server don't link to it, and we need
it for machine fingerprint.  So the build system doesn't make mac
vhacd-util or ice-server builds I guess, or this would have shown
up awhile ago.
 2016-12-16 08:58:20 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
Brad Hefta-Gaub
6d7d3551d9 added some stats to the mixer fixed debug logging, improved timer precision 2016-12-15 18:32:11 -08:00
Anthony J. Thibault
5441d33a25 Support for the ablity to change button properties from js. 2016-12-15 18:17:14 -08:00
Brad Hefta-Gaub
8497ad1e29 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-15 16:42:41 -08:00
Anthony J. Thibault
5d1ccfbccc Tablet#removeButton now works properly 2016-12-15 15:49:37 -08:00
Brad Hefta-Gaub
ed19b4b592 remove compression at the per avatar data buffer for now, since it gave no benefit 2016-12-15 14:13:38 -08:00
Anthony J. Thibault
8b99fa90e8 Merge branch 'master' into tablet-ui 2016-12-15 13:28:23 -08:00
Zach Pomerantz
013713f92c rm unused scene 2016-12-15 15:21:57 -05:00
Zach Pomerantz
9e05403aba forward render opaque bounds 2016-12-15 14:59:25 -05:00
Zach Pomerantz
bae6ceb2ae rm extra buffer clears in forward render 2016-12-15 14:57:22 -05:00
Brad Hefta-Gaub
25c6e8021f Merge pull request #9198 from zzmp/chmod/render-utils 
Change file permissions of source code to remove execute bits
 2016-12-15 10:37:36 -08:00
samcake
7a29dbe7d4 Merge pull request #9207 from zzmp/feat/render-forward-empty 
Forward render task (empty and only used with RENDER_FORWARD set)
 2016-12-15 09:57:18 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
Brad Hefta-Gaub
439434b300 fixes 2016-12-14 20:24:52 -08:00
Brad Hefta-Gaub
c8fb467579 send minimum data for out of view avatars 2016-12-14 18:17:11 -08:00
Stephen Birarda
6c344b0c75 Merge pull request #9211 from Atlante45/disable_steamworks 
Make Steam client calls into a plugin
 2016-12-14 17:35:51 -08:00
Brad Hefta-Gaub
2443b2d6d9 duh 2016-12-14 17:35:02 -08:00
Anthony J. Thibault
d2c4417b24 Hook up Help button to the new Tablet interface 2016-12-14 17:05:47 -08:00
David Kelly
2566778654 Handle no setting manager case 
Can't save the fallback generated UUID for machine fingerprint if
the user of this stuff doesn't have a settings file.  Found this when
I noticed needed to initialize com for all the assignment clients
 2016-12-14 16:43:37 -08:00
David Kelly
cb14b0e3e0 inital cut, passing fingerprint in 
does permissions same as mac address, more or less.  Not exposed
yet, just a beginning.
 2016-12-14 16:09:13 -08:00
Atlante45
0dec97fc03 Make Steamworks a plugin 2016-12-14 15:37:49 -08:00
Ken Cooke
b4994a3d89 Ambisonic resampler, optimized using AVX2. 
int16_t and float versions.
Removed unused SSE2 version.
Removed unused getExactInput().
Refactored to remove nested #ifdefs.
 2016-12-14 15:18:41 -08:00
David Rowe
dbd00e39a8 Handle unzip failure 2016-12-15 11:52:34 +13:00
Anthony J. Thibault
d4f9d21ce8 Pass tablet QQuickItem to TabletScriptingInterface 
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
 2016-12-14 14:04:48 -08:00
Brad Hefta-Gaub
daccb70819 disable compression by default 2016-12-14 13:18:09 -08:00
Andrew Meadows
c1e283fa6d Merge pull request #9201 from samcake/red 
Fix local light shading tiling issue
 2016-12-14 12:25:02 -08:00
Brad Hefta-Gaub
e57774f630 fix unix/mac build 2016-12-14 12:19:50 -08:00
Brad Hefta-Gaub
2290179281 add compression and minimal data flags to AvatarData 2016-12-14 11:47:45 -08:00
Brad Hefta-Gaub
7189f766a2 more hacking 2016-12-13 20:56:41 -08:00
Brad Hefta-Gaub
a7750501c6 first cut at adding view frustum support to avatar mixer 2016-12-13 18:58:11 -08:00
David Kelly
a8157ae2cd Typo, plus some CR feedback 2016-12-13 17:48:30 -08:00
Zach Pomerantz
87a8ad1289 strip forward render task to clear and blit 2016-12-13 20:48:05 -05:00
David Kelly
d6b99ce57e Removed volume from AudioInjectorLocalBuffer 
Since it doesn't use it.  Now clamping at 0-1 in the
AudioInjector::getVolume() call.  This is better -- one spot so it now
always gets clamped.
 2016-12-13 17:34:56 -08:00
David Rowe
be00730073 Add canWriteAssets method and signal to Entities API 2016-12-14 14:27:55 +13:00
Zach Pomerantz
bc59be12ef create flagged forward render task 2016-12-13 19:19:30 -05:00
Brad Hefta-Gaub
a2ba03284e Merge pull request #9186 from ZappoMan/kinectPlugin 
Kinect Plugin
 2016-12-13 15:29:41 -08:00
samcake
d9cb07bf9a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-13 15:28:33 -08:00
samcake
0b221abfb2 writting the abs differently 2016-12-13 15:27:50 -08:00
samcake
f509d1fca4 Clening up the fix 2016-12-13 12:48:16 -08:00
Zach Fox
44c6eb303b Fix the bug 2016-12-13 12:46:31 -08:00
samcake
f8f4ddb16a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-13 11:47:41 -08:00
Zach Pomerantz
9a37ccbf3c chmod -x to render-utils src 2016-12-13 14:36:41 -05:00
David Rowe
aefa116207 Add extra logging for Clara.io asset resizing 2016-12-13 17:55:22 +13:00
samcake
d4f4bd4519 Debugginfg the bad tiles lighting 2016-12-12 18:02:14 -08:00
Clément Brisset
050c0fe14a Merge pull request #9188 from kencooke/audio-wav-parser 
Fix and improve the WAV file loader
 2016-12-12 17:51:20 -08:00
Brad Hefta-Gaub
37a4253d20 Merge pull request #9192 from sethalves/es-leak 
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
 2016-12-12 17:16:00 -08:00
David Rowe
1f3045ad30 Merge branch 'master' into 21089 
Conflicts:
	interface/src/Application.cpp
 2016-12-13 14:05:24 +13:00
Stephen Birarda
b4f43e01b1 Merge pull request #9189 from huffman/feat/help-touch 
Add support for oculus touch in help menu
 2016-12-12 16:48:00 -08:00
Seth Alves
d97be52542 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2016-12-12 16:24:17 -08:00
David Rowe
efb784f703 Code review 2016-12-13 13:11:21 +13:00
Seth Alves
6fe35ac0da use smart pointers to avoid leaking EntityTreeElementExtraEncodeData 2016-12-12 16:04:41 -08:00
samcake
9155f11b3d Merge pull request #9190 from jherico/test_mode 
Add test mode to interface
 2016-12-12 15:37:05 -08:00
Brad Davis
2a43f5fbef Add test mode to interface 2016-12-12 14:51:11 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
Ryan Huffman
9f166d82ce Add support for oculus touch in help menu 2016-12-12 13:44:09 -08:00
David Kelly
3f3d922eca No longer applying volume when reading audio injector buffer 
Since we also apply the gain in HRTF (on both server and client), the
mono sources sort of had volume^2 applied to them.
 2016-12-12 12:01:02 -08:00
David Kelly
8719d36cd9 Merge pull request #9125 from kencooke/audio-ambisonics 
First-order Ambisonic renderer
 2016-12-12 11:36:12 -08:00
Brad Hefta-Gaub
87e8b6bfeb only consider standard poses written if the pose was valid 2016-12-12 09:23:01 -08:00
Ken Cooke
a4cbf6be8a Fix to preserve localOnly from script when not ambisonic 2016-12-09 16:55:53 -08:00
Chris Collins
c912d77a95 Merge pull request #9167 from Atlante45/feat/oculus-reorient-quit 
Honor reorient and quit request from OVR
 2016-12-09 16:03:41 -08:00
David Rowe
c87149cfc2 Tidying 2016-12-10 12:59:01 +13:00
David Rowe
a52d8d1982 Merge branch 'master' into 21089 2016-12-10 11:47:43 +13:00
Seth Alves
dd3f3957a9 Merge pull request #9164 from fayeli/last-edited-property 
Exposing last edited property of Entity to Javascript
 2016-12-09 13:13:11 -08:00
Faye Li Si Fi
b3ac62bb56 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property 2016-12-09 12:44:17 -08:00
Chris Collins
ec4edf5030 Merge pull request #9130 from zzmp/feat/audio-threading 
Threaded Audio
 2016-12-09 10:46:54 -08:00
Seth Alves
819e3dc41d remove some unneeded html special-casing 2016-12-09 10:18:30 -08:00
Seth Alves
6c99b5e9ca code review 2016-12-09 06:50:10 -08:00
sam
2427a16d6e clean up and less changes 2016-12-09 03:05:25 -08:00
sam
914fc7fca8 rewind all the unecessary changes and do just the minimum layout(std140) and accessing the big arrays in vec4s to fix the amd bug 2016-12-09 02:58:09 -08:00
sam
7a97570949 Debugging the amd shader???? 2016-12-09 02:12:31 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
Anthony J. Thibault
319bb9ce78 Prototype of Tablet.qml hacked to appear on ALL web entities. 2016-12-08 15:31:00 -08:00
samcake
d851278acd FIx the highlight issue, the gloss 2 is actually roughnees to the power of 4 2016-12-08 15:04:57 -08:00
Bradley Austin Davis
3fcd45a236 Optimized method for transforming axis aligned bounding boxes 2016-12-08 10:59:14 -08:00
Faye Li Si Fi
9289dd36d4 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property 2016-12-08 10:50:00 -08:00
Atlante45
7b0b777051 Honor reorient and quit request from OVR 2016-12-07 17:29:54 -08:00
Faye Li Si Fi
1fde68c86e better code style 2016-12-07 16:10:03 -08:00
Faye Li Si Fi
b6798adb5c yay 2016-12-07 15:40:37 -08:00
Faye Li Si Fi
0556661d13 getting rid of uneccessary flag, fix formatting, and getting it to work yay 2016-12-07 15:40:21 -08:00
Faye Li Si Fi
0fcb8803b6 attempt to expose last edited property to script 2016-12-07 12:27:31 -08:00
Ken Cooke
e4b5c14ea3 PR feedback 2016-12-07 10:15:55 -08:00
Chris Collins
bc9f2b4007 Merge pull request #9163 from jherico/gl_context_preservation 
Preserve and restore the GL context when resizing QML surfaces
 2016-12-07 09:08:36 -08:00
Ken Cooke
0f10975a59 Robust WAV parser. 
Skips extraneous chunks, handles WAVE_FORMAT_EXTENSIBLE, supports arbitrary sample rates.
 2016-12-07 08:44:10 -08:00
Bradley Austin Davis
5c3480e2a2 Preserve and restore the GL context when resizing QML surfaces 2016-12-07 05:02:45 -08:00
Howard Stearns
2eb8d9d0c4 Merge pull request #9153 from davidkelly/dk/machineFingerprint 
Machine fingerprint
 2016-12-06 16:34:45 -08:00
Zach Pomerantz
b2f995d3df algorithm->nestedEach in LimitedNodeList 2016-12-07 00:03:30 +00:00
David Kelly
562cd12bca More CR feedback 
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things.  So, no more namespace, back to a class with
2 static functions, one public one private
 2016-12-06 15:17:47 -08:00
David Rowe
eafd51ba9e Merge branch 'master' into 21089 2016-12-07 11:27:15 +13:00
David Rowe
460d332c6f Delete redundant code 2016-12-07 10:06:32 +13:00
David Rowe
8e30674069 Tidying 2016-12-07 09:28:35 +13:00
David Rowe
d857f943f8 Handle Clara marketplace downloads 2016-12-07 09:16:59 +13:00
David Kelly
dc47c5fc0c CR feedback 
lame mistake - it is always the error branches that get you.
 2016-12-06 11:12:50 -08:00
Brad Hefta-Gaub
b97012fc97 Merge pull request #9137 from jherico/msvc2015 
Fixes for building on MSVC 2015 / Qt 5.8
 2016-12-06 10:25:16 -08:00
Ken Cooke
9831d874b5 Remove debugging code 2016-12-06 10:22:58 -08:00
Ken Cooke
975cbd8e44 Replace test renderer with spatialized binaural renderer 2016-12-06 10:12:36 -08:00
Chris Collins
6d4b1c4b97 Merge pull request #9155 from jherico/text_degrade_fix 
Fix drop in text rendering quality when texture memory is low
 2016-12-06 09:23:32 -08:00
David Kelly
7880b5bfe0 Simple fallback now 
If the bios uuid isn't a valid UUID (on mac or windows it 'should be`)
then we read the fallback from the settings and use that, or create and
write one to the settings if it is missing.
 2016-12-05 17:05:39 -08:00
Anthony J. Thibault
89ae3b3d6e Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" 
This reverts commit efe9571ab8, reversing
changes made to 333e9ec7f4.
 2016-12-05 15:18:03 -08:00
Anthony J. Thibault
0c8105b551 Revert "Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1" 
This reverts commit 934148fea5, reversing
changes made to d2b32c3084.
 2016-12-05 15:17:53 -08:00
Bradley Austin Davis
2ca4d0ab29 Fix drop in text rendering quality on texture memory constrained systems 2016-12-05 14:12:57 -08:00
David Kelly
54716f70e5 Now works on mac, small build change for that 
Plus does nothing for linux, but there's a comment.
 2016-12-05 11:11:30 -08:00
sam
310e26011f Fix the lighting problem at the outline of the shapes, use the depth buffer instead of the Linear depth buffer 2016-12-05 00:47:50 -08:00
David Rowe
2f42f4cfa5 Merge branch 'master' into 21089 2016-12-05 18:33:38 +13:00
David Rowe
71de106594 Tidying 2016-12-04 15:14:47 +13:00
David Rowe
c6f19b1c4e Add missing entity hover signal 2016-12-03 20:37:47 +13:00
Ken Cooke
e93e1a7c4f Preliminary support for Ambisonic audio injectors. 
Supports 4-channel WAV files, presumed to be B-format (FuMa) first-order Ambisonic.
Supports WAV with arbitrary sample rate (needs optimization).
Supports soundfield volume and orientation set via script.
Supports localOnly client-side injection using simple (non-spatialized) test renderer.
 2016-12-02 18:20:57 -08:00
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