Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 16:32:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45384 commits 75 branches 59 tags 1.2 GiB
Commit graph

18620 commits

Author SHA1 Message Date
David Kelly
8f41b8a5c9 Merge branch 'master' of github.com:highfidelity/hifi into dk/firstLameAttempt 2016-07-13 11:28:10 -07:00
samcake
307243da8b cleaning compilation warnings and tuning the FBX material mapping pass 2016-07-13 11:04:53 -07:00
samcake
2c584f7690 Fixing a bad autoRef usage 2016-07-13 10:34:43 -07:00
samcake
9f91dd5bfc Cleaning the gpu-test app to work with the new deferred pipeline 2016-07-13 10:19:42 -07:00
Andrew Meadows
0d58274028 Merge pull request #8231 from AlexanderOtavka/fix-orientation 
Fix orientation being reset to 0,0,0,1
 2016-07-13 08:44:13 -07:00
Brad Hefta-Gaub
20b7ae2e1b Merge pull request #8222 from AndrewMeadows/better-simple-compound 
simple-compound = wrap each render part of each submesh
 2016-07-12 19:56:04 -07:00
samcake
51594fefa2 more clean up 2016-07-12 18:21:31 -07:00
Brad Hefta-Gaub
c4dba51337 Merge pull request #8226 from jherico/2d_glow 
Add glow to UI hand lasers and termination points
 2016-07-12 16:21:19 -07:00
Zander Otavka
87ba1ffeca Fix orientation being reset to 0,0,0,1 2016-07-12 16:20:01 -07:00
Brad Hefta-Gaub
b8d79ec263 Merge pull request #8179 from SamGondelman/snapshotFix3 
Various snapshot improvements
 2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
819cab4aab Merge pull request #8158 from sethalves/raypick-avatars 
Raypick avatars
 2016-07-12 15:27:30 -07:00
Brad Hefta-Gaub
84dfe1b0e9 Merge pull request #8219 from jherico/circles 
Support alpha and color gradients in circle overlays
 2016-07-12 15:25:49 -07:00
samcake
cde17ecaab Clenaing the rendering and the framebuffer allocations 2016-07-12 14:34:54 -07:00
David Kelly
3955e03aa2 Fix for build error 
doh!
 2016-07-12 12:15:12 -07:00
Atlante45
7a7b64e87d Use domain ID in the stream 2016-07-12 11:43:46 -07:00
Atlante45
a7d631b7e1 Revert packet version change 2016-07-12 11:43:31 -07:00
Atlante45
1a91a8e20a Make DomainList a sourced packet 2016-07-12 11:39:16 -07:00
Clément Brisset
2f07f0d24f Revert "Revert "Fix crash in packet list"" 2016-07-12 11:39:16 -07:00
Brad Hefta-Gaub
71b6210c4e removed some log spam 2016-07-12 10:18:37 -07:00
Brad Davis
6242816f68 Adding glow to hand lasers 2016-07-12 10:10:01 -07:00
Brad Davis
0efc684992 Add glow to the termination point of UI pointers 2016-07-12 10:10:00 -07:00
samcake
5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-12 09:19:28 -07:00
samcake
9e95dbc914 Merge branch 'skin' of https://github.com/highfidelity/hifi into skin 2016-07-12 09:18:58 -07:00
samcake
504e9f154c Less comments 2016-07-12 09:18:02 -07:00
samcake
e0993c593b BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore 2016-07-11 18:34:18 -07:00
samcake
ba7590712a BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore 2016-07-11 18:33:57 -07:00
Seth Alves
85cc5f8956 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-11 18:02:18 -07:00
Brad Hefta-Gaub
e32929dce2 added support for material map in FST file 2016-07-11 17:40:07 -07:00
Brad Hefta-Gaub
ceffa219b3 support for lost packets 2016-07-11 15:18:02 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769 
CR for Job #20769 - Touchscreen camera input for Interface
 2016-07-11 14:24:52 -07:00
