Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 14:29:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18800 commits 76 branches 59 tags 1.2 GiB
Commit graph

9709 commits

Author SHA1 Message Date
Sam Gateau
cc78000641 introduce the concept of side thorugh out the rendering traversal 2014-11-14 11:22:11 -08:00
Sam Gateau
f09b58c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 10:05:01 -08:00
Sam Gateau
642f436fba first draft of factorizing the rendering traversal for both sides in stereo 2014-11-14 09:56:36 -08:00
Andrew Meadows
5ba213f8d1 fix for function override with no return 2014-11-14 09:33:11 -08:00
AndrewMeadows
edc599bc2d Merge pull request #3792 from ZappoMan/bugFixes 
fix a couple bugs
 2014-11-14 08:33:49 -08:00
Brad Hefta-Gaub
db2b5fc28d Merge pull request #3791 from ctrlaltdavid/20128 
CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints
 2014-11-13 20:44:43 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157 
CR for Job #20157 - Enable "Get Overlay properties" from javascript
 2014-11-13 20:43:38 -08:00
ZappoMan
6a4f1c857f fix a couple bugs 2014-11-13 18:35:04 -08:00
Philip Rosedale
4e11191856 Merge pull request #3789 from birarda/lobby 
use ResourceCache for Sound files so they are cached too
 2014-11-13 16:30:06 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157 
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
 2014-11-13 14:53:57 -08:00
ZappoMan
49ef6f8be0 some cleanup 2014-11-13 14:53:37 -08:00
ZappoMan
3ff89be3fd actually only pick programs once 2014-11-13 14:51:47 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
ZappoMan
d7d7db4494 Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering 2014-11-13 14:47:15 -08:00
ZappoMan
7ba3c74bc0 more work on render model scenes 2014-11-13 14:47:02 -08:00
AndrewMeadows
e509a4c41a Merge pull request #3787 from samcake/temp0 
Simplified the Transform usage in the gpu::api
 2014-11-13 14:10:55 -08:00
AndrewMeadows
b797c7b38c Merge pull request #3782 from ctrlaltdavid/20140 
CR for Job #20140 - Add Overlays.getTextWidth
 2014-11-13 13:52:53 -08:00
Sam Gateau
5c9c78e62b Moving all the variables for the Input stage cache into a struct just like for transformStage 2014-11-13 12:32:48 -08:00
David Rowe
6f4952c7d5 More consts 2014-11-13 12:25:15 -08:00
David Rowe
493455fdac Fix const 2014-11-13 11:34:40 -08:00
David Rowe
8d4cecda62 Optimization and coding standard 2014-11-13 11:06:40 -08:00
Sam Gateau
420118e9db Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-13 11:04:12 -08:00
Sam Gateau
7e2c4c0561 SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint 2014-11-13 10:57:32 -08:00
David Rowe
fac6b6b426 Refactor QRect conversion to QScriptValue 2014-11-12 21:32:55 -08:00
David Rowe
9e19641a1d Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
ZappoMan
4077f6c2ab Merge branch 'master' of https://github.com/highfidelity/hifi into animationUnification 2014-11-12 20:39:39 -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
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
David Rowe
725d56d41f Add property getting for all 2D overlays 2014-11-12 16:50:13 -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
d2ab3e69f0 some cleanup 2014-11-12 14:59:03 -08:00
ZappoMan
6ff8abcbdd sepearate looping logic from AnimationHandle 2014-11-12 14:47:10 -08:00
David Rowe
8c3bedae9d Add position vector and color object script value examples 
OverlayPropertyResult type is needed to successfully move QScriptValue
objects from QScriptEngine in Overlays to QScriptEngine in script.
 2014-11-12 14:33:52 -08:00
ZappoMan
ba760c4108 remove warning 2014-11-12 13:38:10 -08:00
ZappoMan
96705bfd74 allow AnimationHandle to be set from AnimationDetails 2014-11-12 13:36:08 -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
David Rowe
4fa5447c85 Add overlay getProperty() for text overlay "text" property 2014-11-12 12:13:57 -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