Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-22 11:46:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46251 commits 76 branches 59 tags 1.2 GiB
Commit graph

19007 commits

Author SHA1 Message Date
Ryan Huffman
36744d72d6 Fix warning using init list for QVariantMap 2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0 Move default skybox out of global and make irradiance gen optional 2016-08-08 16:03:03 -07:00
Ryan Huffman
35ea9908cd Add default skybox 2016-08-08 16:00:58 -07:00
Ryan Huffman
43c1472b36 Move srgbToLinear lookup table to external cpp 2016-08-08 15:47:53 -07:00
Ryan Huffman
b800aa793d Fix gamma correction adjusting uchar to float when unnecessary 2016-08-08 15:45:05 -07:00
Atlante45
61d07cf952 Restore mateverse URL 2016-08-08 15:39:25 -07:00
Atlante45
51b45f8f73 Steam invite are facing the current position 2016-08-08 15:39:25 -07:00
Atlante45
aa2ae31aab CR UI fixes 2016-08-08 15:39:25 -07:00
Atlante45
2af32ca60e Only leave lobby if you were invited 2016-08-08 15:39:25 -07:00
Atlante45
7ec2f98cf2 Join lobby on startup 2016-08-08 15:39:25 -07:00
Atlante45
6b861e680f More work on lobby creation/invites 2016-08-08 15:39:25 -07:00
Atlante45
af76e47629 Fix linux build 2016-08-08 15:39:25 -07:00
Atlante45
42c9a695ff Invite friends in HMD 2016-08-08 15:39:25 -07:00
Atlante45
a13950752b Update steam location with discoverability 2016-08-08 15:39:25 -07:00
Atlante45
e5290076be First draft for Steam friends 2016-08-08 15:39:25 -07:00
Atlante45
0663766074 Replace metaverse server with testing URL 2016-08-08 15:39:25 -07:00
Atlante45
f0ff975248 UI wiring 2016-08-08 15:39:25 -07:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
Atlante45
cea0e182c0 Interface login through steam 2016-08-08 15:39:25 -07:00
Zander Otavka
cb153f2a29 Fix file header comments 2016-08-08 15:17:42 -07:00
Zander Otavka
aebd18db7f Add EOF newlines 2016-08-08 15:12:17 -07:00
Zander Otavka
246a8457e1 Add some asserts 2016-08-08 15:12:17 -07:00
Zander Otavka
43bbe790d6 Add atp support to qml 2016-08-08 15:12:17 -07:00
SamGondelman
de900e85c0 remove duplicate include 2016-08-08 14:10:47 -07:00
SamGondelman
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
Ryan Huffman
2ee511bae0 Fix syntax error 2016-08-08 12:30:11 -07:00
Ryan Huffman
28b3ff9bca Update generation of srgb to linear lookup to include python script 2016-08-08 12:04:06 -07:00
SamGondelman
f311907982 fix merge mistake 2016-08-08 11:08:01 -07:00
Ryan Huffman
2a071c4329 Fix improperly formatted floats 2016-08-08 10:39:06 -07:00
Ryan Huffman
d367583426 Clean up priority loading implementation 2016-08-08 08:53:06 -07:00
Ryan Huffman
4f9be2ae72 Fix camera position not being set for angular loading 2016-08-08 08:53:06 -07:00
Ryan Huffman
77e993510e Cleanup implementation of angular loading 2016-08-08 08:53:05 -07:00
Ryan Huffman
c594dcdf9f Add priority loading for model entities 2016-08-08 08:52:29 -07:00
sam
db8bf78dd1 Good state 2016-08-08 02:28:25 -07:00
sam
e6c74b29c7 WTF... 2016-08-07 19:48:23 -07:00
sam
b133556c14 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-07 18:55:44 -07:00
sam
d1105b8102 Still trying 2016-08-07 18:10:03 -07:00
Andrew Meadows
4e23ecfb2c count the _translucent_ pixels and fix break logic 2016-08-07 10:50:25 -07:00
Andrew Meadows
f759fd1033 early exit when determining if alpha mask possible 
also don't bother scanning for alpha for cube maps
 2016-08-07 08:54:20 -07:00
sam
e92e69d963 More changes 2016-08-06 11:54:54 -07:00
Andrew Meadows
4f2c00af46 faster TextureUsage::process2DImageColor() 2016-08-05 23:38:45 -07:00
SamGondelman
b23d3cd35a fixed messed up transparency on edit selection of shapes 2016-08-05 18:35:16 -07:00
SamGondelman
dd51e0e38f merge from master 2016-08-05 17:04:45 -07:00
SamGondelman
771e105fa2 Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-05 16:52:01 -07:00
Sam Gondelman
debda37567 Merge pull request #8379 from SamGondelman/loadingFade 
fixed procedural entity fade
 2016-08-05 16:48:51 -07:00
Brad Hefta-Gaub
452c0218da Merge pull request #8358 from AlexanderOtavka/inline-e-script 
Fix parsing of embedded entity scripts
 2016-08-05 16:46:02 -07:00