Brad Hefta-Gaub
125aa6b337 make zlib and pcm codecs not actually allocate encoder/decoders 2016-07-11 14:21:32 -07:00
Brad Hefta-Gaub
743576134f fix warnings 2016-07-11 13:38:08 -07:00
Brad Hefta-Gaub
f3f72f3c93 Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-11 13:15:27 -07:00
David Kelly
c84ef5f626 Stereo injectors now handled same as mono 
Except of course no HRTF.
 2016-07-11 11:31:47 -07:00
samcake
0e99a4ac97 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-11 10:49:28 -07:00
David Kelly
4f80c77b77 PR feedback 
simple enough - not sure why I had an issue with this in the first
place.
 2016-07-11 10:36:55 -07:00
David Kelly
46dc5bea04 cleanup from PR comments 2016-07-11 09:31:05 -07:00
David Kelly
80d33ee251 Working now as frame-at-a-time 
So localOnly sounds get HRTF'd, one network frame at a time.  Less
processing (upsampling, limiting, etc...) than doing this at the
end of the pipeline (in the AudioOutputIODevice::readData call).
 2016-07-11 09:11:23 -07:00
Brad Hefta-Gaub
7d608ba592 groundwork for injector support 2016-07-10 21:01:20 -07:00
Brad Hefta-Gaub
ed9715ae5f some cleanup, proper memory allocation/deallocation 2016-07-10 17:40:58 -07:00
Brad Hefta-Gaub
ba6bb24595 rework plugins to allow different decoder/encoder instances per streams 2016-07-10 16:49:03 -07:00
Seth Alves
dbf887fc34 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-10 09:45:17 -07:00
Andrew Meadows
72175ae09e fix warnings about implicit casts 2016-07-09 22:55:55 -07:00
Andrew Meadows
207ddcea38 wrap hull about each mesh part 2016-07-09 22:25:28 -07:00
Brad Davis
2c72037e81 Fixing warnings 2016-07-09 20:43:31 -07:00
Brad Davis
31948bce2d Support alpha and color gradients in circle overlays 2016-07-09 20:43:30 -07:00
Brad Hefta-Gaub
a71baf5601 handle codec prioritization, handle multiple codec choices 2016-07-08 21:18:03 -07:00
Clément Brisset
d933238bda Revert "Fix crash in packet list" 2016-07-08 18:15:14 -07:00
samcake
2fbdb22493 Cleaning up the lighting with the simpler approach where emissive and lightmap is displayed on forward 2016-07-08 18:14:05 -07:00
Seth Alves
5c69e55475 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-08 17:43:52 -07:00
Atlante45
f0fcb94a6a Typos 2016-07-08 16:00:34 -07:00
Atlante45
b665f38c1f Don't process DomainList packets from 2 DS 
case 1037
 2016-07-08 15:16:41 -07:00
Atlante45
70cf25bd8b Add missing read locks to LimitedNodeList's hash 2016-07-08 15:15:58 -07:00
Brad Hefta-Gaub
126e5c2926 codec pipeline working, zlib example 2016-07-08 14:34:44 -07:00
David Kelly
bc7123d701 comment out logging for now 2016-07-08 13:59:49 -07:00
David Kelly
c15ba90980 Merge branch 'master' of github.com:highfidelity/hifi into dk/firstLameAttempt 2016-07-08 13:04:20 -07:00
David Kelly
7a9b3978e9 Better processing of audio 
A couple things Ken suggested.  First off, there are now AudioSRC
calls for floats, which simplfied stuff a bit.  Then, I switched to
grabbing network packets first, and only pulling at most that amount
of audio from the local injectors.  That improves things - the
occasional artifacts (when the injectors got more data than the
network for instance) are gone.

Also, fixed build issue (unused variable warning) for mac and android.
 2016-07-08 13:01:06 -07:00
Brad Hefta-Gaub
d78eb19e44 Merge pull request #8194 from jherico/glow_lines 
Support for glowing 3D line overlays
 2016-07-08 12:50:35 -07:00
