Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 05:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18722 commits 71 branches 56 tags 1.2 GiB
Commit graph

18722 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
42a73e280e remove the concert camera scripts from examples 2014-11-13 09:29:37 -08:00
Philip Rosedale
2c4335d1c5 Merge pull request #3783 from ZappoMan/modelSceneRendering 
Model scene rendering
 2014-11-12 20:38:02 -08:00
ZappoMan
63a8608ac6 handle per model transforms, default scene mode off 2014-11-12 20:20:36 -08:00
ZappoMan
13f08e65d1 Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering 
Conflicts:
	interface/src/renderer/Model.h
 2014-11-12 19:31:27 -08:00
AndrewMeadows
65a2aaee9d Merge pull request #3778 from samcake/temp1 
Introduce the Transform class and use it in the gpu api and for rendering models
 2014-11-12 18:26:04 -08:00
Sam Gateau
859c99b9de Fix bug in the cache of GLBackend::TransformStage 2014-11-12 18:15:35 -08:00
Sam Gateau
b6c004c431 Fix syntax that doesn't compile on linux and used smart glm::max instruction 2014-11-12 17:16:43 -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
ZappoMan
ba760c4108 remove warning 2014-11-12 13:38:10 -08:00
ZappoMan
50bf5db50f Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering 2014-11-12 13:20:27 -08:00
ZappoMan
d97d1119c7 keep tree locked until after endScene 2014-11-12 12:25:02 -08:00
ZappoMan
b2f64b9362 cleanup 2014-11-12 12:17:46 -08:00
ZappoMan
9f3f815f55 shuffle to hopefully cleanup diff 2014-11-12 12:10:57 -08:00
ZappoMan
4245da5157 add menu item to enable/disable rendering as scene 2014-11-12 12:07:27 -08:00
ZappoMan
4b22dadf09 first cut at implementing model scene rendering 2014-11-12 11:53:22 -08:00
Sam Gateau
3332cc693c Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 10:42:27 -08:00
Sam Gateau
e47524d70a fix syntax and missing constant name 2014-11-12 10:41:50 -08:00
Philip Rosedale
7b7fda5f1d Merge pull request #3781 from birarda/texture-load 
handle texture replacement if model hasn't yet loaded
 2014-11-12 10:02:13 -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
Philip Rosedale
0deacb223a Merge branch 'master' of https://github.com/worklist/hifi 2014-11-11 20:56:07 -08:00
Philip Rosedale
da7558e8fa Merge pull request #3777 from birarda/hifi-url 
fix for hifi url handling in 5.3.2
 2014-11-11 20:55:53 -08:00
Stephen Birarda
b7b371ba61 resolve conflicts on merge with upstream master 2014-11-11 20:53:24 -08:00
Stephen Birarda
ed9a2bf676 fix for AudioInjector QScriptValue conversion typos 2014-11-11 20:48:34 -08:00
Stephen Birarda
9a45a70764 repairs to Sound script conversion typos 2014-11-11 20:47:40 -08:00
Stephen Birarda
9bd870f4b0 fix hifi url handling after update to 5.3.2 2014-11-11 20:45:04 -08:00
Brad Hefta-Gaub
1d80fd7e4f Merge pull request #3772 from PhilipRosedale/master 
Less aggressive audio muting default, entity getter returns by reference
 2014-11-11 20:32:46 -08:00
Philip Rosedale
a1e8848525 Merge pull request #3776 from birarda/hydra-crash 
don't try to open joystick if controller is NULL
 2014-11-11 18:48:52 -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
Stephen Birarda
9aa950e657 fix audio injector cleanup for local only injectors 2014-11-11 17:34:03 -08:00
Stephen Birarda
7f79f0946d play a random musak song in lobby when it is shown 2014-11-11 17:10:25 -08:00
Stephen Birarda
0433586293 switch lobby noise back to drone 2014-11-11 16:59:15 -08:00
Stephen Birarda
cb5d5dd3a8 handle looping via AudioInjectorLocalBuffer 2014-11-11 16:57:25 -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
Philip Rosedale
ca878b9933 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-11 15:48:43 -08:00