Brad Hefta-Gaub
3f3dda6356 Merge pull request #8360 from sethalves/no-accidental-fly 
don't accidently fly
 2016-08-05 16:45:48 -07:00
SamGondelman
b794259b7d fixed procedural entity fade 2016-08-05 16:15:10 -07:00
Chris Collins
1e2d77a99b Merge pull request #8346 from sethalves/default-when-av-fails 
use default avatar when avatar-url is bogus
 2016-08-05 15:13:58 -07:00
Sam Gondelman
84b7f9b186 Merge pull request #8375 from SamGondelman/loadingFade 
remove polyvox fade, fix web fade, add light fade
 2016-08-05 11:53:15 -07:00
SamGondelman
8494400047 don't use web entity texel color alpha as per tony's suggestion 2016-08-05 11:27:56 -07:00
SamGondelman
f2ee57f2de light fade 2016-08-05 11:17:02 -07:00
Anthony J. Thibault
90a06f0d40 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-05 11:05:10 -07:00
SamGondelman
b13edc7b6a fixed web fade fo' real 2016-08-05 10:48:09 -07:00
SamGondelman
130e64aaba remove polyvox fade, possibly fix web fade 2016-08-05 10:36:48 -07:00
Brad Hefta-Gaub
83280aa3f2 implement support for updating the render items of models when they finish their fade 2016-08-05 10:11:07 -07:00
sam
e96fd92f32 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-05 09:28:45 -07:00
sam
92c0fa2e7a Testiung more variations 2016-08-05 09:26:48 -07:00
elisa-lj11
a9a8710689 Switched saving download/upload to temporary directory 2016-08-04 17:01:19 -07:00
elisa-lj11
b1b2ea48b2 Made code more QA; extra browser and download widget close upon download 2016-08-04 17:01:19 -07:00
elisa-lj11
a94a304700 Downloads from Clara.io and uploads to asset server 2016-08-04 16:59:38 -07:00
elisa-lj11
615627e981 Working download and unpackage from Clara.io 2016-08-04 16:59:38 -07:00
elisa-lj11
49712060ed switching to the main site progress 2016-08-04 16:59:38 -07:00
elisa-lj11
c36fc29363 Zip download works 2016-08-04 16:59:03 -07:00
elisa-lj11
6152fa28b7 Download through QML 
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
 2016-08-04 16:58:31 -07:00
elisa-lj11
eab7714d70 working within webview to access url 2016-08-04 16:57:19 -07:00
elisa-lj11
9833ba1987 No errors upon build 2016-08-04 16:51:14 -07:00
elisa-lj11
212e4f9cca making quazip work 2016-08-04 16:48:14 -07:00
elisa-lj11
0e79aa9dbe Added quazip for unzipping functions 2016-08-04 16:46:56 -07:00
elisa-lj11
f277a019bf FileScriptingInterface 
Created new .cpp and .h for the download and unzipping of a model
 2016-08-04 16:46:56 -07:00
SamGondelman
3107d63ad8 one more warning 2016-08-04 14:31:44 -07:00
Seth Alves
a2441ca84c back out some uneeded chagnes 2016-08-04 14:09:12 -07:00
Seth Alves
981a8d76fa code review 2016-08-04 13:47:43 -07:00
Seth Alves
45c21ca523 make UNSET_VALUE still work while still returning and empty string value for undefined keys 2016-08-04 13:37:08 -07:00
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -07:00
SamGondelman
004b0158a4 fix warnings on osx 2016-08-04 13:09:09 -07:00
SamGondelman
ac9a80131a refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes 2016-08-04 12:34:46 -07:00
Seth Alves
aeadbda1e1 adjust ground-to-fly logic 2016-08-04 11:34:42 -07:00
SamGondelman
6604c27f23 polyvox fade WIP 2016-08-04 10:55:37 -07:00
Seth Alves
4c258b9568 fix bug which caused getValue for a non-existent key to return the integer 2 2016-08-04 10:16:08 -07:00
Seth Alves
1b571f3be3 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-04 09:58:41 -07:00
Seth Alves
905c6147cf Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-04 09:56:32 -07:00
Seth Alves
e1c7ced652 increase GROUND_TO_AUTOFLY_THRESHOLD 2016-08-04 09:54:26 -07:00
Seth Alves
1930bde005 Merge branch 'master' of github.com:highfidelity/hifi into no-accidental-fly 2016-08-04 09:52:18 -07:00
Brad Hefta-Gaub
a1dc9beddb Merge pull request #8348 from ZappoMan/beltAndSuspenders 
implement codec renegotiation in client
 2016-08-03 21:22:28 -07:00
SamGondelman
d521315475 fade polylines (needs testing) 2016-08-03 17:03:52 -07:00
SamGondelman
d7052f6250 try to make text entities fade 2016-08-03 16:27:51 -07:00
SamGondelman
7713c1f4bf try to fade in web entities 2016-08-03 15:56:41 -07:00
Zander Otavka
a826f4eca1 Fix console errors for javascript: urls 2016-08-03 15:55:51 -07:00
samcake
b4e5b60656 fixing ao 2016-08-03 15:45:22 -07:00
Anthony J. Thibault
f24c92f3a1 Bug fix for avatar debug marker rendering. 
"Developer > Hands > Show Hand Targets" works again
"Developer > Avatar > Draw Position" works again
 2016-08-03 15:43:31 -07:00