Brad Davis
ae1dd29a7a Fix depth writing for glow lines 2016-07-08 10:27:53 -07:00
Seth Alves
03f8ce1c49 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-08 09:36:30 -07:00
samcake
ed67fe4051 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-08 09:04:40 -07:00
samcake
37f7596183 Trying to unify the shaders with/without scattering eve more but found a scribe bug. REnder emissive and lightmap during forward pass 2016-07-08 09:04:10 -07:00
Brad Hefta-Gaub
5f71f77445 Merge pull request #8192 from AndrewMeadows/simple-hull-shapes 
experimental ModelEntityItem collision shape options (no visual debugging)
 2016-07-08 08:55:11 -07:00
Brad Hefta-Gaub
3c6447326e more codec plumbing 2016-07-07 21:24:24 -07:00
samcake
fff2a9a5a2 REfactoring the shading functions interface to account for scattering 2016-07-07 21:16:28 -07:00
Brad Davis
ba8660ff28 Merge pull request #8212 from samcake/skin 
One less warning
 2016-07-07 19:51:59 -07:00
Brad Davis
c644c87e69 Fix glow line vanishing, improve transparency interaction 2016-07-07 19:01:41 -07:00
samcake
fa62a0a73c One less warning 2016-07-07 18:05:36 -07:00
Brad Hefta-Gaub
70e068ddb7 Merge pull request #8210 from samcake/skin 
Skin
 2016-07-07 17:18:02 -07:00
Seth Alves
11542aeca2 pick against avatar's capsule and then against the T-pose mesh 2016-07-07 16:36:25 -07:00
samcake
5827993125 Fixing warnings 2016-07-07 16:30:10 -07:00
David Kelly
6cc085b48e Merge branch 'master' of github.com:highfidelity/hifi into dk/firstLameAttempt 2016-07-07 16:15:20 -07:00
David Kelly
600348bf10 Initial cut of htrf for mono localOnly injectors 
Probably need to clean up a bit, but wanted to get this out there
for comment on more general issues, etc...

To test, I added a localOnly: true to the cow in the tutorial.
 2016-07-07 16:07:41 -07:00
samcake
1eb4acf815 Unifying the lighting pass for scaterring and not 2016-07-07 15:41:00 -07:00
Brad Davis
8ca3630cfa Support glow effect in 3D line overlays 2016-07-07 13:36:48 -07:00
Brad Davis
790f74da1d Support geometry shaders 2016-07-07 13:36:47 -07:00
Andrew Meadows
e4828b03b1 fix crash when building shape before model loaded 2016-07-07 13:32:30 -07:00
Brad Hefta-Gaub
6e724d246a Merge pull request #8200 from jherico/batch_cache 
Batch optimizations
 2016-07-07 12:26:49 -07:00
Brad Davis
b73fe24848 PR feedback 2016-07-07 11:12:55 -07:00
Brad Davis
eff1c65388 Reduce the number of temporary objects in batch commands 2016-07-07 11:12:55 -07:00
Brad Davis
721cd79b57 Aggressive batch pre-allocation 2016-07-07 11:12:54 -07:00
Brad Davis
c7382ea886 Optimize updateModelBounds 2016-07-07 11:11:26 -07:00
Seth Alves
6786a07ac2 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-07 09:53:24 -07:00
Brad Hefta-Gaub
ac2d3e1cc7 Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-07 09:47:19 -07:00
Brad Hefta-Gaub
abcd1e0062 Merge pull request #8164 from SamGondelman/macHMDPreview 
Added Mac preview image if VSync is enabled
 2016-07-07 09:01:40 -07:00
