samcake
8acc18ae8b
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-13 11:42:07 -07:00
Brad Hefta-Gaub
9c441d8946
Merge pull request #8233 from samcake/skin
...
Skin
2016-07-13 11:29:27 -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
3aa0ec8900
Merge pull request #8229 from jherico/hmd_frame_resize
...
Expand frame decoration when mouse is over a window in HMD mode
2016-07-12 18:05:27 -07:00
Ryan Huffman
fcd59ea94f
Update target number of processing threads to be based on system
2016-07-12 17:44:23 -07:00
Brad Davis
6336362d40
Fixing decoration inflation
2016-07-12 17:23:13 -07:00
Brad Davis
f2220288fb
Expand frame decoration when mouse is over a window in HMD mode
2016-07-12 16:40:53 -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
6d7c8d5759
fix crash in audio-mixer if no plugins installed
2016-07-12 16:11:43 -07:00
Brad Hefta-Gaub
9fcecb6277
Merge pull request #8204 from hyperlogic/bug-fix/avatar-url-and-model-name-access-from-js
...
Fix MyAvatar name and url accessors.
2016-07-12 15:30:06 -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
Brad Davis
0c1edb881b
Merge pull request #8190 from imgntn/viveteleporter
...
Teleportation
2016-07-12 13:41:02 -07:00
Stephen Birarda
03d5a0cb51
Merge pull request #8223 from Atlante45/fix/crash-packet-list
...
Fix crash in packet list
2016-07-12 13:17:26 -07:00
David Kelly
3955e03aa2
Fix for build error
...
doh!
2016-07-12 12:15:12 -07:00
Seth Alves
0dd2171b75
remove commented-out code
2016-07-12 11:57:57 -07:00
Seth Alves
6c14ef3392
added a comment
2016-07-12 11:56:57 -07:00
Brad Davis
029251f293
More render performace testing work
2016-07-12 11:51:58 -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
Seth Alves
1999193907
split the grab script's deactivation on an entity into two parts -- one that happens during release and a delayed part which finishes up. This makes collisions with a thrower's capsule less likely
2016-07-12 11:42:58 -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
2b719e12f7
attempt to make mac server plugins work
2016-07-12 10:54:45 -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
Seth Alves
1abd49c167
Merge branch 'fix-throwing' of github.com:sethalves/hifi into fix-throwing
2016-07-12 09:21:23 -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
Seth Alves
367c26a5ee
wait a bit before resetting collides-with-my-avatar
2016-07-11 18:53:47 -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
Brad Hefta-Gaub
6f0967f3fc
add mac support to the codec plugin
2016-07-11 18:28:04 -07:00
Brad Hefta-Gaub
3ddac73718
add mac lib to the external project
2016-07-11 18:24:22 -07:00
Seth Alves
85cc5f8956
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-11 18:02:18 -07:00
samcake
d2d1a8d220
Merge pull request #8227 from ZappoMan/skinMaterialMap
...
added support for material map in FST file
2016-07-11 17:54:20 -07:00
Brad Hefta-Gaub
e32929dce2
added support for material map in FST file
2016-07-11 17:40:07 -07:00
Seth Alves
62abe43996
Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing
2016-07-11 17:06:52 -07:00
