Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 21:57:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20146 commits 74 branches 59 tags 1.2 GiB
Commit graph

9704 commits

Author SHA1 Message Date
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
Andrzej Kapolka
8a0ff4acf5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
 2014-11-13 12:17:37 -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
Andrew Meadows
1bed4eeb5b merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityTree.cpp
 2014-11-13 10:53:23 -08:00
Andrew Meadows
7f46ac0935 EntityTree gtts PhysicsWorld*, with less error 2014-11-13 10:12:52 -08:00
Andrew Meadows
ebe24b5c4c give the EntityTree a pointer to its PhysicsWorld 2014-11-13 10:04:55 -08:00
Andrew Meadows
14f49df44d Application gets a ThreadSafePhysicsWorld 2014-11-13 10:02:36 -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
Andrzej Kapolka
aaffd023e2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-12 18:03:54 -08:00
Andrzej Kapolka
12f5bccd81 More chipping away. 2014-11-12 18:03:42 -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
Andrzej Kapolka
49a9387020 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-12 15:42:36 -08:00
Andrzej Kapolka
d05bb49a74 Yet more heightfield spanner bits. 2014-11-12 15:40:54 -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
Andrzej Kapolka
08475cc90b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-11 14:40:34 -08:00
Andrzej Kapolka
caef237376 More work on spannerizing heightfields. 2014-11-11 14:40:05 -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
Andrew Meadows
0d0f98f669 init and step physics simulation 2014-11-11 12:09:59 -08:00
Stephen Birarda
d0e8c294da handle passing of local audio interface to AudioInjector 2014-11-11 11:22:16 -08:00
Andrew Meadows
fa48da6c98 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2014-11-11 11:14:12 -08:00
Andrew Meadows
82d7b70ec9 add offset to physics simulation 2014-11-11 10:56:31 -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
Andrzej Kapolka
93a61dd0c2 More heightfield bits. 2014-11-10 19:26:19 -08:00
Andrzej Kapolka
e0e9eaa15d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-10 18:06:51 -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
Andrzej Kapolka
0664ff3181 Moved spanners into separate file, working on heightfields as spanners. 2014-11-10 15:51:41 -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
a77525209d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-10 11:54:05 -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
David Rowe
a904b128b3 Fix boolean literal value 2014-11-07 15:28:39 -08:00
Andrzej Kapolka
9a14e46c78 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-07 14:45:30 -08:00
Andrzej Kapolka
cd110d6048 Fix for invalid projection matrix on startup. 2014-11-07 14:35:01 -08:00
Sam Gateau
9d146e7ea3 improving the evalFromRawMatrix decomposition 2014-11-07 14:27:22 -08:00
Andrzej Kapolka
7008012492 Trigger fixes. 2014-11-07 14:20:31 -08:00
Andrzej Kapolka
b421ee9243 Fix for audio toolbox. 2014-11-07 14:09:40 -08:00
Andrzej Kapolka
61e0660d65 This actually seems to work differently on OS X versus Linux. 2014-11-07 14:01:28 -08:00
Andrzej Kapolka
a4db244182 Mirror/warning fixes. 2014-11-07 13:57:20 -08:00
David Rowe
a50c3c1696 Fix order of wrist and hand joints in Leapmotion controller 2014-11-07 12:04:03 -08:00
Stephen Birarda
beb7c339f3 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-11-07 11:18:04 -08:00
Sam Gateau
dc748a85a3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-07 11:14:55 -08:00
Stephen Birarda
bd8b71a02a complete handling of local audio loopback 2014-11-07 11:05:01 -08:00
Stephen Birarda
66949ee7a9 Merge branch 'master' of https://github.com/highfidelity/hifi into local-audio 2014-11-07 10:57:37 -08:00
Brad Hefta-Gaub
4a6c5e4203 Merge pull request #3753 from RyanDowne/master 
Changes to Hair to make it look more like clothing
 2014-11-07 10:55:08 -08:00
Ryan
d0ca9ed14c Changes to Hair to make it look more like clothing 2014-11-07 10:45:58 -08:00
Stephen Birarda
e78f149369 Merge branch 'master' of https://github.com/highfidelity/hifi into local-audio 2014-11-07 10:28:31 -08:00
Stephen Birarda
f1a238a6c2 piping for local UI sounds 2014-11-07 10:08:09 -08:00
ZappoMan
45ca063249 use original textures for textureNames 2014-11-07 10:00:04 -08:00
Sam Gateau
fa9318aafe Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-07 09:59:09 -08:00
Sam Gateau
e1a9830d9a mirror doesn't work with the new transform stack 2014-11-07 09:58:32 -08:00
ZappoMan
fdc5aa1da5 include urls with texture names, make sure to wait till default textures loaded before setting new textures 2014-11-07 09:54:13 -08:00
Stephen Birarda
0f32346324 resolve conflicts on merge with upstream master 2014-11-07 09:10:12 -08:00
ZappoMan
7b40a7cd89 CR feedback 2014-11-07 09:07:28 -08:00
ZappoMan
c48d79ad8b add gettable feature which lists texture names 2014-11-07 09:05:47 -08:00
David Rowe
7e6d616f20 Add text overlay textWidth() method 
Is accessible from JavaScript.
 2014-11-07 08:58:31 -08:00
David Rowe
02f6f6769b Enable different copies of otherwise identical text renderers 
Needed when using computeWidth() because it messes up draw() rendering.
 2014-11-07 08:56:50 -08:00
Atlante45
011e531971 Magic numbers and casts 2014-11-07 14:41:59 +01:00
ZappoMan
542d671e54 cleanup entity scripts when changing domains or entity is deleted 2014-11-06 20:01:09 -08:00
Andrzej Kapolka
e08a0144c2 Cleanup on aisle three! Removed the color/normal/voxelized spanner bits, as 
well as the throbbing/scripted guides and the notion of spanner masking.
 2014-11-06 19:15:43 -08:00
ZappoMan
55576e7f9d fix crash in mouse messages while quitting 2014-11-06 17:53:22 -08:00
ZappoMan
c1385a9c35 fix random crash on checkEnterLeaveEntities 2014-11-06 17:41:55 -08:00
ZappoMan
bceab4ead9 clear all octree related state when disconnecting from a domain 2014-11-06 17:25:49 -08:00
Atlante45
dcfeef4712 Reference and comments 2014-11-07 00:24:37 +01:00
Stephen Birarda
2f66e56e46 update Stats to new tbb node iteration 2014-11-06 15:23:30 -08:00
Stephen Birarda
ce02d79d41 update OctreeStatsDialog to new tbb node iteration 2014-11-06 15:22:30 -08:00
Stephen Birarda
d82e2fb8f4 update NodeBounds.cpp to new tbb node iteration 2014-11-06 15:21:18 -08:00
Stephen Birarda
aa7e995672 update MetavoxelSystem.cpp to new tbb node iteration 2014-11-06 15:18:56 -08:00
Stephen Birarda
455cbac8a5 repairs to node hash iterations in Application 2014-11-06 15:16:45 -08:00
Atlante45
1e6cadc7c1 Extra lines 2014-11-07 00:06:57 +01:00
Ryan Huffman
3e109ee770 Add WebWindow widget for scripts 2014-11-06 14:57:04 -08:00
Atlante45
4dc40c9e84 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_for_own_voice 2014-11-06 23:17:53 +01:00
Sam Gateau
9e34e9d0a6 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-06 14:15:59 -08:00
AndrewMeadows
efd9626c2f Merge pull request #3740 from samcake/temp0 
Introduce the input stream stage to the gpu::Batch and apply it for model rendering
 2014-11-06 14:14:08 -08:00