Brad Davis
5220b52cd9 Don't trigger entity scripts without scripting interface 2016-07-06 18:13:15 -07:00
SamGondelman
d05a27e0e6 embed image locally 2016-07-06 17:27:53 -07:00
samcake
8f2bf2b423 Integrating the scattering to the local lights 2016-07-06 17:13:16 -07:00
Seth Alves
55d76abf48 back-out accidently changed api urls 2016-07-06 16:42:31 -07:00
Seth Alves
e6f456f494 each rank in a group has its own permissions 2016-07-06 16:39:08 -07:00
Andrew Meadows
3c4f9f8016 refert debug hack 2016-07-06 15:51:17 -07:00
Andrew Meadows
15ff7bc731 final hack tweak 2016-07-06 14:35:57 -07:00
Andrew Meadows
301a9f4434 improved hack logging 2016-07-06 14:31:43 -07:00
Andrew Meadows
11ef245671 temp hack for debugging 2016-07-06 14:28:09 -07:00
Brad Hefta-Gaub
9333c7dcca Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-06 13:26:19 -07:00
Andrew Meadows
5659d57ac3 fix shape generation for SIMPLE_COMPOUND 2016-07-06 13:00:57 -07:00
Andrew Meadows
6cbc566a77 remove debug cruft 2016-07-06 11:53:26 -07:00
Andrew Meadows
92af849204 bump version for new shape types 2016-07-06 10:52:01 -07:00
Andrew Meadows
97fc5ac3b8 construct Bullet shapes for new shape types 2016-07-06 10:51:28 -07:00
Andrew Meadows
33d732c446 construct geometry for new shape types 2016-07-06 10:51:15 -07:00
Andrew Meadows
431043e195 declare new shape types 2016-07-06 10:50:51 -07:00
Seth Alves
4a9f928429 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-06 10:25:24 -07:00
samcake
66b65391a4 Cleaning up the lighting equations 2016-07-05 18:21:49 -07:00
Andrew Meadows
a9dd2c7015 Merge pull request #8172 from sethalves/fix-issue-8159 
fix canRezTmp logic (incorrectly) resets valid lifetimes to the maximum value
 2016-07-05 14:47:05 -07:00
samcake
16c5a085d8 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-05 10:50:04 -07:00
Clément Brisset
7c0879d919 Merge pull request #8183 from humbletim/fix-typedarrays 
fix TypedArray byte ordering and .subarray indexing
 2016-07-05 10:00:15 -07:00
Brad Hefta-Gaub
372f8245e6 Merge pull request #8162 from SamGondelman/snapshotFix 
Snapshot takes picture of HMD window instead of preview
 2016-07-05 09:25:59 -07:00
Seth Alves
669df1b6b7 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-04 10:20:30 -07:00
Seth Alves
2a25f458fc fetch rank names from web api after getting a group's ID 2016-07-04 10:20:25 -07:00
Ken Cooke
f43c6447e1 remove unneeded #pragma 2016-07-03 11:46:23 -07:00
Ken Cooke
014f6fa259 PR feedback: better naming of convertInput() and convertOutput() 2016-07-03 11:40:32 -07:00
Ken Cooke
f7c9957bb1 PR feedback: better naming of convertInput() and convertOutput() 2016-07-03 11:33:05 -07:00
Seth Alves
c7793845cb Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-03 09:57:17 -07:00
humbletim
b7874116b9 fix TypedArray byte ordering and .subarray end indexing 2016-07-02 23:36:08 -04:00
Seth Alves
5ab82cd7c8 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-02 15:11:59 -07:00
Ken Cooke
941067b9d0 Added floating-point audio reverb 2016-07-02 07:25:04 -07:00
Ken Cooke
ad8f17a142 Add support for deinterleaved float-point audio (native format) 2016-07-01 19:29:43 -07:00
Ken Cooke
d3c006b5da Added floating-point audio resampler 2016-07-01 18:50:53 -07:00
samcake
2a52f1db7f Adding the lighting model class to configure accross the jobs the lighting 2016-07-01 18:36:51 -07:00
Stephen Birarda
e784d7c400 Merge pull request #8170 from huffman/fix/multiple-sessions 
Fix multiple sessions being created for some users
 2016-07-01 16:41:56 -07:00
samcake
9281b28d43 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-01 13:39:12 -07:00
SamGondelman
218b26b521 removed snapshot share dialog, ctrl s shouldn't leave you moving 2016-07-01 10:58:55 -07:00
Sam Gondelman
a39376e490 Merge pull request #8174 from jherico/overlay_lighting 
Don't render wire geometry with lighting effects
 2016-07-01 10:03:19 -07:00