Seth Alves
78e59106b4 adjust threshold for how far above the ground will cause the avatar to auto-fly 2016-08-03 15:21:49 -07:00
SamGondelman
27bacc9165 try to fade in procedural shapes 2016-08-03 14:33:05 -07:00
Anthony J. Thibault
713bee84c3 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-03 14:06:43 -07:00
Zander Otavka
f9b6db12e3 Fix parsing of embedded entity scripts 
Now correctly identifies when scripts are not urls as well as
javascript: urls.
 2016-08-03 13:48:27 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Brad Hefta-Gaub
eb230071a0 Merge branch 'master' of https://github.com/highfidelity/hifi into beltAndSuspenders 2016-08-03 11:53:28 -07:00
Seth Alves
c743cf379e use loadCollisionModelURLFinished when collisions model is finished 2016-08-03 11:31:51 -07:00
Seth Alves
b48d4f6d2d Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-03 10:42:26 -07:00
Seth Alves
ad4fc8c656 merge from upstream, don't hold up enabling of physics if a collision hull fails to load 2016-08-03 10:42:15 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00
Seth Alves
9962d47173 Merge pull request #8326 from birarda/kick 
kick
 2016-08-03 09:21:09 -07:00
Brad Hefta-Gaub
754eae98c2 Merge pull request #8353 from birarda/fake-atp-url 
fix for disabled physics with unloadable entity
 2016-08-03 09:10:41 -07:00
Seth Alves
cc7322a0de Merge pull request #8334 from ctrlaltdavid/21015 
refresh file dialog when directory content changes
 2016-08-03 08:11:40 -07:00
Seth Alves
7e94d4c694 Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-02 19:34:17 -07:00
Brad Hefta-Gaub
193f0bbb99 Merge pull request #8345 from ctrlaltdavid/web-window-signals 
add OverlayWebWindow resized, moved, and closed signals
 2016-08-02 18:41:49 -07:00
SamGondelman
d63a0ef08f working on making other entities transparent 2016-08-02 18:09:42 -07:00
Stephen Birarda
5d3e125a06 make failed geomtetry request not hold physics 2016-08-02 16:32:41 -07:00
Zander Otavka
38ba54e481 Fix confirm dialog 2016-08-02 16:04:54 -07:00
Howard Stearns
c2d1f08551 Merge pull request #8342 from highfidelity/dk/snapshot 
Snapshot button
 2016-08-02 15:31:50 -07:00
Brad Hefta-Gaub
ca3a194454 implment coded renegotiation in client if for some reason unexpected audio codecs come in to inbound stream 2016-08-02 15:30:03 -07:00
Anthony J. Thibault
6d768d8327 hand controllers send touch events instead of mouse events to web entities 
This gives a much better experience when scrolling web content.
 2016-08-02 15:23:46 -07:00
Stephen Birarda
4cdc98287b add canKick to USI, revert constants to production 2016-08-02 14:35:51 -07:00
Stephen Birarda
39e6ac0974 cleanup API for HifiConfigVariantMap after migration 2016-08-02 14:35:11 -07:00
Stephen Birarda
62af203d08 migrate the deprecated merged master/user config 2016-08-02 14:35:11 -07:00
Stephen Birarda
7e6dbf2d1a add a kick request packet and send from NL 2016-08-02 14:35:11 -07:00
Stephen Birarda
94b97e8119 expose kick perms from LNL and Node 2016-08-02 14:35:11 -07:00
Stephen Birarda
f04996a53d add the kick permission to domain server settings 2016-08-02 14:35:11 -07:00
SamGondelman
5de21982be fix linux build 2016-08-02 11:44:17 -07:00
SamGondelman
ad5dec829c why did I change that 2016-08-02 10:52:51 -07:00
SamGondelman
3d08502080 space 2016-08-02 10:50:57 -07:00
SamGondelman
74f11eb70b try a different easing function 2016-08-02 10:50:31 -07:00
Seth Alves
2c449320d0 when and ID of a SpatiallyNestable subclass is changed, update the parentID of any children 2016-08-02 08:20:48 -07:00
samcake
4ec971b449 MOre debugging 2016-08-01 23:17:32 -07:00
SamGondelman
0b5c7909b8 a calculated change 2016-08-01 18:45:25 -07:00
David Kelly
fcd2947b19 Doh -- forgot to push this 
same logic as before to get a mono image in the HMD.
 2016-08-01 18:37:22 -07:00