Sam Gateau
555360e470 Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2014-11-06 14:04:03 -08:00
Sam Gateau
bed524716d Removed all the prefix to the enum values, since all the enums are in the gpu scope we consider its good to avoid name colisions 2014-11-06 14:01:43 -08:00
Andrzej Kapolka
788f1b91c0 Use near radius as threshold, since we need to switch to full screen rendering 
whenever any point of the near window intersects the light volume.
 2014-11-06 12:54:49 -08:00
Andrzej Kapolka
2c0b8c9172 Winding order fixes. 2014-11-06 12:45:02 -08:00
Stojce Slavkovski
06da1bd566 add checkbox support in scripting interface 2014-11-06 20:41:08 +01:00
Sam Gateau
b0189efcdf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-06 10:56:54 -08:00
Sam Gateau
820c0798aa In BufferStream, clean up the constructor and destructor 2014-11-06 10:43:54 -08:00
Sam Gateau
2d06e71e32 Remove double definition of static const arrays for Types and Dimensions 2014-11-06 10:42:14 -08:00
Sam Gateau
5a51a99f76 Fixing missing brackets after if 2014-11-06 10:40:06 -08:00
AndrewMeadows
843aaf4e95 Merge pull request #3747 from PhilipRosedale/master 
First pass audio mixer muting, improved tour guide, hair, injector loudness in JS
 2014-11-06 10:36:46 -08:00
Sam Gateau
4a73b0773b first take at the Transform encapsulating a transform matrix 2014-11-06 09:56:05 -08:00
Sam Gateau
67535a386c first take at the Transform encapsulating a transform matrix 2014-11-06 09:55:34 -08:00
Atlante45
efc86b9f75 Remove debug 2014-11-06 17:42:27 +01:00
Atlante45
ff197a2f64 Base implementation for own reverb 2014-11-06 12:46:37 +01:00
Philip Rosedale
54957a2fa1 merge fix 2014-11-05 21:08:24 -08:00
Philip Rosedale
0b205f3f16 fix bad spaces 2014-11-05 17:06:00 -08:00
Philip Rosedale
688bd0f34f first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body' 2014-11-05 16:58:58 -08:00
Andrzej Kapolka
fd00461b4e Perspective correction fix (lets us use lower tesselation on light volumes). 2014-11-05 16:50:34 -08:00
Thijs Wenker
d3d80d3fe2 filled in the rest of the properties 2014-11-06 00:34:59 +01:00
Stephen Birarda
63c5dacdd0 final changes to use new hash from LimitedNodeList 2014-11-05 15:12:42 -08:00
Stephen Birarda
8a72cdd59d leverage new libcuckoo hash outside LimitedNodeList 2014-11-05 15:09:54 -08:00
Thijs Wenker
709ad84933 added clone functionality to Overlays: 
Overlays.cloneOverlay(OverlayID)
 2014-11-05 23:44:59 +01:00
DaveDubUK
7a1f7bd418 Update to walk.js v 1.1 
Revised code structure (see /libraries for new files), walk animation
completely overhauled (now using geometric wave generators, Fourier
synthesis and Butterworth LP filtering for selected motion curve
construction), redesigned sidestepping animations, tweaked flying
animations, decreased maximum walk speed in Interface to more natural
human value, improved Hydra support, added support for Leap motion,
animation file sizes optimised, cleared out code used to work around now
fixed bugs, lots of minor tweaks and improvements. walk.js is now under
100,000 characters, but I had to use tabs instead of 4 spaces to get it
below the threshold.
 2014-11-05 20:11:11 +00:00
Stephen Birarda
bff6707715 repair implicit cast of ints into unsigned colorBuffer 2014-11-05 12:02:05 -08:00
Stephen Birarda
663167d684 wait on AudioInjectors when shutting down interface 2014-11-05 10:37:22 -08:00
Stephen Birarda
2c667d209d make the AudioInjectorScriptingInterface a singleton 2014-11-05 10:10:05 -08:00
Sam Gateau
2b27af51f1 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-05 09:35:26 -08:00
Andrzej Kapolka
fb4c1d38eb Set Oculus camera fov/aspect ratio. 2014-11-04 19:04:31 -08:00
Andrzej Kapolka
a0e0c47701 Depth value tweak. 2014-11-04 18:27:24 -08:00
Sam Gateau
562ecc8e3a fix glLight attenuation bad values by filtering before glcall 2014-11-04 18:18:24 -08:00
Andrzej Kapolka
52d0b15979 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 18:13:58 -08:00
Andrzej Kapolka
892987d68a Increase tesselation to minimize artifacts. 2014-11-04 18:13:33 -08:00
Andrzej Kapolka
feabd1d5b3 Use a fullscreen quad when we're actually inside the light influence. 2014-11-04 18:08:56 -08:00
Sam Gateau
a344d46871 fix std::bitset method 2014-11-04 18:05:04 -08:00
Sam Gateau
1eb49d3763 fixing template bracket issues 2014-11-04 17:54:54 -08:00
Andrzej Kapolka
1763d8f7f0 Switch to using cones/spheres (as opposed to screen-aligned quads) with depth 
testing for light geometry.
 2014-11-04 17:29:19 -08:00
Sam Gateau
99eb46f218 Removed any checkGLError so they do not show 2014-11-04 17:10:17 -08:00
Sam Gateau
27aadd24b3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 16:43:26 -08:00
Sam Gateau
441d09a460 debugiing the mysterious glError coming from glFrustum 2014-11-04 16:42:58 -08:00
Sam Gateau
4afa0b4188 more GL error checking 2014-11-04 15:52:25 -08:00
Brad Hefta-Gaub
24c324fd1d Merge pull request #3735 from ctrlaltdavid/20126 
CR for Job #20126 - Rift HUD shouldn't move with head
 2014-11-04 15:52:10 -08:00
Brad Hefta-Gaub
583b7b1267 Merge pull request #3732 from thoys/20166 
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
 2014-11-04 15:51:05 -08:00
Andrzej Kapolka
576ac23e71 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 15:10:19 -08:00
Sam Gateau
66d732fc33 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 14:52:22 -08:00
Sam Gateau
c842060dc5 fix names for stream and Batch interface 2014-11-04 14:51:57 -08:00
Andrzej Kapolka
3b56f613e2 Cone render function, some cleanup of GeometryCache methods. 2014-11-04 13:21:51 -08:00
Philip Rosedale
c4eeebe03e Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:44:31 -08:00
Stephen Birarda
fab3a61f1b Merge pull request #3737 from birarda/lobby 
fix for Camera.getPosition() calls
 2014-11-04 12:40:08 -08:00
Stephen Birarda
72f80d4a0f make camera getPosition() callable from js 2014-11-04 12:39:50 -08:00
Philip Rosedale
558aa52d30 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:14:08 -08:00
Philip Rosedale
6b8476a87f Merge pull request #3734 from birarda/lobby 
bubble up a PickRay with action event, camera cleanup
 2014-11-04 12:03:29 -08:00