samcake
9a604d0ede Bringing Beckmann specular to the lighting 2016-06-30 19:03:24 -07:00
Howard Stearns
ae54399177 Merge pull request #8168 from jherico/qml_window_signal 
Allow scripts to receive a visibility changed signal from their windows
 2016-06-30 16:50:07 -07:00
Seth Alves
aae42e3802 updates to track zach's changes to api 2016-06-30 16:14:46 -07:00
Brad Davis
b7926b8582 Don't render wire geometry with lighting effects 2016-06-30 16:11:05 -07:00
Seth Alves
b9f9b18083 if an edit packet doesn't include a change to lifetime, don't attempt to cap the lifetime 2016-06-30 15:41:58 -07:00
Ryan Huffman
dd73f0c333 Remove unused header from AccountManager.h 2016-06-30 14:50:29 -07:00
Ryan Huffman
49da7d9a61 Remove sending of session id in request body in favor of header 2016-06-30 14:43:27 -07:00
Ryan Huffman
38776fe007 Fix multiple sessions being created for some users 
If a user didn't have send-data activated they don't have their session id
sent in the header of requests, but instead send it inside the request
body. The session id being send in the request included curly braces which
the server considers invalid.
 2016-06-30 14:35:27 -07:00
Brad Davis
7b0b56d793 Merge pull request #8157 from jherico/qml_fixes 
HMD UI Fixes
 2016-06-30 13:26:57 -07:00
Brad Davis
1f451269cd Allow scripts to receive a visibility changed signal from their windows 2016-06-30 13:22:01 -07:00
Sam Gondelman
fcb7652c8f Merge pull request #8155 from AndrewMeadows/cap-static-mesh-vertex-count 
Cap static mesh vertex count
 2016-06-30 11:09:49 -07:00
Sam Gondelman
aaa33bab98 Merge pull request #8080 from birarda/api-recheck-on-fail 
simplify domain connection refusal dialog checking
 2016-06-30 11:07:43 -07:00
SamGondelman
057fc8adce endable blending 2016-06-30 10:25:49 -07:00
SamGondelman
be102ba926 remove unused variable 2016-06-30 10:05:57 -07:00
samcake
ab21a5a5d5 FIxing the bad brdf and adding better debug tool and better Pipeline architecture 2016-06-29 18:59:06 -07:00
Seth Alves
408a77dd13 merge from upstream 2016-06-29 18:49:33 -07:00
SamGondelman
40d584021a replace old code completely, removed unnecessary blit 2016-06-29 18:09:46 -07:00
Seth Alves
5f9c7b6ea5 trying to take joint information into account when raypicking against models 2016-06-29 17:02:49 -07:00
Seth Alves
98df2770a1 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-06-29 16:18:44 -07:00
SamGondelman
335ed667bb dk2 snapshot takes picture of HMD window 2016-06-29 16:05:17 -07:00
SamGondelman
15d09bb4fa cleanup, fixed texture corruption bug 2016-06-29 13:33:33 -07:00
Seth Alves
d53c7ae5d8 experimenting 2016-06-29 12:39:04 -07:00
SamGondelman
af2a0ed924 preserve preview aspect ratio, fix device pixel ratio scaling 2016-06-29 11:02:43 -07:00
samcake
b37df393e2 Merging with the new GL45Backend 2016-06-29 10:40:28 -07:00
Brad Davis
5a9be817df PR comments 2016-06-29 10:28:55 -07:00
Triplelexx
9b993b2665 store pointer to event->window()->screen() 
save the planet!
 2016-06-29 03:58:17 +01:00
Triplelexx
2c56d29a68 git add seemed to miss a change 
use event window, not primaryScreen
 2016-06-29 03:47:20 +01:00
Triplelexx
97e90ed798 TouchscreenDevice DPI scaling now handled via JSON mapping 
do the arbitrary scaling in the mapping file
 2016-06-29 03:45:54 +01:00