Seth Alves
b953e6f0ff when an avatar URL fails, switch to the default 2016-08-01 18:12:30 -07:00
David Rowe
31ac7a2812 Add OverlayWebWindow resized, moved, and closed signals 2016-08-02 12:40:01 +12:00
SamGondelman
6154aaddda try to fix linux build 2016-08-01 16:19:03 -07:00
SamGondelman
ae0b9ea9a3 fade wireframes 2016-08-01 15:26:04 -07:00
SamGondelman
313ba87fce fade on texture load 2016-08-01 14:47:20 -07:00
SamGondelman
217a102926 working on loading fade 2016-08-01 13:15:55 -07:00
samcake
3ca1cdd645 Merging with master 2016-08-01 12:42:33 -07:00
Seth Alves
708bd33056 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-08-01 12:00:13 -07:00
Seth Alves
60d6673950 switch data-web urls to point at production server rather than dev one 2016-08-01 12:00:08 -07:00
Seth Alves
28e0ca2e49 when a parent of a 3d overlay is deleted, delete the overlay 2016-08-01 10:55:34 -07:00
Seth Alves
2d88e74841 added operator!= for Transform class 2016-08-01 07:50:12 -07:00
Seth Alves
8102ea4b8e don't call locationChanged or dimensionsChanged when they didn't 2016-08-01 07:48:44 -07:00
samcake
beb42332ef save the current state of adding debug and evolving the ao job 2016-07-31 16:05:25 -07:00
Seth Alves
e4e86c245e 3d overlays can be children of entities or avatars 2016-07-31 14:11:56 -07:00
Anthony Thibault
cf7450beb7 handControllerGrab and web entity input integration 2016-07-29 17:50:45 -07:00
Anthony Thibault
f71a59276c Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering 
Fix alpha cut-outs and incorrect gamma on web overlays and entities
 2016-07-29 17:44:46 -07:00
David Rowe
800c2b9ec0 Refresh file dialog when directory content changes 2016-07-30 11:21:40 +12:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
Seth Alves
8e1820f911 make sure permissions have the correct ID in the case where a user has been verified 2016-07-29 13:10:14 -07:00
Seth Alves
507410af79 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-29 08:14:15 -07:00
Anthony Thibault
8e3bc97ef9 fix for unused variable warnings 2016-07-29 08:10:10 -07:00
Brad Hefta-Gaub
74a3835a1e CR feedback 2016-07-28 15:15:33 -07:00
Anthony Thibault
ea310bcc43 Web Entities now render correctly as well 2016-07-28 14:11:19 -07:00
Anthony Thibault
be6e401e9a Merge branch 'master' into bug-fix/web3doverlay-rendering 2016-07-28 11:20:35 -07:00
Brad Hefta-Gaub
22619a66ba process events also 2016-07-28 10:51:17 -07:00
Anthony Thibault
6b8e912114 Fix for mac and linux builds 2016-07-28 10:02:19 -07:00
Brad Hefta-Gaub
755989b8ff don't allow punished scripts to slow stop or shutdown 2016-07-28 10:01:05 -07:00
Seth Alves
5a96c8bf57 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-27 18:07:29 -07:00
Seth Alves
cd2f61c90c if logging in, send username signature even when connecting to localhost 2016-07-27 14:03:51 -07:00
Seth Alves
bc2ded2f97 code review 2016-07-27 08:46:46 -07:00
Seth Alves
148793011d code review 2016-07-27 07:55:09 -07:00
samcake
afb1ebf42e Revolutionizing ao 2016-07-26 23:19:41 -07:00
Bradley Austin Davis
54a7265be8 Removing empty file, because jenkins 2016-07-26 16:32:56 -07:00
Bradley Austin Davis
a9740b803f Defer batch execution to the end of the frame generation 2016-07-26 16:13:48 -07:00
Bradley Austin Davis
fa20898285 Remove last direct use of gpu::Context::render() 2016-07-26 16:13:22 -07:00
Bradley Austin Davis
bb6abf11d3 FramebufferCache, cleanup & thread safety 2016-07-26 15:32:31 -07:00
Bradley Austin Davis
a455f3a435 Add frame concept to gpu library 2016-07-26 15:25:36 -07:00
Andrew Meadows
5ce681154d Merge pull request #8301 from AlexanderOtavka/asset-browser-ui 
Asset browser ui
 2016-07-26 15:04:10 -07:00
Chris Collins
a13c8385bb Merge pull request #8319 from ZappoMan/punishSlowScripts 
better allocation of CPU time while loading scenes and when slow scripts are running
 2016-07-26 12:54:31 -07:00
Bradley Austin Davis
ac743b6acb PR feedback 2016-07-26 11:55:25 -07:00
Bradley Austin Davis
3962487ee3 Fix depth state caching / resetting 2016-07-26 11:55:25 -07:00
Brad Hefta-Gaub
2d199fe3d0 rename function for better clarity 2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
a12034cb45 fix unix warning, added comments 2016-07-26 07:54:55 -07:00
Brad Hefta-Gaub
83dc9ea6bb punish slow scripts and don't send updates while physics is still loading 2016-07-25 21:46:30 -07:00
Anthony J. Thibault
0a35c13a94 Moved creation of pipeline into call_once block 2016-07-25 16:30:29 -07:00
Anthony J. Thibault
fb84f058d6 Fix alpha cut-outs and incorrect gamma on Web3DOverlays 2016-07-25 15:56:05 -07:00
Seth Alves
e3b4612283 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-25 13:19:13 -07:00
Chris Collins
e1e1ca1c12 Merge pull request #8306 from AndrewMeadows/fix-crash-on-avatar-change 
fix interface crash when chaning avatar models
 2016-07-25 12:11:46 -07:00