Andrzej Kapolka
f00c54c23c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 11:45:23 -08:00
Andrzej Kapolka
03ce8081a4 Oh, when will I learn not to use "near" and "far" as variable names? 2014-11-04 11:44:47 -08:00
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
Stephen Birarda
fe0d593ac4 expose camera mode as property and leverage in scripts 2014-11-04 10:41:13 -08:00
Stephen Birarda
790aa848ae leverage Camera object for scripting, remove sep interface 2014-11-04 10:33:55 -08:00
Stephen Birarda
957705998f fix an uninitialized action ray when hitting spacebar 2014-11-04 10:19:56 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
ZappoMan
af1b69d8a1 removed some dead code 2014-11-04 09:01:45 -08:00
Sam Gateau
e290347a05 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-03 23:48:03 -08:00
Sam Gateau
f413f93c62 fix the bug for blend shape when more than one and clean the model rendering with the new stream and buffer gpu api 2014-11-03 23:26:39 -08:00
Andrzej Kapolka
3ba3299e35 Use glFrustum rather than Oculus's projection utility method, which seems to 
be returning weird results.
 2014-11-03 21:13:01 -08:00
Andrzej Kapolka
e76a8c2234 Fix for ambient occlusion in 3DTV mode. 2014-11-03 17:36:10 -08:00
Andrzej Kapolka
38a04b53d2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-03 17:00:42 -08:00
Stephen Birarda
a86ccfd603 Merge pull request #3725 from ZappoMan/entityScriptsAndEvents 
add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity
 2014-11-03 15:51:33 -08:00
ZappoMan
60182a78cb CR feedback 2014-11-03 15:42:40 -08:00
ZappoMan
2dae78b82c CR feedback 2014-11-03 15:40:09 -08:00
ZappoMan
bc329a6394 remove blank line 2014-11-03 15:34:30 -08:00
ZappoMan
e12e3b05e1 add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity 2014-11-03 15:33:01 -08:00
Stephen Birarda
d3372537c5 Merge pull request #3715 from ZappoMan/entityScriptsAndEvents 
Entity Scripts
 2014-11-03 15:02:52 -08:00
Sam Gateau
4d1fbc1cf9 Fix end of line in Application.cpp 2014-11-03 14:39:34 -08:00
Sam Gateau
a4bd0acc91 Fix the syntax issue with if blocks 2014-11-03 14:36:03 -08:00
Sam Gateau
ed067791f2 Fixing format for skin attributes float need to be NFloat 2014-11-03 14:29:11 -08:00
Andrzej Kapolka
ce3133b8d4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-03 14:01:08 -08:00
Sam Gateau
eae604d77e Merged with upstream master 2014-11-03 13:37:17 -08:00
Sam Gateau
48769928c5 Trying to fix the skinning issue 2014-11-03 13:20:12 -08:00
Andrzej Kapolka
4475bb89d5 Fix for 3DTV mode with non-unity render scale. 2014-11-03 12:13:08 -08:00
Andrew Meadows
92a6609ac0 simpler tuning system for walk velocities 2014-11-03 11:31:04 -08:00
Sam Gateau
cecf79e580 Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state 2014-11-03 11:22:23 -08:00
Brad Hefta-Gaub
9fb4f91f2a Merge pull request #3716 from ctrlaltdavid/20152 
CR for Job #20152 - Interface cache goes away when you close Interface.
 2014-11-03 11:07:36 -08:00
AndrewMeadows
43a33730ea Merge pull request #3713 from ey6es/metavoxels 
Allow heightfield color/material layers to be of different resolutions than the height layer.
 2014-11-03 11:00:58 -08:00
ZappoMan
49a389618e Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 2014-11-03 10:54:19 -08:00
Sam Gateau
ac02746587 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-03 09:56:54 -08:00
Sam Gateau
fba1526389 Migrating the model rendering code to use the new gpu api for input buffers and stream format 2014-11-03 09:56:14 -08:00
AndrewMeadows
b246af7511 Merge pull request #3712 from ctrlaltdavid/fix-log-file-eols 
Fix log file missing end of lines
 2014-11-03 08:44:23 -08:00
ZappoMan
4db5986625 support for url or text based scripts 2014-11-01 11:40:06 -07:00
ZappoMan
87a5423b35 support changing scripts on the fly and reloading them accordningly 2014-11-01 10:57:12 -07:00
Thijs Wenker
af74fc09b9 Adds AudioDevice mute functionality to ScriptEngine 2014-11-01 02:42:22 +01:00
ZappoMan
e8c694f02e args for more methods 2014-10-31 16:38:51 -07:00
ZappoMan
e7722dc692 pass args to object scripts for mouse events 2014-10-31 15:20:16 -07:00
David Rowe
a9040c1a53 Minor adjustment to Oculus pick ray calc 2014-10-31 15:15:44 -07:00
ZappoMan
a5088eece6 first cut at running scripts from entities 2014-10-31 14:03:30 -07:00
David Rowe
02f9bb489f Fix some build warnings while in the vicinity 2014-10-31 12:49:21 -07:00
David Rowe
8e58e6e3b0 Remove unused methods 2014-10-31 12:48:30 -07:00
David Rowe
170e328f5a Fix similar problem for HMD third person view 
getUprightHeadPosition() changes with avatar lean.
 2014-10-31 12:40:16 -07:00
David Rowe
16f4cffbd3 Center HMD HUD and magnifiers on default eye position 2014-10-31 12:19:26 -07:00
ZappoMan
277da5a24f first cut at wiring up new entity specific UI/UX events 2014-10-31 10:23:45 -07:00
David Rowe
ccc5e0d6ca Increase Interface's disk cache from default 50MB to 10GB 2014-10-31 10:06:43 -07:00
Sam Gateau
46c4305b6b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-31 10:05:00 -07:00
Sam Gateau
cadfd7e197 INtroducing the format descriptor for element attribute and stream, and the Stream and making it work for the model mesh 2014-10-31 10:04:19 -07:00
Sam Gateau
2390559969 INtroducing the stream format and the Stream and making it work for the model mesh 2014-10-31 10:02:26 -07:00
David Rowe
29eeeb3384 Fix log file missing end of lines 2014-10-31 09:24:50 -07:00
Andrzej Kapolka
8ce9521604 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-30 16:52:42 -07:00
Andrzej Kapolka
fd12c7a0d7 One more piece of the resolution puzzle. 2014-10-30 16:52:19 -07:00
ZappoMan
e78ac4c1d4 Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties 2014-10-30 16:36:19 -07:00
ZappoMan
5e21701a5b fix possible deadlocks 2014-10-30 15:22:50 -07:00
ZappoMan
915a0d52d4 only remap textures on the render thread, fix deadlock, and improve handling of changes to textures 2014-10-30 15:01:59 -07:00
ZappoMan
81cc15495f rename Models to Entities, and add menu option to disable Light entities 2014-10-30 14:43:43 -07:00
Brad Hefta-Gaub
1c4e71ebc1 Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
Brad Hefta-Gaub
7b5d2ef9f8 Merge pull request #3706 from huffman/entity-tool-help 
Add edit entities help window
 2014-10-30 12:53:17 -07:00
Ryan Huffman
4f2fef0428 Add edit entities help window 2014-10-30 12:02:30 -07:00
Philip Rosedale
f952e9be8d Merge branch 'master' of https://github.com/worklist/hifi 2014-10-30 11:57:59 -07:00
Andrzej Kapolka
c46d0f4d56 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-30 11:37:36 -07:00
AndrewMeadows
4cf77d1c6c Merge pull request #3702 from ZappoMan/lockAndMaterialProperties 
Lock and textures properties
 2014-10-30 11:35:38 -07:00
