Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-12 19:38:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18710 commits 25 branches 0 tags 1.1 GiB
Commit graph

9666 commits

Author SHA1 Message Date
Sam Gateau
859c99b9de Fix bug in the cache of GLBackend::TransformStage 2014-11-12 18:15:35 -08:00
Sam Gateau
c0496fd466 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 16:52:34 -08:00
Sam Gateau
d3a7b011bf defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design. And cleaned the dead code in Application.cpp 2014-11-12 16:52:11 -08:00
Sam Gateau
8fb04af59d defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design 2014-11-12 16:40:45 -08:00
Brad Hefta-Gaub
99dd20f828 Merge pull request #3780 from ctrlaltdavid/20182 
CR for Job #20182 - Add ability to set alpha on text overlays
 2014-11-12 16:26:59 -08:00
Brad Hefta-Gaub
70c463695a Merge pull request #3779 from PhilipRosedale/master 
Remove buckyBalls and faceshift lean-to-drive
 2014-11-12 16:26:50 -08:00
Brad Hefta-Gaub
331e9d6558 Merge pull request #3775 from birarda/lobby 
repairs to local audio injection
 2014-11-12 16:26:38 -08:00
Sam Gateau
7fa4ea7527 commented on the else branch in the update TRansform stack doing nothing 2014-11-12 15:04:52 -08:00
Sam Gateau
3332cc693c Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 10:42:27 -08:00
Stephen Birarda
1e8e337fc7 fix spacing in NetworkGeometry method 2014-11-12 09:48:36 -08:00
Stephen Birarda
5415f8a350 handle texture replacement if model hasn't yet loaded 2014-11-12 09:47:18 -08:00
Philip Rosedale
6af2b7aadf remove buckyballs and face shift lean driving (should be a script if desired) 2014-11-12 07:33:59 -08:00
Sam Gateau
30615f09c5 fixing template syntax for linux, hope we can move to c++11 soon:) 2014-11-12 01:07:28 -08:00
Sam Gateau
f634b1c5cb avoid for a new Transform for identity gpu::Batch::setTransformModel when rendering model part which are blend shapes AND fix a bug in GLBackend when the ModelTransform is NULL then let's use the ViewTransform only 2014-11-12 01:03:53 -08:00
Sam Gateau
6096a61ecc avoid for a new Transform for identity gpu::Batch::setTransformModel when rendering model part which are blend shapes 2014-11-12 00:52:40 -08:00
Sam Gateau
5f0fdeccb2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 00:27:12 -08:00
Sam Gateau
b716a512c6 Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level 2014-11-12 00:26:44 -08:00
Stephen Birarda
b7b371ba61 resolve conflicts on merge with upstream master 2014-11-11 20:53:24 -08:00
Stephen Birarda
9bd870f4b0 fix hifi url handling after update to 5.3.2 2014-11-11 20:45:04 -08:00
Stephen Birarda
f9aed39352 don't try to open a joystick if controller is NULL 2014-11-11 18:17:24 -08:00
David Rowe
8ac3aba2bd Make text overlays apply alpha to text as well as background 2014-11-11 17:54:02 -08:00
Sam Gateau
7a9f45d34f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-11 16:40:11 -08:00
Sam Gateau
668c5e298d clean up the Transform class and the rendering path in Model.cpp 2014-11-11 16:39:00 -08:00
Stephen Birarda
a5a02b5f8a add AudioInjectorLocalBuffer for more control 2014-11-11 16:34:00 -08:00
Stephen Birarda
0e30c65e60 handle cleanup of local injection, volume 2014-11-11 15:12:11 -08:00
Philip Rosedale
e6bbb53483 Merge pull request #3774 from ZappoMan/newEntityNotification 
implement "preload" method for entity Scripts
 2014-11-11 14:46:23 -08:00
Stephen Birarda
83529c1fed fix QIODevice fail in AudioInjector by passing explicit size 2014-11-11 14:45:33 -08:00
ZappoMan
8975fbe1ee removed blank line 2014-11-11 14:26:45 -08:00
Brad Hefta-Gaub
d38496c3c7 Merge pull request #3771 from huffman/entity-grid-tool 
Add entity grid tool
 2014-11-11 14:21:26 -08:00
ZappoMan
8ec3f8ce99 implement support for calling preload when the script changes 2014-11-11 14:21:06 -08:00
Stephen Birarda
cd3877b584 handle local audio output via AudioInjector directly for control 2014-11-11 14:14:43 -08:00
ZappoMan
2bc7896dee first cut at preload script behavior 2014-11-11 13:46:48 -08:00
Stephen Birarda
d0e8c294da handle passing of local audio interface to AudioInjector 2014-11-11 11:22:16 -08:00
Philip Rosedale
d9141b4010 Merge pull request #3750 from Atlante45/reverb_for_own_voice 
Reverb for own voice
 2014-11-11 10:52:26 -08:00
Ryan Huffman
bedd9c76f2 Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool 
Conflicts:
	examples/newEditEntities.js
 2014-11-11 10:48:49 -08:00
Ryan Huffman
3ec28f8e30 Add WindowScriptingInterface::doCreateWebWindow 2014-11-11 10:15:16 -08:00
Ryan Huffman
a1d771a0be Rename WebWindow to WebWindowClass 2014-11-11 10:03:14 -08:00
Ryan Huffman
bd61eba664 Remove unused include 2014-11-11 10:00:28 -08:00
Stephen Birarda
d083e75d2d groundwork for better locally looped audio 2014-11-11 09:59:10 -08:00
Ryan Huffman
f577cdd2f4 Add Grid3DOverlay to Overlays 2014-11-11 09:56:47 -08:00
Sam Gateau
ad51416c28 move the transform class files to the Shared library, still problem with negative scale composition 2014-11-11 09:54:35 -08:00
Ryan Huffman
2ebca0a659 Add Grid3DOverlay 2014-11-11 09:50:25 -08:00
AndrewMeadows
22dbebbe09 Merge pull request #3760 from DaveDubUK/20142 
CR for Job #20142 - Walk Cycle Polish Description
 2014-11-11 09:10:32 -08:00
Philip Rosedale
c965c21702 Merge pull request #3758 from ey6es/master 
Mirror/warning fixes.
 2014-11-10 17:23:43 -08:00
Philip Rosedale
885a93b7e3 Merge pull request #3769 from birarda/plugs 
add guard for handling of local audio
 2014-11-10 17:20:19 -08:00
Stephen Birarda
dabc2b23a3 add a guard in case local audio cannot be handled 2014-11-10 15:51:56 -08:00
Atlante45
02b401701f Set a minimum mute intervalle in the mixer 2014-11-10 15:46:36 -08:00
Atlante45
125ef0e3e2 make pulsate function into a cos 2014-11-10 15:12:40 -08:00
Atlante45
53fb9e9047 make mute icon pulsate when muted 2014-11-10 14:11:17 -08:00
Andrzej Kapolka
5f89b6e00e The spec actually says that the 'L' (should have been 'LL' anyway) isn't 
necessary; the compiler will know to read the constant as a long long.
 2014-11-10 11:58:52 -08:00