Chris Collins
3c9b9aef4f Merge pull request #8304 from ChristophHaag/fixGridShader 
fix grid shader
 2016-07-25 09:47:12 -07:00
Andrew Meadows
1df3b59aa1 change BUG to FIXME 2016-07-24 19:19:35 -07:00
Andrew Meadows
d876251f1e release geometry refs in Model::deleteGeometry() 2016-07-24 19:17:39 -07:00
Brad Hefta-Gaub
c85d6800c3 reduce activity logging spam 2016-07-24 11:44:25 -07:00
Brad Hefta-Gaub
43064807d1 Merge pull request #8292 from jherico/webui 
Fix some UI elements triggered by WebViews
 2016-07-23 13:47:04 -07:00
Brad Hefta-Gaub
f0574282eb Merge pull request #8299 from hyperlogic/bug-fix/no-hips-no-problem 
Prevent avatars with missing "Hips" joints from causing crashes
 2016-07-23 13:44:14 -07:00
Brad Hefta-Gaub
41e02276e5 Merge pull request #8297 from hyperlogic/feature/fst-anim-graph-override 
Support for animGraphUrl override in FST file.
 2016-07-23 13:42:46 -07:00
Brad Davis
85b0440e32 Disable glow lines (and the use of geometry shaders) on non-Windows platforms for now 2016-07-23 11:06:33 -07:00
Andrew Meadows
7280992806 add mutex lock around AvatarData joint data 2016-07-23 10:30:44 -07:00
Christoph Haag
7134d2bfd4 fix grid shader 
this shader is used for example in
developer - audio - audio scope - show scope
 2016-07-23 11:09:16 +02:00
Brad Davis
89d9affb41 Merge remote-tracking branch 'upstream/stable' 2016-07-22 19:47:31 -07:00
David Kelly
3d3a7a8820 Merge branch 'stable' of github.com:highfidelity/hifi into dk/hotfixForAudio 2016-07-22 18:40:06 -07:00
David Kelly
8b8a98bfcc Acutally audio was really broken 
Seems there were 2 issues:
* If you couldn't inject locally (say, no audio interface
  because you are an assignment client), we would not do the
  network injection at all.  That's bad.
* When we don't have a codec, like when using an injector, we
  were serializing the empty string in some problematic way.  I
  just use the built-in serialization, and it seems fine.

I tested this by first playing a sound in the console (or maybe you
want to tip some cows, that is ok too).  Then in _another_ interface
client on another machine in the same domain, I better hear the
sound.

Then, I added a script to play audio as a persistent script, which
just loops forever and ever.  You should hear that on both interface
clients also.

A detailed test plan to follow.

Also: using @zappoman serialization code, which is safer than using
the Qt code which does magical things for nulls.  Good to do this cuz
you know, things happen...
 2016-07-22 18:33:38 -07:00
Chris Collins
a06ef47bb3 Merge pull request #8300 from davidkelly/dk/noACAudioPlus 
Actually audio was really broken
 2016-07-22 18:23:28 -07:00
Seth Alves
9a69361391 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-22 17:52:49 -07:00
Seth Alves
f35b935031 do some cleaning-up of the domain-server settings page group tables 2016-07-22 17:51:31 -07:00
David Kelly
4b48cc7c2e Acutally audio was really broken 
Seems there were 2 issues:
* If you couldn't inject locally (say, no audio interface
  because you are an assignment client), we would not do the
  network injection at all.  That's bad.
* When we don't have a codec, like when using an injector, we
  were serializing the empty string in some problematic way.  I
  just use the built-in serialization, and it seems fine.

I tested this by first playing a sound in the console (or maybe you
want to tip some cows, that is ok too).  Then in _another_ interface
client on another machine in the same domain, I better hear the
sound.

Then, I added a script to play audio as a persistent script, which
just loops forever and ever.  You should hear that on both interface
clients also.

A detailed test plan to follow.

Also: using @zappoman serialization code, which is safer than using
the Qt code which does magical things for nulls.  Good to do this cuz
you know, things happen...
 2016-07-22 17:47:24 -07:00
Zander Otavka
c25b87c33f Use custom dialog for asset server add to world 2016-07-22 17:14:45 -07:00
Zander Otavka
530e17a7e5 Move JSON parsing for custom dialog to be sooner 2016-07-22 17:14:45 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
Chris Collins
e755528cf2 Merge pull request #8278 from sethalves/fix-equip-fly-away 
fix equip fly-away
 2016-07-22 16:47:31 -07:00
