Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-06-04 14:30:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44971 commits 6 branches 1 tag 1.1 GiB
Commit graph

44971 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
1cf57b27a9 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 08:57:11 -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
Seth Alves
051616d7c3 experimenting 2016-07-08 16:16: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
Stephen Birarda
43967dc9a6 handle running of non .svo.json JSON files from mp CDN 2016-07-08 15:47:56 -07:00
Ryan Huffman
489d2e4ca5 Update max request limit and number of processing threads 2016-07-08 15:33:11 -07:00
Atlante45
b665f38c1f Don't process DomainList packets from 2 DS 
case 1037
 2016-07-08 15:16:41 -07:00
James B. Pollack
ee970c5e07 cleanup 2016-07-08 15:16:26 -07:00
Atlante45
97da515585 Assign random UUID to DS without one. 2016-07-08 15:15:58 -07:00
Atlante45
70cf25bd8b Add missing read locks to LimitedNodeList's hash 2016-07-08 15:15:58 -07:00
James B. Pollack
4f899d8752 play nice with grab 2016-07-08 15:14:04 -07:00
James B. Pollack
5ca14b528b remove prints and format 2016-07-08 15:08:44 -07:00
James B. Pollack
3492367c63 cleanup comments etc 2016-07-08 15:03:59 -07:00
James B. Pollack
38e580b211 fix some bugs and also change it to use arrival mode 2016-07-08 14:50:21 -07:00
Anthony J. Thibault
c8d0decab7 Fix for far grab not working until after edit button is pressed 2016-07-08 14:47:13 -07:00
Brad Hefta-Gaub
126e5c2926 codec pipeline working, zlib example 2016-07-08 14:34:44 -07:00
Stephen Birarda
5bce924eda keep signature for askToLoadScript 2016-07-08 14:34:42 -07:00
Anthony J. Thibault
7d1f52da70 Added glow effect to search beam 2016-07-08 14:33:22 -07:00
David Kelly
bc7123d701 comment out logging for now 2016-07-08 13:59:49 -07:00
Anthony J. Thibault
9242147394 Merge branch 'master' into feature/grab-script-polish 2016-07-08 13:40:01 -07:00
James B. Pollack
1cda8afa40 simplify code 2016-07-08 13:37:59 -07:00
James B. Pollack
24832df14a changes 2016-07-08 13:13:32 -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
Anthony J. Thibault
1ec3472230 Model overlay dimensions fixes 
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
 2016-07-08 11:36:43 -07:00
Brad Davis
ae1dd29a7a Fix depth writing for glow lines 2016-07-08 10:27:53 -07:00
Stephen Birarda
216e47b29a hide the long URL prefix of scripts from marketplace 2016-07-08 09:43:11 -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
Brad Davis
829a871d6f Merge pull request #8208 from SamGondelman/qmlFixes 
Fixed issues in Browser.qml and UpdateDialog.qml
 2016-07-07 19:51:37 -07:00
James B. Pollack
1a46366557 uncomment 2016-07-07 19:23:04 -07:00
James B. Pollack
f8ff0da901 trying to fix interaction with grab script... 2016-07-07 19:22:42 -07:00
Brad Davis
c644c87e69 Fix glow line vanishing, improve transparency interaction 2016-07-07 19:01:41 -07:00