Commit graph

44851 commits

Author SHA1 Message Date
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
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
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
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
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
Brad Hefta-Gaub
ceffa219b3 support for lost packets 2016-07-11 15:18:02 -07:00
James B. Pollack
dc9c06a159 clean util 2016-07-11 15:14:19 -07:00
James B. Pollack
27f70e9d52 finish merge 2016-07-11 15:13:25 -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
Brad Hefta-Gaub
540ab9f07c wire up audio codec 2016-07-11 13:00:58 -07:00
Brad Hefta-Gaub
f5b693cebb added support for external hificodec and hifi codec plugin 2016-07-11 12:22: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
Seth Alves
e0739dcc9c Merge pull request #8224 from sethalves/refresh-feature/grab-script-polish
Refresh feature/grab script polish
2016-07-11 11:11:13 -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
Seth Alves
52a7c8e032 Merge branch 'feature/grab-script-polish' of github.com:hyperlogic/hifi into refresh-feature/grab-script-polish 2016-07-11 10:09:07 -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
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
e893b17047 Merge pull request #8220 from highfidelity/revert-8215-fix/crash-packet-list
Revert "Fix crash in packet list"
2016-07-08 18:31:53 -07:00
Anthony J. Thibault
6f6fe5f244 reduced radius of grab sphere 2016-07-08 18:23:33 -07:00
Clément Brisset
d933238bda Revert "Fix crash in packet list" 2016-07-08 18:15:14 -07:00
Seth Alves
5c69e55475 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-08 17:43:52 -07:00
Anthony J. Thibault
bec71e4af4 Went back to transparent spheres for equip points 2016-07-08 17:05:23 -07:00
Clément Brisset
f7b3155178 Merge pull request #8213 from birarda/long-script-name
Interface changes for new Marketplace
2016-07-08 16:57:25 -07:00
Stephen Birarda
15eb1dbafd Merge pull request #8215 from Atlante45/fix/crash-packet-list
Fix crash in packet list
2016-07-08 16:30:06 -07:00
James B. Pollack
6249f3ed12 less changes to hand grab 2016-07-08 16:01:17 -07:00
Atlante45
f0fcb94a6a Typos 2016-07-08 16:00:34 -07:00
Stephen Birarda
11aafc0f48 use endsWith for scriptURL check 2016-07-08 16:00:06 -07:00