Anthony Thibault
3b14988577 Fix another crash if "Hips" joint is not found. 2016-07-22 16:27:43 -07:00
Anthony Thibault
a43e9a5710 Fix for crash on avatars with missing "Hips" joint 2016-07-22 16:00:40 -07:00
Seth Alves
96fd1cb841 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-22 11:40:29 -07:00
Seth Alves
adba4cde0b book-keeping around groups and ranks 2016-07-22 11:40:23 -07:00
James B. Pollack
5202038210 Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor 
Vive HMD fixes to prevent user from becoming embedded in the floor.
 2016-07-22 09:04:40 -07:00
Brad Hefta-Gaub
566e0f5dbf Merge pull request #8287 from AndrewMeadows/fix-simple-compound 
fix bug breaking simple-compound shape type
 2016-07-21 18:18:04 -07:00
Brad Hefta-Gaub
c24472d390 Merge pull request #8290 from howard-stearns/cleanup-heartbeat 
cleanup domain-server heartbeat code
 2016-07-21 18:17:19 -07:00
Anthony Thibault
2429b82b5e Support for animGraphUrl override in FST file. 2016-07-21 17:17:08 -07:00
howard-stearns
b303c6df8e strong type checking my arse 2016-07-21 16:04:12 -07:00
Brad Davis
faba1a4b4e Fix UI elements triggered by WebViews 2016-07-21 15:13:07 -07:00
Brad Hefta-Gaub
bb8224be8c fix silence on no codec after previous codec has been set 2016-07-21 13:57:11 -07:00
Seth Alves
6a94bfe8aa Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-21 09:32:47 -07:00
Anthony Thibault
592a50356b Merge pull request #8211 from highfidelity/skin 
Skin sub-surface lighting
 2016-07-20 15:48:25 -07:00
Andrew Meadows
20eebb90f8 fix build -- remove some accidental changes 2016-07-20 14:08:25 -07:00
Andrew Meadows
3fdfc0db14 fix bug breaking simple-compound shape type 2016-07-20 12:55:13 -07:00
samcake
1c4742e710 Fixing comments from review 2016-07-20 11:02:27 -07:00
samcake
853f31f6ea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-20 10:49:27 -07:00
David Kelly
7b2d5e7fab Potential cause of that buzzsaw when resetting 2016-07-20 10:41:16 -07:00
Seth Alves
c1b27a9249 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-20 10:03:22 -07:00
Andrew Meadows
2afd65467a fix bug where model is not yet ready for col shape 2016-07-19 18:01:22 -07:00
Andrew Meadows
22e7e150fc remove debug cruft 2016-07-19 18:01:06 -07:00
Seth Alves
56726183f6 clear internal bullet flag before switching entity to kinematic 2016-07-19 16:45:57 -07:00
Howard Stearns
0b5cdcef42 Merge pull request #8252 from howard-stearns/suggestions 
suggestions
 2016-07-19 15:46:23 -07:00
Chris Collins
0632f6df2d Merge pull request #8279 from birarda/master 
fix crash with multiple solo nodes in closeCurrentPacket
 2016-07-19 14:57:00 -07:00
Anthony J. Thibault
837b19ed1b fix for pushing avatar into floor when exiting away mode. 
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
  are facing the same direction as the current HMD orientation.

away.js now uses the above new API's instead of MyAvatar.reset()
 2016-07-19 14:42:24 -07:00
samcake
8f663f20e0 FIx warnings 2016-07-19 13:24:03 -07:00
Zander Otavka
acf4539f4f Return a JSON string from QML instead of JS object 
Idk why QML can't return a JS object, but it can't.  Strings work, so I
use a string.
 2016-07-19 13:21:08 -07:00
samcake
7f169b8e4f Adjust qml positions and fix one shader bug 2016-07-19 13:20:19 -07:00
samcake
3e7126f5be Removed reference to LIghtingModel.slh in teh DefereedBufferWrite.slh to avoid side effects 2016-07-19 13:06:26 -07:00
samcake
4742f40128 Separating the normal packing into it s own file and make sure to sclae the filter radius correctly dpeending on the resolution of diffusion 2016-07-19 12:23:57 -07:00
Stephen Birarda
f28f3d7fcf force removal of an old solo node when added new one 2016-07-19 12:02:37 -07:00
Seth Alves
5f6e608207 don't overwrite physical properties with those from the entity during editEntity -- only set those that the script didn't. 2016-07-19 11:23:21 -07:00
samcake
36d58a2b82 Finish the integration of the diffusion pass in the SurfaceGeometryPass job, clean up ui 2016-07-19 10:34:06 -07:00
Brad Hefta-Gaub
1ee5023f6d fix warnings 2016-07-19 08:33:54 -07:00
samcake
ff132fa712 Gathering the diffusion passes in the SUrfaceGEometryPAss job 2016-07-19 02:11:22 -07:00
samcake
3638a3b9c3 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 23:15:21 -07:00
Brad Hefta-Gaub
c484fec51d cleanup 2016-07-18 22:54:57 -07:00
Brad Hefta-Gaub
dbf60a594c Merge branch 'master' of https://github.com/highfidelity/hifi into addCodecNameToStream 2016-07-18 22:43:16 -07:00
Brad Hefta-Gaub
c6ffd81c4b some cleanup 2016-07-18 22:42:38 -07:00
Brad Hefta-Gaub
2e63aba8c9 when getting unexpected codec in the mixer, send a message to the client to select a different codec 2016-07-18 22:29:05 -07:00
Brad Hefta-Gaub
20824f038c include codec in audio stream packets so that each side can discard packets that don't match 2016-07-18 21:59:44 -07:00
Brad Hefta-Gaub
2e491e0afb Merge pull request #8275 from jherico/web_entity_leak 
Cleanup resources used by offscreen GL surfaces
 2016-07-18 21:46:18 -07:00