ZappoMan
95c5b417c9 texture support in model entities 2014-10-30 11:04:19 -07:00
Philip Rosedale
52f13520db Merge branch 'master' of https://github.com/worklist/hifi 2014-10-30 10:20:34 -07:00
Stephen Birarda
14f216e9c7 set imageURL in ImageOverlay when imageURL is changed 2014-10-30 10:05:31 -07:00
Stephen Birarda
45763a96d7 Merge pull request #3697 from ZappoMan/shadowsTo3DOverlays 
Shadows to3 d overlays
 2014-10-30 09:21:25 -07:00
Philip Rosedale
37cd75cf00 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-30 08:21:46 -07:00
ZappoMan
2570caca40 move 3D overlay rendering into the render portion that supports lighting and shadows 2014-10-29 21:08:37 -07:00
Brad Hefta-Gaub
e314fa1fc3 Merge pull request #3652 from ctrlaltdavid/19976 
CR for Job #19976 - Microsoft Speech API: allow me to control my avatar with voice
 2014-10-29 20:46:12 -07:00
Andrzej Kapolka
754d1a2802 Another resolution fix. 2014-10-29 16:55:55 -07:00
Brad Hefta-Gaub
615664c8b3 Merge pull request #3692 from AndrewMeadows/inertia 
use Qt::AutoConnection for Avatar::setFoo() methods
 2014-10-29 13:52:02 -07:00
Andrew Meadows
e631ab8d38 use Qt::AutoConnection for Avatar::setFoo() methods 
This prevents a JS script from blocking when setting C++ values.
 2014-10-29 13:01:47 -07:00
Andrzej Kapolka
37569dadd5 More resolution bits. 2014-10-29 13:00:32 -07:00
Brad Hefta-Gaub
333375ccae Merge pull request #3691 from AndrewMeadows/inertia 
smoother avatar motion at low velocities
 2014-10-29 12:54:58 -07:00
Andrew Meadows
9ddd05ca72 smoother avatar motion at low velocities 2014-10-29 12:13:07 -07:00
Stephen Birarda
5b3897f1cf Merge pull request #3690 from ZappoMan/rayPickSubMeshes 
Ray pick sub meshes
 2014-10-29 12:10:29 -07:00
ZappoMan
ac3a963eca fix build buster 2014-10-29 12:01:43 -07:00
ZappoMan
c3d1d13fa9 Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes 2014-10-29 11:56:27 -07:00
ZappoMan
f1326e91b9 move the _model.setScaleToFit( largest dimension) to the setProperties not update 2014-10-29 11:10:52 -07:00
Sam Gateau
33b302ff6f removing inline keyword and typo 2014-10-29 11:08:01 -07:00
Sam Gateau
a67b3778c3 fixing name for GLBuffer (instead of the BufferObject) and removing uneeded code 2014-10-29 10:53:50 -07:00
ZappoMan
17a20ceb16 pass the submesh name as extraInfo in the ray pick result 2014-10-29 10:49:24 -07:00
ZappoMan
3e9bc23c2f moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes 2014-10-29 10:19:04 -07:00
Sam Gateau
22e0e4643c Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-29 10:17:42 -07:00
Philip Rosedale
cf121a9fe5 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-28 20:22:40 -07:00
Philip Rosedale
f10aeaffab working on audio mixer muting 2014-10-28 20:22:33 -07:00
Andrzej Kapolka
f0e4e034b6 Fix for color bytes. 2014-10-28 18:55:12 -07:00
Andrzej Kapolka
d28da9250f More progress towards allowing different resolutions for height and color, 
material, etc.
 2014-10-28 18:31:34 -07:00
Sam Gateau
dbdd5293fa Merged with master 2014-10-28 18:31:02 -07:00
Sam Gateau
7aaac69d35 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-10-28 18:22:42 -07:00
Sam Gateau
da70ec4c89 Fix the rendering bug on yosemite: due to the attribute channel number assigned by the compiler which colllides with the fixed pipeline vertex attrib channels, forced the attribute bind location after 3 2014-10-28 18:22:06 -07:00
Philip Rosedale
e5c9ad4525 Merge pull request #3661 from Atlante45/reverb_fixed 
Audio Environment packets
 2014-10-28 18:11:14 -07:00
Brad Hefta-Gaub
7ecc0ccb30 Merge pull request #3683 from birarda/lobby 
fix for location naming break after AddressManager changes
 2014-10-28 17:58:34 -07:00
Brad Hefta-Gaub
be65a798db Merge pull request #3681 from birarda/verbose-log-silencer 
logging tweaks to reduce spam from repeated log messages
 2014-10-28 17:58:17 -07:00
Sam Gateau
639497003d Trying to fix the type unkwon issues and other #include problems on linux vs windows 2014-10-28 16:57:47 -07:00
Stephen Birarda
6ba0845767 fix warnings that were bugging Xcode 2014-10-28 15:39:28 -07:00
Sam Gateau
b8a8c7f639 FIxed uneeded variable framerate 2014-10-28 15:36:19 -07:00
Stephen Birarda
2816e8f114 fix location DataWebDialog missing InterfaceLocation object 2014-10-28 15:32:23 -07:00
Brad Hefta-Gaub
c39c716755 Merge pull request #3679 from AndrewMeadows/inertia 
move code out of "shared" and into new "physics" lib
 2014-10-28 15:25:38 -07:00
AndrewMeadows
4a9015c0e6 Merge pull request #3674 from stojce/20143 
CR for Job #20143 - BUG:  Rearview mirror rendering at wrong size
 2014-10-28 15:02:25 -07:00
Sam Gateau
0dab1c2bc5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-28 14:50:39 -07:00
Stephen Birarda
424793b905 complete output of suppressed repeated messages to log 2014-10-28 14:49:14 -07:00
Sam Gateau
2a5442e099 Introducing the COntext and the Backend object and the specialized GLBackend for the real OpenGL backend to the graphics api 2014-10-28 14:43:15 -07:00
Sam Gateau
88eaeaee7d Introducing the COntext and the Backend object and the specialized GLBackend for the real OpenGL backend to the graphics api 2014-10-28 14:42:22 -07:00
Stephen Birarda
8e3102266a use the LogHandler in Interface 2014-10-28 14:23:34 -07:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00
Andrew Meadows
911c3bcc38 merge upstream/master into andrew/inertia 2014-10-28 13:53:46 -07:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
Stephen Birarda
2711ff2b5f move functionality from VerboseLoggingHelper into the Logging class 2014-10-28 13:48:53 -07:00
Stojce
1229f0e8fa Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-28 21:39:36 +01:00
ZappoMan
06b31baa2a Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2 2014-10-28 13:32:45 -07:00
David Rowe
627dad88cb Remove further ATL dependency in Windows speech recognizer 2014-10-28 12:42:35 -07:00
Stephen Birarda
477b5096e8 don't start/end action/back events on auto-repeat 2014-10-28 11:34:31 -07:00
David Rowe
adf168b7ea Remove ATL build dependency for Windows speech recognizer 2014-10-28 11:14:45 -07:00
David Rowe
a0a6a5019b Recast Windows speech recognizer code to not use ATL 
Visual Studio Express generates lots of linker warnings otherwise.
 2014-10-28 11:01:44 -07:00
