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
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
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
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
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
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
