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

9757 commits

Author SHA1 Message Date
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
Thijs Wenker
cbb3d463b6 Fixed Overlays::isLoaded which did not to find my just created overlay. 2014-11-13 23:29:05 +01: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
Thijs Wenker
388332966d Added cloning methods to Grid3DOverlay 
Added example script for cloning overlays (TODO: SpriteBillboard fix cloning of in example)
 2014-11-13 22:22:46 +01: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
Thijs Wenker
14655870ec Merge branch 'master' of https://github.com/worklist/hifi into 20176 2014-11-13 20:14:26 +01: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
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
David Rowe
6cf833cf98 Add text overlay textWidth() method 2014-11-11 17:31:49 -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
Andrzej Kapolka
0c1ea784b9 Set face. 2014-11-10 11:49:02 -08:00
Andrzej Kapolka
431bb0af1d Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
 2014-11-10 11:46:09 -08:00
Sam Gateau
7ccb7495c7 Merge and resolve conflict on APplication.cpp 2014-11-10 10:07:24 -08:00
Sam Gateau
631ed9da78 let's start reusing the Batch per model from frame to frame 2014-11-10 10:04:19 -08:00
Brad Hefta-Gaub
fc89f92097 Revert "Revert "Fix build warning"" 2014-11-07 21:53:56 -08:00
Brad Hefta-Gaub
3a90e869d4 Revert "CR for Job #20140 - Add Overlays.getTextWidth" 2014-11-07 21:50:19 -08:00
Brad Hefta-Gaub
09490b58b4 Revert "Fix build warning" 2014-11-07 21:47:28 -08:00
Brad Hefta-Gaub
8e9d0a6396 Merge pull request #3762 from ctrlaltdavid/fix-build-warning 
Fix build warning
 2014-11-07 20:24:08 -08:00
Brad Hefta-Gaub
8e17bc74bf Merge pull request #3759 from ctrlaltdavid/20140 
CR for Job #20140 - Add Overlays.getTextWidth
 2014-11-07 20:14:18 -08:00
David Rowe
94d82455a0 Fix build warning 2014-11-07 19:56:54 -08:00
Stephen Birarda
1e52232a4c add destructors for arrays in Hair 2014-11-07 17:21:53 -08:00
Stephen Birarda
2ca673175a rename StdDev to StDev, patch its leak 2014-11-07 17:15:54 -08:00
Andrzej Kapolka
6445b3aa5d Linux warnings fixes. 2014-11-07 15:59:16 -08:00