Brad Davis
cbbb2a7975 Properly delete GL context and offscreen surfaces 2016-07-18 19:47:23 -07:00
Brad Davis
455d890358 Merge pull request #8266 from jherico/texture_free_fix 
Actually delete textures we're not using
 2016-07-18 19:41:35 -07:00
samcake
a8dd06ad38 Better groupint of the diffuseion of the curvature for easier fix for mini mirror 2016-07-18 19:24:43 -07:00
howard-stearns
57955a2b56 Expose protocol version to qml, and use it in query. 2016-07-18 18:12:27 -07:00
samcake
34f2a96888 Adding the check for Obscurrance 2016-07-18 18:11:51 -07:00
howard-stearns
98555be987 Merge branch 'protocol3' of https://github.com/howard-stearns/hifi into suggestions 2016-07-18 18:11:05 -07:00
howard-stearns
abb63139f6 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-18 16:29:49 -07:00
David Kelly
2a89fa25bb Removing comments 
Since I looked into it, seems ok
 2016-07-18 16:22:12 -07:00
David Kelly
df615b1503 NotFinished never should have had its own bit 
Since there is a Finished flag too.  So now, it is just 0, used as
a starting point, and we check for !hasState(Finished).  <sigh>
 2016-07-18 16:02:02 -07:00
howard-stearns
1a66574adb add protocol version signature to metaverse heartbeat 2016-07-18 14:29:49 -07:00
David Kelly
3df373252f Several minor things 
We could only partially fill the _scratchBuffer - .wav files may not
be exactly N frames long.  Doh.

While at it, I needed to call finishLocalInjection() after local
injectors are done, and the access to the injector vector needs to
be locked, given that we do a QtDirectConnection with the networking
and thus the outputLocalInjectors is on a different thread.

The clicking was just 0-ing out the _scratchBuffer.
 2016-07-18 14:00:41 -07:00
Zander Otavka
d75c2e2a6f Merge branch 'master' into edit-model-ui 2016-07-18 13:11:51 -07:00
samcake
80587ca8a3 using the textureGather lookup 2016-07-18 12:52:21 -07:00
samcake
be4839d46c a better depth filter 2016-07-18 12:26:04 -07:00
Brad Davis
0f240d39b6 Actually delete textures we're not using 2016-07-18 11:21:09 -07:00
samcake
a4ad4659c4 Fixing build warnings 2016-07-18 11:17:06 -07:00
David Kelly
a30b631a0a Merge branch 'master' of github.com:highfidelity/hifi into dk/localNoEcho 2016-07-18 11:15:58 -07:00
Seth Alves
180cc90197 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-18 10:54:01 -07:00
samcake
a44aee84ce Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 10:16:55 -07:00
Brad Hefta-Gaub
2cd38064a5 Merge pull request #8235 from jherico/more_shapes 
Support triangle and hexagon shapes, add shape support to overlays.
 2016-07-18 09:05:24 -07:00
samcake
86d9ee56d2 Downsampling shader pass 2016-07-18 03:56:11 -07:00
samcake
5a0ce81516 Performing the curvature generation and diffusion at half the resolution 2016-07-18 03:54:05 -07:00
samcake
378f4576fa a bit better making the curvature and diffusion passes 2016-07-17 20:18:06 -07:00
samcake
cfa51ae1f5 REmoving problematic timers for mac 2016-07-17 18:32:43 -07:00
samcake
9332f82d54 Carrefully improving the curvature generation performances 2016-07-17 17:13:07 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Seth Alves
4d9f5ce777 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-16 07:39:36 -07:00
Brad Hefta-Gaub
dc2741950a Merge pull request #8259 from kencooke/improved-hrtf 
Fix the AudioMixer distance attenuation.
 2016-07-15 22:36:51 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
David Kelly
8c0eb1e4d2 Fixed some bad logic 
When I "fixed" my or instead of and issue, I did it in the wrong
direction.  But it looked right :)  Now it is.  Sigh.  Long story
how it got there, but it seems good now.
 2016-07-15 19:48:15 -07:00
Howard Stearns
d446e1bcf5 Phone home with suggestions activity usage. 2016-07-15 19:15:58 -07:00
Ken Cooke
1ee608ad2c Cleanup 2016-07-15 18:23:12 -07:00
Philip Rosedale
4925980cbb Merge pull request #8255 from jherico/search_circle 
Make search line termination a circle, like 2D UI
 2016-07-15 17:51:50 -07:00
