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

18661 commits

Author SHA1 Message Date
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
Ken Cooke
d7399f5781 Improved HRTF. 
Adds a distance filter to model the frequency-dependent attenuation of sound propagation in open air.
Optimized using SIMD and computing all biquads in parallel. Performance impact is almost zero.
Filter updates are continuously interpolated and clean to -90dB.

Not enabled yet (distance hardcoded to 0.0f)
 2016-07-14 10:34:42 -07:00
Brad Davis
091e798267 Make hand pointer lasers 'click' on fully pressing and clicking the vive controller 2016-07-14 10:30:35 -07:00
Seth Alves
3e35b39e3b Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-14 09:38:02 -07:00
samcake
b9a2b2778e Adding the support for the subregion in the blur passes to apply it correctly to mini mirror 2016-07-13 18:53:37 -07:00
samcake
f6671b34fa Fix the transformation problem for rendering the mini mirror (scattering is still screwed though) 2016-07-13 18:26:53 -07:00
samcake
219b41e813 Fix the mini mirror perf issue and improve the debugDeferredLighting script 2016-07-13 17:37:35 -07:00
Chris Collins
1c6b5e89ac Merge pull request #8239 from ZappoMan/codecPlugins 
fix razor blades in your ears when switching between domains with no codecs installed
 2016-07-13 17:25:47 -07:00
Chris Collins
ff2d7addd7 Merge pull request #8232 from birarda/ignore 
add a script to ignore other avatars
 2016-07-13 17:10:49 -07:00
Brad Hefta-Gaub
a267843e3e fix razor blades in your ears when switching between domains with no codecs installed 2016-07-13 16:37:30 -07:00
David Kelly
dde4d16759 Merge branch 'master' of github.com:highfidelity/hifi into dk/firstLameAttempt 2016-07-13 15:15:35 -07:00
Andrew Meadows
cba49be9ea fix compile bug 2016-07-13 15:13:35 -07:00
Andrew Meadows
c106f4c3a0 fix crash for null pointer 2016-07-13 15:13:35 -07:00
Andrew Meadows
3e43859139 setCollisionModelURL() more symmetric with setURL() 2016-07-13 15:13:35 -07:00
Andrew Meadows
4bebb682dc namechange: fetchResource --> getGeometryResource 2016-07-13 15:13:35 -07:00
Andrew Meadows
c50d41c532 finish name changes as per PR feedback 2016-07-13 15:13:35 -07:00
Andrew Meadows
25fdea6bac fix for change of API after rebase 2016-07-13 15:13:35 -07:00
Stephen Birarda
30f55418db only prepare packet list packets if they need a message number 2016-07-13 15:06:31 -07:00
Stephen Birarda
cc9b72daa4 fix seeking in packet, use nodeActivated for ignore list send 2016-07-13 15:06:31 -07:00
Stephen Birarda
b68958317a re-send ignore requests when mixers are re-added 2016-07-13 15:06:31 -07:00
Stephen Birarda
07c1777485 push the packet version for NodeIgnoreRequest 2016-07-13 15:06:31 -07:00
Stephen Birarda
39c7805ca2 don't process packets for ignored avatars 2016-07-13 15:06:31 -07:00
Stephen Birarda
609900f246 move ignore set handling to NodeList 2016-07-13 15:06:31 -07:00
Stephen Birarda
6b6513d5f9 immediately fade out ignored avatars 2016-07-13 15:06:31 -07:00
Stephen Birarda
d5af323057 don't self-ignore from UsersScriptingInterface 2016-07-13 15:06:31 -07:00
Stephen Birarda
095bd7e6c8 cleanup logging, move packet parsing to mixers 2016-07-13 15:06:31 -07:00
Stephen Birarda
441b6d2813 fix recursive mutex lock, conditional, logging 2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6 add a scripting interface to ignore users 2016-07-13 15:06:31 -07:00
Stephen Birarda
a134ac72de add packet type and plumbing for node ignore 2016-07-13 15:06:31 -07:00
Andrew Meadows
9f7d2cf263 NetworkGeometry --> GeometryResourceWatcher 
Model class gets render and collision geometries with watchers
also changed names for readability
 2016-07-13 15:00:12 -07:00
Andrew Meadows
f6681d4b3d remove unused cruft 2016-07-13 15:00:12 -07:00
Seth Alves
f47b5120bc Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-13 14:48:28 -07:00
Seth Alves
0e86be8660 use dev metaverse 2016-07-13 14:48:23 -07:00
Brad Hefta-Gaub
f8910d475e Merge pull request #8225 from ZappoMan/codecPlugins 
Audio codec plugins
 2016-07-13 14:47:03 -07:00
Seth Alves
6cf16f7a25 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-13 13:07:02 -07:00
samcake
8acc18ae8b Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-13 11:42:07 -07:00
David Kelly
c951f507e3 Fixed issue with calling setOptions 
Since the stereo option is computed from the .wav file, if you call
setOptions later (like the cow.js does), it resets stereo to false.
So, I now just copy the stereo flag into the new options, since the
sound file is the same.

Also, calling AudioClient::outputLocalInjector on the AudioClient
thread now to avoid potential concurrency issues accessing the
vector of injectors.
 2016-07-13 11:28:36 -07:00
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