Brad Davis
f93a91a97f Abandon seperate vertex formats for now 2016-06-28 19:18:16 -07:00
Brad Davis
542601fd9d Fix invalid GL 4.5 calls 2016-06-28 18:56:25 -07:00
Brad Davis
ab7fed1af8 Switch back to disable GL 4.5 by default, add support for logging when enabled 2016-06-28 18:56:25 -07:00
Brad Davis
a41de3a60d Making GL 4.5 enabled by default, adding logging 2016-06-28 18:55:26 -07:00
Brad Davis
8b56444dde Fix crash in GL45 buffer re-allocation 2016-06-28 18:55:25 -07:00
Brad Davis
b16812aa4d Adding GL 4.5 backend 2016-06-28 18:55:24 -07:00
Brad Davis
21d2c977a3 Remove roll from cursor in HMD 2016-06-28 18:30:07 -07:00
SamGondelman
a741ae5069 moved _firstPreview after download 2016-06-28 17:43:15 -07:00
samcake
7f5e22d0eb Post tuesday review, clean up 2016-06-28 17:20:24 -07:00
SamGondelman
55c5d53640 fixed signal 2016-06-28 16:58:42 -07:00
Seth Alves
224008afd6 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-06-28 16:56:27 -07:00
Andrew Meadows
74781c0786 boxify static meshes with too many vertices 2016-06-28 16:36:10 -07:00
Andrew Meadows
e538625fe0 fix warning about convex hull vertex count cap 2016-06-28 16:35:32 -07:00
SamGondelman
a82930cb7a cleanup 2016-06-28 15:59:58 -07:00
Brad Davis
b45ed7f959 Merge remote-tracking branch 'upstream/stable' into stable-merge 2016-06-28 15:09:00 -07:00
SamGondelman
12b5cccfc7 merge from master 2016-06-28 14:05:43 -07:00
SamGondelman
8f0d966810 working on enabling preview image 2016-06-28 13:53:57 -07:00
samcake
d128af48db Fix the curvature issue in stereo by evaluating in the mono clip space, not stereo. INtegrate the scattering in simple ambient without IBL 2016-06-28 13:47:55 -07:00
Zach Pomerantz
c62967a57b add secs per hour 2016-06-28 12:38:00 -07:00
Stephen Birarda
18a1f74c37 remove unused boolean for signalling protocol mismatch 2016-06-28 10:32:43 -07:00
Seth Alves
5e7e6d2f3e Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-06-28 09:57:58 -07:00
Triplelexx
efdee523fb coding standard fix and renaming 2016-06-28 17:57:38 +01:00
Seth Alves
4e70e8ed42 js call to ray-pick against avatars 2016-06-28 09:55:49 -07:00
Andrew Meadows
e4329cc8de Merge pull request #8137 from AlexanderOtavka/add-entity 
Fix bugs with Entities.addEntity
 2016-06-28 09:54:09 -07:00
Seth Alves
a4b4e9c5f7 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-06-28 09:45:54 -07:00
Triplelexx
cc6dca853c change TouchScreenDevice based on CR feedback 
* device support is based on detection of QTouchDevice::TouchScreen
* DPI scale is calculated using the screen that generates the touch
event
 2016-06-28 16:47:13 +01:00
Brad Davis
8561581ab2 Merge pull request #8121 from SamGondelman/miniMirrorFix 
Mini mirror/multi-monitor bug fixes
 2016-06-27 22:04:39 -07:00
samcake
197d49fc03 introducing the depth aware blur 2016-06-27 17:04:37 -07:00
Seth Alves
d4cc4bf1e4 represent node permissions as a bitfield rather than a list of bools 2016-06-27 14:55:13 -07:00
Brad Hefta-Gaub
7a4b11ee97 more work on codecs 2016-06-27 13:06:19 -07:00
Triplelexx
480b1a1263 extra line in KeyboardMouse Device 
there's 2 blank lines at the end of the file
 2016-06-27 21:06:06 +01:00
Triplelexx
aae3555b63 update TouchscreenDevice 
* fix threading issue with zoom gesture
* KeyboardMouseDevice touchpad disabled to prevent interference
* device supported based on QTouchDevice::devices().count()
 2016-06-27 21:01:06 +01:00