samcake
076b8cd297 Instrumenting the GPU git status 2016-07-15 17:47:54 -07:00
Zander Otavka
c27e1d6fdb Polish dialog behavior and spacing 2016-07-15 17:35:55 -07:00
Zander Otavka
71f62c02fc Add basic implementation of customPrompt 
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
 2016-07-15 17:35:55 -07:00
David Kelly
fb99828e30 PR feedback 
Code a bit more readable.  Sadly (and I guess it makes sense), a
enum class XXX is not a class, so you cannot have member functions
for it.  I can imagine no way to have a vtable if you are really
representing it as a uint8_t or whatever.  So, I put a stateHas
function in the AudioInjector instead.  Definite improvement.
 2016-07-15 17:09:27 -07:00
David Kelly
8df4ed01d9 fixed typo 
which oddly I was sure I already did.  Seems I didn't push it?  OK
now it is pushed.
 2016-07-15 16:22:41 -07:00
Brad Davis
b31300406a Don't extend glow line length 2016-07-15 16:20:05 -07:00
Brad Davis
317dee1b23 Fix decoration inflation 2016-07-15 16:15:53 -07:00
Brad Hefta-Gaub
496f3b14c7 Merge pull request #8205 from AndrewMeadows/model-cache-cleanup 
decouple Geometry from its GeometryResource in ModelCache
 2016-07-15 12:38:46 -07:00
Brad Hefta-Gaub
7bb31fe075 Merge pull request #8240 from jherico/hand_controller 
Menu & hand controller polish
 2016-07-15 12:36:31 -07:00
David Kelly
0fcc427d41 Merge branch 'master' of github.com:highfidelity/hifi into dk/localNoEcho 2016-07-15 11:01:42 -07:00
David Kelly
e1212c54cb Updated to deal with streaming out of both buffers 
So gotta keep track of when finished streaming to network and
locally separately.  That means the State needed to be more of a
bitflag and less of an enum.
 2016-07-15 09:55:50 -07:00
samcake
a3f6ed6a89 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-15 09:22:34 -07:00
samcake
22ac95d463 REvisiting the RangeTimer to measure the real gpu duration 2016-07-15 09:12:16 -07:00
Brad Hefta-Gaub
878a01cbaf Merge pull request #8242 from kencooke/improved-hrtf 
Improved HRTF
 2016-07-15 09:02:15 -07:00
Ken Cooke
2674df6095 Fix the distance-attenuation model (for injectors only) 
The original attenuation model seems wrong, under-attenuating at close distance but completely muting after 45m.

This uses a physics-based model of -6dB per doubling of distance in free space, for the injectors. The AudioMixer model and domain settings still need to be reworked in a future PR.
 2016-07-14 18:34:07 -07:00
samcake
89ec547161 Trying to get the gpu timer to work correctly 2016-07-14 18:20:20 -07:00
samcake
d69be5e4d2 Fixing the default value for the lightingMOdel flag when using debugDeferredLighting 2016-07-14 16:45:56 -07:00
samcake
c45f810622 Fixing the mac build 2016-07-14 16:43:56 -07:00
samcake
776bcb6655 FIxing the web entity rendering 2016-07-14 15:49:49 -07:00
Ken Cooke
d84c7524bf Remove global HRTF headroom. 
The initial HRTF reduced overall gain by -6dB to avoid clipping at spectral peaks. With the addition of a peak limiter, this is no longer necessary. Changing to 0dB improves the loudness match between spatialized and unspatialized sounds.
 2016-07-14 14:56:58 -07:00
Brad Davis
44500889f8 Remove 'updating reverb' logspam 2016-07-14 13:34:56 -07:00
Zach Pomerantz
e71a2097a5 update doc for task template 2016-07-14 13:19:49 -07:00
Zach Pomerantz
e4dabc6be4 fix task config initialization 2016-07-14 13:16:19 -07:00
Seth Alves
8e6b3ed8c2 rename variable to make its use more clear 2016-07-14 12:24:44 -07:00
Brad Davis
882139ebcf Allow scripts to override the navigation focus state set by QML dialogs 2016-07-14 12:10:46 -07:00
samcake
3ab56062d4 Address some warnings and syntax issues 2016-07-14 12:06:02 -07:00
Ken Cooke
fa55fc84f5 Optimized compute of distance filters using log-quantized lookup tables. 
Magnitude error < 0.25dB for entire parameter space.
 2016-07-14 12:04:05 -07:00
Ken Cooke
7a4bdc1779 enable in Interface and AudioMixer, by passing distance between source and listener 2016-07-14 11:30:55 -07:00
Ken Cooke
c7c02d7a59 Fix compiler warning 2016-07-14 11:24:48 -07:00
samcake
a42f9a5d0e FIxing the mini mirror perf issue and the gamma correction 2016-07-14 10:53:13 -07:00