ZappoMan
7d2ef7923b Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2 2014-10-28 10:50:02 -07:00
Stephen Birarda
27f7cdb2d4 handle location set/get in AddressManager, handle set to address map 2014-10-28 10:35:56 -07:00
Stojce
1debad3969 Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-28 17:22:00 +01:00
Brad Hefta-Gaub
4e7e9641f0 Merge pull request #3673 from birarda/lobby 
initial groundwork for lobby interface
 2014-10-28 08:48:33 -07:00
Stephen Birarda
cb7a6cb93c Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-28 08:40:20 -07:00
Stojce
9be107c9c1 Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-28 08:24:23 +01:00
Brad Hefta-Gaub
b506a99200 Merge pull request #3671 from ctrlaltdavid/20107 
CR for Job #20107 - Keys p and h and some control keys wont override
 2014-10-27 20:30:15 -07:00
Brad Hefta-Gaub
cfe26ead6e Merge pull request #3669 from lycanthus/20074 
Worklist #20074
 2014-10-27 20:29:23 -07:00
Andrzej Kapolka
32781d53a2 Working on allowing different resolutions for heightfield heights and colors. 2014-10-27 17:35:37 -07:00
Andrzej Kapolka
fc3f27b70a Merge pull request #3670 from samcake/temp0 
Add NSIGHT profiling information to the Build
 2014-10-27 17:03:19 -07:00
Andrzej Kapolka
2db893c23c Merge pull request #3668 from AndrewMeadows/experimental 
Experimental feature: skeleton offset
 2014-10-27 17:02:01 -07:00
Stephen Birarda
e2536dd3f8 remove a debug line 2014-10-27 16:55:24 -07:00
Stephen Birarda
80d9014726 have spacebar fire an action event at center of screen 2014-10-27 16:54:28 -07:00
Stephen Birarda
209c12cb1c repairs for texture replacement by name 2014-10-27 16:52:22 -07:00
Stephen Birarda
bb652c0784 rename signal in AbstractControllerScriptingInterface from cancel to back 2014-10-27 16:01:39 -07:00
Stephen Birarda
8e6b6d5294 have controller A button fire action at center of screen 2014-10-27 15:58:42 -07:00
Stephen Birarda
8a9f2d172a rename HFCancelEvent to HFBackEvent, fire from joystick 2014-10-27 15:51:59 -07:00
Stephen Birarda
04e7e979aa bubble up HFCancelEvent from ESC key 2014-10-27 15:42:40 -07:00
Stephen Birarda
7b5115c35f add a new meta event, HFCancelEvent 2014-10-27 15:37:31 -07:00
ZappoMan
c17ffe9433 add the new properties to LightEntityItem class 2014-10-27 15:31:21 -07:00
Stephen Birarda
c3fe7c7497 send global HFActionEvent from ControllerScriptingInterface 2014-10-27 15:21:47 -07:00
Andrzej Kapolka
4ab90ce49c Avoid killing the updater twice. 2014-10-27 15:04:03 -07:00
Andrzej Kapolka
7bcc267cb5 Fix for crash on exit. 2014-10-27 15:01:06 -07:00
Sam Gateau
6101c3b758 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-27 14:55:42 -07:00
Stephen Birarda
d38dd2c53a repairs for recursive source files, move HF meta events to SE 2014-10-27 14:18:23 -07:00
Stephen Birarda
0ddf665b86 add an HFMetaEvent class as super class for meta events 2014-10-27 12:56:48 -07:00
Sam Gateau
89f9e5b01b try to get more coherent names 2014-10-27 11:49:51 -07:00
Sam Gateau
ff44a460d6 Add NSIGHT Profiliing capability 2014-10-27 11:40:52 -07:00
Stephen Birarda
6626787ae5 have mouse press/release fire HFActionEvent 2014-10-27 11:40:33 -07:00
Stephen Birarda
55735a3f0d add start and end to HFActionEvent 2014-10-27 11:11:23 -07:00
David Rowe
07630755d4 Fix braces 2014-10-27 11:03:34 -07:00
Stephen Birarda
d09c9233d8 add position to HFActionEvent 2014-10-27 10:55:16 -07:00
AndrewMeadows
9d93ec5a5a Merge pull request #3656 from huffman/separate-camera-tool 
Add camera move tool for editing
 2014-10-27 10:54:02 -07:00
Stephen Birarda
b7ebc9e902 add a class for custom HFActionEvent 2014-10-27 10:51:48 -07:00
Andrew Meadows
f25cfc0c7f remove debug code 2014-10-27 10:22:40 -07:00
Andrew Meadows
c1728c0296 Merge upstream/master into andrew/experimental 2014-10-27 10:08:48 -07:00
Stephen Birarda
d5a3ea77ff Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-27 09:28:50 -07:00
Pete
8d97a20bd9 Worklist #20074 
- Add new Preferences item for Oculus Max FPS, defaults to 75, range is
[30, 95]
- Load and save this value appropriately
- When VR mode is enabled/disabled, set the Render Target Framerate to
this value/unlimited
 2014-10-26 21:14:20 -07:00
Stojce
61c80183ad fix for mirror size on different scale resloutions 2014-10-26 08:12:07 +01:00
David Rowe
0fdcf381fa Code tidy 2014-10-25 09:23:37 -07:00
David Rowe
c6463abfb8 Prevent keys captured by script from being used as menu shortcuts 2014-10-25 09:22:30 -07:00
David Rowe
5f91f583e8 Merge branch 'master' into 19976 
Conflicts:
	interface/CMakeLists.txt
 2014-10-24 20:34:45 -07:00
David Rowe
f373719f02 Don't include speech recognition if building with Visual Studio Express 2014-10-24 20:12:23 -07:00
Philip Rosedale
2dff75dac1 Merge pull request #3665 from stojce/20143 
CR for Job #20143 - BUG:  Rearview mirror rendering at wrong size
 2014-10-24 19:45:26 -07:00
Sam Gateau
334e032c17 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-10-24 17:58:54 -07:00
Sam Gateau
80a87b3b44 framerate is as fast as the display can go 2014-10-24 17:50:31 -07:00
David Rowe
55436eba9a Don't "fail" loading speech commands if none to load 2014-10-24 17:45:37 -07:00
Stephen Birarda
57e7fa233f Merge pull request #3664 from PhilipRosedale/master 
Tour Guide script to let you follow people, better hair
 2014-10-24 17:10:57 -07:00
Philip Rosedale
33204b0d27 Merge pull request #3660 from birarda/xbox-controller 
add a guard in case SDL misreports number of axes
 2014-10-24 17:06:51 -07:00
Andrzej Kapolka
8684384316 Disconnect metavoxel LOD from avatar LOD. 2014-10-24 16:38:57 -07:00
Philip Rosedale
d5d0fbd9d8 Hair gravity always the same 2014-10-24 16:08:01 -07:00
David Rowe
38524b3349 Merge branch 'master' into 19976 2014-10-24 15:43:55 -07:00
Stephen Birarda
fa174029fd Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-24 15:26:39 -07:00
Stephen Birarda
c57fc314f0 just resize axis vector is sdl decides to lie about the number of axes 2014-10-24 15:13:54 -07:00
Stephen Birarda
9289249df5 add a guard in case SDL somehow forgets about axes 2014-10-24 15:06:18 -07:00
Atlante45
66b15230e7 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_fixed 2014-10-24 15:02:29 -07:00
Atlante45
847ef64b66 move audio env data over to new packet 2014-10-24 14:27:55 -07:00
Philip Rosedale
ab557447f2 fix uninitialized mouth blending variables 2014-10-24 12:51:54 -07:00
Stephen Birarda
3b436e04ae Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-24 09:43:04 -07:00
Sam Gateau
5b0fd99115 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-10-24 09:28:13 -07:00
AndrewMeadows
31a1b8bb06 Merge pull request #3651 from PhilipRosedale/master 
Better animation for audio-only mouth movement
 2014-10-24 08:46:32 -07:00