SamGondelman
0bfe3ea817 added support for disabling vsync on macs, but doesn't work with the rift 2016-06-27 11:34:44 -07:00
samcake
938bc77b1f Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-27 10:13:00 -07:00
Seth Alves
c7d56493b1 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-06-27 10:07:38 -07:00
Howard Stearns
de7738e644 Merge pull request #8134 from highfidelity/vive-ui 
Vive UI bug fixes
 2016-06-24 18:39:06 -07:00
samcake
9bc8441c73 Friday night build, working on getting the LUT generated on the GPU 2016-06-24 17:50:43 -07:00
samcake
a619a142ed Friday night build, working on getting the LUT generated on the GPU 2016-06-24 17:48:40 -07:00
Zander Otavka
a4da63c1ff Fix bug with Entities.addEntity returning bad id 
If addEntity failed for whatever reason (eg. lack of permission), it
would return a non-null UUID.

Fixes [FogBugz case #365](https://highfidelity.fogbugz.com/f/cases/356/Entities-addEntity-can-return-a-UUID-even-when-unsuccessful).
 2016-06-24 16:39:57 -07:00
Zander Otavka
2786061d71 Fix bug with entity adding w/o permission 
Entities could be added to the local tree, but be rejected by the server
because of a lack of permissions.
 2016-06-24 16:34:54 -07:00
Sam Gondelman
3c809ef40c Merge pull request #8123 from AlexanderOtavka/first-person-hmd 
Automatically enter first person when in HMD mode
 2016-06-24 15:58:38 -07:00
Ken Cooke
36ebe4a4f6 Merge pull request #8125 from ZappoMan/simplifyResamplerUse 
cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler
 2016-06-24 15:43:04 -07:00
Brad Hefta-Gaub
2e8f6c2cc6 Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject 
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
 2016-06-24 14:08:29 -07:00
Seth Alves
ead6e476a9 add a list of blacklist groups which remove permissions rather than grant them 2016-06-24 14:03:43 -07:00
Brad Hefta-Gaub
4bc6a3fb3b Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-06-24 12:54:55 -07:00
howard-stearns
6a1dd235c9 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-24 12:49:54 -07:00
samcake
61f5088ef3 Merge pull request #8130 from jherico/qml_window_visibility 
Fix initial visibility of QML windows from scripts
 2016-06-24 12:42:17 -07:00
Brad Hefta-Gaub
4510bb1674 Merge pull request #8098 from zzmp/feat/temp-domain-heartbeats 
add heartbeats to metaverse for temporary domains
 2016-06-24 12:08:37 -07:00
Zander Otavka
d45694836f Add signal for display mode change in HMD 2016-06-24 11:57:12 -07:00
Brad Davis
a095da31fd Fix initial visibility of QML windows from scripts 2016-06-24 11:48:55 -07:00
Seth Alves
cc1b6f0cb2 add a permissions-grid row for friends-of-domain-owner 2016-06-24 11:42:56 -07:00
samcake
ec68eba3cb Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-24 09:37:52 -07:00
samcake
e95a31f760 CLeaning up and debugging the splotch 2016-06-24 09:18:04 -07:00
Triplelexx
8928854820 lost change 2016-06-24 05:20:47 +01:00
Triplelexx
6542604d13 resolve conflicts with TouchscreenDevice 
updated to master
 2016-06-24 05:19:28 +01:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
d7bffc3eab first cut at negotiating codecs 2016-06-23 17:14:41 -07:00
samcake
884b9211c6 Curvature is looking correct now without artefact, moving on to the lighting 2016-06-23 17:13:48 -07:00
howard-stearns
f8391f0062 fix reticle bugs 2016-06-23 16:51:15 -07:00
Seth Alves
c4b0f1899e merge from upstream 2016-06-23 13:26:01 -07:00
Seth Alves
2fd38c1585 when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree 2016-06-23 13:10:15 -07:00
Brad Hefta-Gaub
da74114b32 Merge pull request #8070 from AndrewMeadows/triangle-soup-4 
support btBvhTriangleMeshShape for static mesh entities
 2016-06-23 12:17:32 -07:00
Brad Hefta-Gaub
6111e4952a fix comments 2016-06-23 10:59:26 -07:00
Brad Hefta-Gaub
be37921845 first cut at codec plugins 2016-06-23 10:42:02 -07:00
Andrew Meadows
1d8d1240ca remove override to avoid new Jenkins OSX warnings 2016-06-23 10:38:46 -07:00
Seth Alves
03b55e6a64 Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject 2016-06-23 10:33:31 -07:00
Brad Hefta-Gaub
c0be9aec6a cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler 2016-06-23 10:28:29 -07:00
Stephen Birarda
f9b3165350 use a QSet instead of a QStringList 2016-06-23 09:37:17 -07:00
Stephen Birarda
7307bc6a1b revert to domain connection refusal check with string 2016-06-23 09:27:17 -07:00
samcake
3ec14fd746 MErging and still trying to understand the curvature isssue 2016-06-22 18:06:55 -07:00
howard-stearns
581d87d653 feedback re magic numbers and variable name. 2016-06-22 16:40:10 -07:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
Andrew Meadows
e5b89ebd17 bump version number 2016-06-22 15:33:44 -07:00
Andrew Meadows
8009d23f70 more STATIC_MESH and dynamic overlap prevention 2016-06-22 15:20:45 -07:00
Zach Pomerantz
eebf8e91c6 add api_key to domains/public_key updates 2016-06-22 12:02:35 -07:00
Zach Pomerantz
3a36b0a2e5 add temporary domain info to account info 2016-06-22 12:02:35 -07:00
Seth Alves
c62b73bf61 when the entity-server caps a lifetime of an edit from a tmp-rez only interface, bump the lastEdited time forward so that the interface accepts the change back into its local tree 2016-06-22 11:42:57 -07:00
Seth Alves
fbfb6f169b Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject 2016-06-22 10:02:12 -07:00
howard-stearns
e4dbb5e61a Make mouse reticle be perpendicular to head. 2016-06-22 09:57:38 -07:00
Andrew Meadows
e88b264864 revert compound hull shape generation 2016-06-22 09:30:44 -07:00
Ryan Huffman
847685d224 Add tracking of away.js 2016-06-22 09:06:59 -07:00
samcake
90e5697940 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-22 09:06:47 -07:00
Ryan Huffman
890de1bfea Add went-to user activity back in 2016-06-22 08:54:58 -07:00
Ryan Huffman
a7f30ced29 Fix infinite recursion in PluginManager 2016-06-21 21:39:40 -07:00
samcake
bd28498833 trying to fix the curvature artefact 2016-06-21 18:25:02 -07:00
SamGondelman
78a1845afe fixed resizing of qml overlays when device pixel ratio changes 2016-06-21 18:13:11 -07:00
howard-stearns
d6095d1f11 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 16:52:22 -07:00
Seth Alves
9ca27f267d cap lifetime rather than reject edits from nodes which only have tmp-rez rights 2016-06-21 16:48:04 -07:00
Ryan Huffman
4e52521f8c Update UserActivityLogger device blacklist 2016-06-21 16:43:16 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
Ryan Huffman
da71fcb57f Update connected device detection implementation 2016-06-21 16:37:58 -07:00
Brad Hefta-Gaub
d9e8026cd6 Merge pull request #8113 from AndrewMeadows/fix-kinematic-motion 
fix setting velocity of inactive kinematic RigidBody
 2016-06-21 16:32:04 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
Andrew Meadows
702e83ba6a prevent incompatible entity properties combos 2016-06-21 14:03:21 -07:00
Andrew Meadows
4c9ec7ca43 protect physics against bad entity properties 2016-06-21 13:55:11 -07:00
Andrew Meadows
937bd0c1be SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH 2016-06-21 13:54:21 -07:00
Ryan Huffman
0ea9c5c26d Fix getMemoryInfo not returning false on non-Windows 2016-06-21 13:32:17 -07:00
Ryan Huffman
6c2c7f1eec Fix connected_device user activity event 2016-06-21 13:28:40 -07:00
Brad Hefta-Gaub
160a5de271 CR feedback 2016-06-21 12:49:42 -07:00