Philip Rosedale
e5d64a0d5d Merge pull request #3644 from birarda/data-web-page 
fix for DataWeb hifi link handling
 2014-10-23 21:11:32 -07:00
Philip Rosedale
3f7df5962d Merge pull request #3657 from ey6es/metavoxels 
Further incremental improvements to heightfield voxelization.
 2014-10-23 21:10:21 -07:00
Andrzej Kapolka
003d2f031a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 16:15:11 -07:00
Stephen Birarda
8c79d19e3e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-23 16:07:54 -07:00
Sam Gateau
9f6454f570 Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2014-10-23 15:20:20 -07:00
Sam Gateau
d92c03364a Improve comment regarding the replacement of the QGLProgram->bind() 2014-10-23 14:53:43 -07:00
Ryan Huffman
fde7b30501 Add Camera::modeUpdated() 2014-10-23 14:47:41 -07:00
Sam Gateau
d7fca1fd27 FIxing the merge 2014-10-23 14:39:22 -07:00
Sam Gateau
ac269e16c0 start working on the target framerate control 2014-10-23 13:19:34 -07:00
Andrzej Kapolka
34cba5c031 Added options to selectively toggle heightfield/dual contour surface 
rendering.
 2014-10-23 13:16:43 -07:00
Leonardo Murillo
a4965e7f60 No need for https when downloading assets 2014-10-23 13:59:08 -06:00
Philip Rosedale
9394f72b18 clarify fake blendshape array size 2014-10-23 11:55:06 -07:00
Philip Rosedale
1d68413b66 Audio-only mouth uses multiple blend shapes 2014-10-23 11:43:13 -07:00
Ryan
9495c2c87a Merge remote-tracking branch 'hifi/master' 2014-10-23 08:01:43 -07:00
stojce
4e75837a64 Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-23 14:26:13 +02:00
Clément Brisset
b1b7114e66 Revert "Reverb" 2014-10-22 22:46:37 -07:00
Philip Rosedale
3ba3354e11 Merge pull request #3636 from Atlante45/reverb 
Reverb
 2014-10-22 21:51:57 -07:00
Clément Brisset
0525c562b0 Merge pull request #3643 from ctrlaltdavid/rift-calibration-countdown 
Rift calibration countdown
 2014-10-22 17:42:35 -07:00
Clément Brisset
bf9d467328 Merge pull request #3638 from huffman/entity-tools-updates 
Entity tool fixes
 2014-10-22 17:40:21 -07:00
Stephen Birarda
04416ff40c fix for DataWebPage hifi link handling 2014-10-22 17:27:42 -07:00
David Rowe
0e3495986d Add countdown to HMD calibration billboard 2014-10-22 16:58:10 -07:00
David Rowe
38d50a76eb Add IsFacingAvatar getter and setter to Text3DOverlay 2014-10-22 16:47:40 -07:00
Ryan
883bb5aa68 Merge remote-tracking branch 'hifi/master' 2014-10-22 16:44:37 -07:00
Atlante45
8ccbfcf695 code cleanup 2014-10-22 16:41:41 -07:00
Stephen Birarda
7b0f1477a1 expose AvatarList to Interface SE, add avatarWithDisplayName method 2014-10-22 15:28:04 -07:00
Ryan Huffman
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -07:00
David Rowe
e514f345e1 Change to use dedicated speech recognition engine instead of shared 2014-10-22 14:35:09 -07:00
Atlante45
86c965a922 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-22 14:20:22 -07:00
Sam Gateau
d13283192f Fix the bug happening on mac due to order in which parmaeters are evaluated for all of the gl calls, now fixed with an order independant code 2014-10-22 14:07:15 -07:00
Atlante45
ccc8e0d876 Statically link gverb 2014-10-22 12:56:44 -07:00
Stephen Birarda
e97aef581a use InvokeMethod so that texture change happens on the right thread 2014-10-22 12:07:00 -07:00
Stephen Birarda
e079ec4363 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-22 12:03:46 -07:00
David Rowe
375c71d2ef Tidying 2014-10-22 11:38:45 -07:00
David Rowe
69b1c4273f Tidy object management 2014-10-22 11:27:06 -07:00
Ryan
2894a04027 Merge remote-tracking branch 'hifi/master' 2014-10-22 10:35:33 -07:00
Atlante45
e9d3729238 Remove unnecessary header 2014-10-22 10:30:46 -07:00
David Rowe
a45d4b2d7d Add first pass at Windows speech recognizer implementation 2014-10-22 10:17:29 -07:00
ZappoMan
2f9766e051 first cut at light entity 2014-10-22 08:41:31 -07:00
stojce
a3707a09ae fix mirror ratio on retina 2014-10-22 09:42:55 +02:00
Brad Hefta-Gaub
f76d060de3 Revert "Record graphics API commands in a "gpu::Batch" to separate traversal from rendering" 2014-10-21 20:22:44 -07:00
Brad Hefta-Gaub
650660a0fc Merge pull request #3632 from ey6es/metavoxels 
Added network condition simulator for metavoxels, fixed crash issues with reliable deltas.
 2014-10-21 18:36:11 -07:00
Sam Gateau
057c17fd2f fix suseless spaces around parameters in functions 2014-10-21 18:14:26 -07:00
Sam Gateau
86819b9344 fix endline on Batch.cpp 2014-10-21 18:03:53 -07:00
Sam Gateau
f8f9383c43 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-21 17:57:38 -07:00
Sam Gateau
821284edfd Introduce the gpu::Batch for the full Model::render call 2014-10-21 17:46:41 -07:00
Andrzej Kapolka
4840c44d7c Time calculation fix. 2014-10-21 17:41:41 -07:00
Andrzej Kapolka
311d1332f1 Include a simple bandwidth limit option. 2014-10-21 17:29:28 -07:00
Andrzej Kapolka
0f58b42795 Forgot these guys. 2014-10-21 16:27:26 -07:00
Stephen Birarda
fc39e82734 allow a texture change in ModelOverlay properties 2014-10-21 16:11:58 -07:00
Andrzej Kapolka
3d43e86faa Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-21 15:49:06 -07:00
Stephen Birarda
cc28fe958e add a hack method to NetworkGeometry to change a material texture by name 2014-10-21 15:44:34 -07:00
Ryan
76afc32c1a making hair look and move more like Rick James and less like Blondie 2014-10-21 15:28:06 -07:00
Clément Brisset
9476154375 Merge pull request #3628 from ZappoMan/master 
add 3D text overlay support
 2014-10-21 12:39:30 -07:00
ZappoMan
228de963ab CR feedback 2014-10-21 12:28:44 -07:00
Stephen Birarda
047ee0a513 pipe texture names through to NetworkTexture 2014-10-21 12:20:12 -07:00
Andrzej Kapolka
02c6b5a8bf Fix for send delay, delay ordering. 2014-10-21 12:16:55 -07:00
Andrzej Kapolka
5efb108e6c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-21 11:45:43 -07:00
Sam Gateau
f090a1868c qerge branch 'master' of https://github.com/highfidelity/hifi into temp0 
q Please enter a commit message to explain why this merge is necessary,
 2014-10-21 10:51:46 -07:00
Sam Gateau
00dbe486d9 FIrst working version of the GLBatching system introduced in the MOdelrendering path 2014-10-21 10:50:53 -07:00
ZappoMan
1b9565e575 cleanup 2014-10-21 08:25:04 -07:00
ZappoMan
956d7c73b2 removed debug 2014-10-21 08:21:01 -07:00
ZappoMan
99adb413e3 add 3D text overlay support 2014-10-21 08:20:15 -07:00
Philip Rosedale
4e605f5f67 First headMove "no-barf" version with lean/nod to walk, turn 2014-10-21 00:20:08 -07:00
Andrzej Kapolka
45fb31cd08 Basic network simulation for metavoxels. 2014-10-20 18:43:41 -07:00
Atlante45
94f66ef37a Reverb logic tweaks 2014-10-20 15:35:01 -07:00
Atlante45
6f9557fe67 Do not destroy script reverb settings 2014-10-20 15:06:02 -07:00
David Rowe
66a2639fae Add non-SAPI specific functionality 2014-10-20 14:04:19 -07:00
David Rowe
524c413681 Enable SpeechRecognizer menu item and JavaScript object for Windows 2014-10-20 13:52:37 -07:00
David Rowe
f872902ab9 Add stubs for Windows SpeechRecognizer interface 2014-10-20 13:40:11 -07:00
David Rowe
7566b7e546 Add SpeechRecognizer.h and .cpp to Windows builds 2014-10-20 13:26:51 -07:00
Atlante45
85d56824a0 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-20 11:51:39 -07:00
Atlante45
37b47b52d3 Stream reverb settings from mixer to interface 2014-10-20 11:49:57 -07:00
AndrewMeadows
2569f70ac3 Merge pull request #3623 from ey6es/master 
For FBX files with marked "skeleton" joints, only show those marked nodes in the upload dialog.  Also added some more default node names to look for on upload.
 2014-10-20 09:00:06 -07:00
AndrewMeadows
2e958599aa Merge pull request #3621 from ey6es/metavoxels 
Sculpt brush, very rough conversion of heightfield patches to dual contour surfaces on edit.
 2014-10-20 08:55:01 -07:00
AndrewMeadows
f7c4804f33 Merge pull request #3613 from ctrlaltdavid/20112 
CR for Job #20112 - chat alerts persist
 2014-10-20 08:32:32 -07:00
Andrzej Kapolka
32c5f6e40e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-17 18:28:16 -07:00
Andrzej Kapolka
da60a17b45 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-17 18:27:31 -07:00
Sam Gateau
0def490db7 startign to record all the gl commands in the Batch 2014-10-17 18:17:44 -07:00
Andrzej Kapolka
e98b99fe84 Merge pull request #3622 from birarda/domain-tunnel 
work around double login issue by generating keypair on each launch
 2014-10-17 18:05:45 -07:00
Andrzej Kapolka
c979ace924 Read the unit scale factor and include it in the offset scale. 2014-10-17 17:34:27 -07:00
Stephen Birarda
5882001311 Merge pull request #3619 from ZappoMan/modelOverlayRayPick 
ray picking support for Model and 3D volume overlays
 2014-10-17 17:03:37 -07:00
Andrzej Kapolka
1940fe67a0 Add jointEyeLeft/jointEyeRight/jointNeck to list of nodes we check for on 
upload.
 2014-10-17 16:57:15 -07:00
Stephen Birarda
5ecdb58e20 generate a new keypair on every interface launch 2014-10-17 16:55:50 -07:00
Andrzej Kapolka
1b9b0f9fc9 Look for and store the "Skeleton" type flag so that we can offer only skeleton 
joints in the dropdown.
 2014-10-17 16:51:55 -07:00
Atlante45
86b87770c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 16:50:19 -07:00
ZappoMan
61b53701f3 fix some comments 2014-10-17 16:07:08 -07:00
ZappoMan
70d718178d make all volume3DOverlays handle proper ray picking against their rotated bounding box, make model overlays property ray pick as well 2014-10-17 13:36:37 -07:00
Atlante45
9ee0138ccf Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 10:50:08 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
Andrzej Kapolka
1fdfb51600 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-16 18:54:03 -07:00
Sam Gateau
a8c3b18e78 Adding the Batch class to GPU and fixing the compilation issues 2014-10-16 17:29:40 -07:00
Sam Gateau
f09133f413 Adding the Batch class to GPU 2014-10-16 17:23:31 -07:00
Brad Hefta-Gaub
a46610a7c1 Merge pull request #3609 from ZappoMan/groupMaterialsRendering 
small optimization to model rendering
 2014-10-16 16:24:28 -07:00
Andrew Meadows
c44a592032 longer lengths for experimental hair 2014-10-16 16:21:59 -07:00
ZappoMan
47f5d499f6 small optimization 2014-10-16 15:26:01 -07:00
Atlante45
5d146a00e7 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 
Conflicts:
	interface/CMakeLists.txt
 2014-10-16 15:21:34 -07:00
Andrzej Kapolka
fc6f0afb93 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-16 15:03:29 -07:00
samcake
a6b9fe34b5 Merge pull request #3606 from ZappoMan/groupMaterialsRendering 
More Model::render() improvements
 2014-10-16 14:42:37 -07:00
ZappoMan
148b880bb1 handle case of meshes with multiple parts with different materials better, don't mix them in with single material meshes 2014-10-16 14:32:07 -07:00
ZappoMan
d1f263ecc5 group materials together when rendering models 2014-10-16 14:05:35 -07:00
Andrzej Kapolka
459b9aba38 Gradual progress on converting heightfield portions to dual contour data. 2014-10-16 13:05:38 -07:00
Stephen Birarda
7bbaaf6b78 cleanup some username signature debug, fix interest list pull 2014-10-16 11:54:55 -07:00
AndrewMeadows
e75d2a167a Merge pull request #3602 from ZappoMan/frustumCullModelParts 
More Model::render() improvements
 2014-10-16 11:04:57 -07:00
Atlante45
0f128509d8 removed old processReceivedAudio method 2014-10-16 10:58:19 -07:00
Brad Hefta-Gaub
866b3d40fc Merge pull request #3604 from AndrewMeadows/inertia 
experimental hair tuning
 2014-10-16 10:53:31 -07:00
AndrewMeadows
4fbc589606 Merge pull request #3598 from birarda/domain-tunnel 
initial pass at using keypairs for username verification for basic domain-server ACL
 2014-10-16 10:49:03 -07:00
Andrew Meadows
8b54569480 experimental hair tuning submitted by Ryan 2014-10-16 10:20:12 -07:00
ZappoMan
ffb7bcf9d3 wire up different culling options to debug menus 2014-10-16 09:32:24 -07:00
ZappoMan
d238d06df5 build a cached lookup table for the shouldRenderMesh() LOD method 2014-10-16 01:00:32 -07:00
ZappoMan
bf77adc4bc add support for LOD occulsion for too small meshes in Model::render() 2014-10-16 00:30:24 -07:00
Brad Hefta-Gaub
8ee26923da Merge pull request #3600 from birarda/master 
some dead code removal
 2014-10-15 20:23:59 -07:00
ZappoMan
4c7ecba579 spelling change 2014-10-15 20:23:04 -07:00
ZappoMan
921a3fb8c0 switch QList<> to QVector<> and add some guards against out of range indices 2014-10-15 20:18:04 -07:00
samcake
01b64d78e3 Merge pull request #3601 from ZappoMan/frustumCullModelParts 
Implement "segregation" of mesh groups
 2014-10-15 18:09:48 -07:00
ZappoMan
56b4d58f18 implement mesh groups and pull out shader programs in renderMeshes() to outside the loop based on group 2014-10-15 17:08:47 -07:00
Stephen Birarda
fcd73858b8 remove Faceplus as a face tracker option 2014-10-15 15:13:52 -07:00
ZappoMan
8a83511942 first cut at separating opaque from transparent meshes 2014-10-15 14:40:42 -07:00
ZappoMan
c8db8855cc move tallyAllTimerRecords out of conditional so they don't pile up 2014-10-15 14:23:29 -07:00
AndrewMeadows
8372975bad Merge pull request #3582 from PhilipRosedale/master 
'Ribbons' that are driven by audio loudness and tuned/draped for mask avatars
 2014-10-15 14:08:20 -07:00
ZappoMan
3a6715c0bc improve timing stats display 2014-10-15 14:00:56 -07:00
ZappoMan
46cb780aa5 view cull mesh parts 2014-10-15 10:08:21 -07:00
ZappoMan
eab96587fe add stats for entity rendering details 2014-10-15 09:24:58 -07:00
ZappoMan
da4c179a9f correctly track rendered entities 2014-10-15 09:23:59 -07:00
ZappoMan
8c37181635 add menu item for enable/disable culling of model parts 2014-10-15 09:23:27 -07:00
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Andrzej Kapolka
fba383f6d3 Render voxel cursor on heightfields, too. 2014-10-14 15:21:45 -07:00
Atlante45
4a3f72ab0b Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-14 15:13:50 -07:00
Andrzej Kapolka
394bf2b4ee Basic sculpt tool, refactored common material bits in tools. 2014-10-14 14:37:32 -07:00
Stephen Birarda
22b599b8cc repair for persisting of Account to file after keypair generation 2014-10-14 14:21:18 -07:00
Andrzej Kapolka
ff368f9848 Merge pull request #3592 from samcake/temp0 
Rendering resolution can be different than the native window resolution
 2014-10-14 11:56:50 -07:00
Stephen Birarda
69402e275c use DER format for generated keys in RSAKeypairGenerator 2014-10-14 11:51:58 -07:00
Stephen Birarda
5f67194564 fix member variable order in Joystick class 2014-10-14 11:39:28 -07:00
Stephen Birarda
d0f91c5c2e remove old mechanism for octree payments 2014-10-14 11:38:50 -07:00
Stephen Birarda
912512936e add RSAKeypairGenerator to generate a 2048-bit keypair 2014-10-14 11:36:40 -07:00
David Rowe
a619d0460d Show chat alerts in icon tray only if not already seen 2014-10-14 11:08:24 -07:00
David Rowe
5151563b79 Coding standard 2014-10-14 11:08:02 -07:00
Stephen Birarda
cca8b68d2e update location and profile paths for new format 2014-10-14 10:40:58 -07:00
AndrewMeadows
2a35c4af4d Merge pull request #3593 from huffman/20024 
CR for Job #20024 - UI edits to Running Scripts dialog
 2014-10-14 09:52:13 -07:00
Stephen Birarda
20f97792bf Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-14 09:26:11 -07:00
Sam Gateau
153d3b532b merged with upstream, all clear 2014-10-14 00:19:19 -07:00
samcake
e7af0cbe7f Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application 2014-10-14 00:08:29 -07:00
Sam Gateau
113fb1908a fix the first issues 2014-10-13 23:28:43 -07:00
NextPrior
a0a5530641 Initial reverb implementation 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Audio.cpp
	interface/src/Audio.h
	libraries/script-engine/src/ScriptEngine.cpp
 2014-10-13 18:13:51 -07:00
samcake
700ec5cf79 Rendering resolution can be different than the native window resolution 
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
  Get rid of the ui to change the mode

- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt

- In the paintGL, in the default rendering path:
  the rendering Framebuffers are resized to the window.size * renderResolutionScale.
  The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
  at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport

- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
 2014-10-13 18:00:50 -07:00
Andrzej Kapolka
00490af837 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-13 17:59:35 -07:00
Clément Brisset
87d067c8f0 Merge pull request #3590 from ctrlaltdavid/extra-logging 
Minor logging improvements
 2014-10-13 16:20:43 -07:00
Clément Brisset
f6f187e7f0 Merge pull request #3587 from ctrlaltdavid/20101 
CR for Job #20101 - Upload model file function is broken
 2014-10-13 16:16:49 -07:00
Clément Brisset
9d050782cc Merge pull request #3586 from ctrlaltdavid/20093 
CR for Job #20093 - Add a menu item corresponding to the apostrophe key (reset sensors)
 2014-10-13 16:14:04 -07:00
Andrzej Kapolka
fcbdf04c19 Apply alpha restrictions when we apply the edit. 2014-10-13 16:01:38 -07:00
Andrzej Kapolka
13efaba22c Basic metavoxels example. 2014-10-13 15:34:38 -07:00
Andrzej Kapolka
60576bdcbd Basic metavoxel scripting bits. 2014-10-13 15:05:16 -07:00
ZappoMan
c7d544cd58 wire up collision signals 2014-10-13 14:36:06 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
David Rowe
958acfcfe0 Fix version logging include to include build number and write in log 2014-10-13 13:23:31 -07:00
David Rowe
bd9451d4c6 Log Oculus SDK version used in build 2014-10-13 13:20:24 -07:00
AndrewMeadows
d90d30ad9f Merge pull request #3585 from ZappoMan/editToolsImprovements 
various edit tool fixes
 2014-10-13 10:12:47 -07:00
AndrewMeadows
3d888b6c27 Merge pull request #3584 from huffman/sdl-update 
Update to SDL2
 2014-10-13 09:37:16 -07:00
Philip Rosedale
99e596ae7e really remove file 2014-10-13 17:35:00 +01:00
Philip Rosedale
c4000eb468 fix windows error 2014-10-13 17:33:01 +01:00
David Rowe
c6bf09f509 Fix model uploading for the case that haven't uploaded model before 2014-10-13 08:35:52 -07:00
Philip Rosedale
18979adf23 remove startup debug from buckyballs 2014-10-12 20:42:53 -07:00
Philip Rosedale
e5f93d00ac remove unused utility functions 2014-10-12 20:42:15 -07:00
Philip Rosedale
dc09572776 remove unused functions 2014-10-12 20:17:20 -07:00
Philip Rosedale
bc6346c257 Removed unused constant, class 2014-10-12 20:14:51 -07:00
Philip Rosedale
a054408abb Merge branch 'master' of https://github.com/worklist/hifi 2014-10-12 17:04:37 -07:00
ZappoMan
a08ddecc3a fix shifting tickmarks 2014-10-10 22:06:12 -07:00
Ryan Huffman
42479b1ae2 Add joystickWithName for PrioVR 2014-10-10 18:03:08 -07:00
Ryan Huffman
a24b5c24a9 Update max axis value to reflect maximum negative value 2014-10-10 17:28:09 -07:00
Andrzej Kapolka
dc8dc112c9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-10 17:19:24 -07:00
Andrzej Kapolka
60da0f1567 Allow drawing cursor on dual contour surface, wired up material paint tool. 2014-10-10 17:18:52 -07:00
Philip Rosedale
9be2b33971 Hair draped for masks and driven by audio loudness 2014-10-10 17:06:11 -07:00