Commit graph

5351 commits

Author SHA1 Message Date
Andrew Meadows
489871d0d6 added MyAvatar.setMotorVelocity() & friends for JS 2014-09-16 17:09:32 -07:00
Atlante45
c699726ae8 Fixed URLs not read properly 2014-09-16 16:32:14 -07:00
Atlante45
81fc0d3696 Added options to use recording context 2014-09-16 14:50:20 -07:00
Atlante45
f649cd1a6e Changed how looping occurs in recordings 2014-09-16 14:49:47 -07:00
Atlante45
42857bce33 Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-16 14:01:06 -07:00
Atlante45
96995e3aed Enforce checksums equality 2014-09-16 13:59:30 -07:00
Atlante45
1c5c9cb31b Fix bug adding first samples twice 2014-09-16 13:57:46 -07:00
Craig Hansen-Sturm
7b3f61ddc2 Merge pull request #3428 from ZappoMan/sendPositonOrientationInSilentPackets
Send positon orientation in silent packets
2014-09-16 13:39:06 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Atlante45
72481999df Compute actual checksum 2014-09-16 12:46:42 -07:00
Stephen Birarda
885030a10c handle receipt of new public socket and propogation to data-server 2014-09-16 12:37:22 -07:00
Atlante45
8573130f07 Write correct Offset ad Length of the data 2014-09-16 12:34:22 -07:00
Atlante45
59637390a2 Add global timestamp to recordings 2014-09-16 12:26:55 -07:00
Atlante45
f5b53a77ab Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-16 12:14:11 -07:00
Brad Hefta-Gaub
47b061983f Merge pull request #3426 from birarda/master
don't prepend relative paths with hifi scheme, use quat for location orientation
2014-09-16 10:29:54 -07:00
Stephen Birarda
866f2005bd handle case where a location should be faced 2014-09-16 10:08:21 -07:00
Stephen Birarda
0033dfe5af use quat orientation to store locations and user locations 2014-09-16 09:57:21 -07:00
Stephen Birarda
4cef21aa4f don't prepend relative paths with hifi scheme 2014-09-16 09:14:06 -07:00
ZappoMan
ffe1e2db00 fix crash in butterflies.js 2014-09-16 09:07:22 -07:00
Philip Rosedale
d01b73bdaa Merge pull request #3423 from chansensturm/audio-temp
Head Penumbra filter changes (feedback from testing with Freddy)
2014-09-15 20:00:11 -07:00
Atlante45
d80a42b800 New recording file format
Added header containing:
		- Magic number
		- Version number
		- Data Offset
		- Data Length
		- CRC-32
	Planned space for metadata
	Added context block (domain, models, transform, display name,
attachments)
	Improved glm types packing (SHould take about half the space it
used to))
2014-09-15 19:19:10 -07:00
Atlante45
ffba243a4f Added methods to read/write glm types 2014-09-15 19:17:16 -07:00
Atlante45
b28e7e4562 Added RecordingContext support to Player/Recorder
Changed meaning of certain values stored in recordings
2014-09-15 19:14:47 -07:00
Atlante45
29f85ecca4 Introduced RecordingContext class 2014-09-15 19:09:40 -07:00
Atlante45
8f65f036dd Remove deprecated getters 2014-09-15 19:06:09 -07:00
Atlante45
145e11a478 Move one-line method to .h
Moved method to .h f line less than 120 characters
	Added _lookAtPosition to RecordingFrame
2014-09-15 19:01:50 -07:00
Atlante45
9b87e31739 Fixed typo 2014-09-15 18:47:55 -07:00
Craig Hansen-Sturm
b6c38b82dc stray inline keyword 2014-09-15 18:41:41 -07:00
Craig Hansen-Sturm
8de32f1170 out-of-line inline's for performance critical member functions 2014-09-15 18:38:36 -07:00
Craig Hansen-Sturm
d8a4d71b08 out-of-line inline's for performance critical member functions 2014-09-15 18:38:32 -07:00
Brad Hefta-Gaub
a9206e0e85 Merge pull request #3422 from chansensturm/audio-temp
Implement Gordon-Smith 2-pole quadrature oscillator
2014-09-15 18:24:11 -07:00
Brad Hefta-Gaub
1ca11c5d75 Merge pull request #3421 from Atlante45/radio_js
Radio js
2014-09-15 16:19:27 -07:00
Atlante45
f3e2507ed3 Merge branch 'master' of https://github.com/highfidelity/hifi into radio_js 2014-09-15 15:54:31 -07:00
Andrew Meadows
0539246089 merge upstream/master into andrew/ragdoll 2014-09-15 13:56:51 -07:00
Andrew Meadows
b2432876ce More reliable floor detection for avatar movement.
Also tweaked max walking speed.
2014-09-15 13:53:37 -07:00
Craig Hansen-Sturm
7a9cf193b4 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-15 13:47:24 -07:00
Craig Hansen-Sturm
1c955384fb coding standard/typo 2014-09-15 09:56:11 -07:00
ZappoMan
fd9f64cb44 normalize all quats before packing 2014-09-15 08:46:28 -07:00
Craig Hansen-Sturm
0ba952b2f8 cleanup/remove stray static _frameOffset 2014-09-14 12:32:48 -07:00
Craig Hansen-Sturm
4a63f9f764 implement Gordon-Smith 2-pole quadrature oscillator 2014-09-14 12:22:32 -07:00
Craig Hansen-Sturm
85f68662b0 implement Gordon-Smith 2-pole quadrature oscillator 2014-09-14 12:22:29 -07:00
ZappoMan
ac27c36c3d one more shot at these warnings 2014-09-13 09:40:44 -07:00
ZappoMan
d92d2d57a0 one more shot at these warnings 2014-09-13 09:28:28 -07:00
ZappoMan
04772f6e5d fix more signed/unsigned warnings 2014-09-13 09:09:18 -07:00
ZappoMan
4ae3360f83 fix warning 2014-09-13 08:50:52 -07:00
ZappoMan
be8994f3a3 attempt to fix warning 2014-09-13 08:47:18 -07:00
ZappoMan
e76ffb2ecb fixed another warning 2014-09-13 08:44:13 -07:00
ZappoMan
64479b067e fix more warnings, replace assert with debug message 2014-09-13 08:21:23 -07:00
ZappoMan
51b66bdee3 fixed warnings and converted several asserts to debug messages 2014-09-13 08:14:31 -07:00
ZappoMan
973479d1ac fix warning in ByteCountCoded<> 2014-09-13 07:57:45 -07:00
Andrew Meadows
f2882618be merge upstream/master into andrew/inertia
Conflicts:
	interface/src/avatar/MyAvatar.cpp
2014-09-12 17:50:26 -07:00
Andrew Meadows
62867391a3 collide against PhysSimulation instead of VoxelTree 2014-09-12 17:38:45 -07:00
Andrew Meadows
32b07027d3 namechange planeNormal --> faceNormal 2014-09-12 17:27:56 -07:00
Stephen Birarda
3b21348a63 make sure AddressManager signal is connected to before file event 2014-09-12 15:22:51 -07:00
Stephen Birarda
29dae39ad7 handle location lookup for offline user or not found 2014-09-12 15:01:08 -07:00
Philip Rosedale
3fbe183196 Merge pull request #3402 from ZappoMan/stretchableEntities
New Entities Features
2014-09-12 13:57:45 -07:00
Brad Hefta-Gaub
b209b70094 Merge pull request #3404 from birarda/data-web-domain-lookup
initial transition to new metaverse API
2014-09-12 13:45:40 -07:00
Brad Hefta-Gaub
fc33de28a0 Merge pull request #3399 from huffman/19831
Code Review for Job #19831
2014-09-12 13:45:20 -07:00
Ryan Huffman
113e9cf43b Remove use of Quat::rotate 2014-09-12 13:31:07 -07:00
Stephen Birarda
f0ead98a2a put back LocationScriptingInterface so it works prior to replacement 2014-09-12 13:28:18 -07:00
Stephen Birarda
892e0e7cbf fix node auth url, NAN break on windows 2014-09-12 11:43:50 -07:00
Stephen Birarda
88a75a3585 fix for goToUser from ChatWindow 2014-09-12 11:27:54 -07:00
Stephen Birarda
348bcdb37a resolve conflicts on merge with upstream master 2014-09-12 11:23:16 -07:00
Stephen Birarda
1084483dd5 fix for default param of default constructed quat 2014-09-12 11:22:34 -07:00
Stephen Birarda
93ff34baaa force address bar lookup through handleLookupString 2014-09-12 11:21:38 -07:00
Stephen Birarda
ab7df8679d fix broken hifi linking 2014-09-12 11:19:22 -07:00
ZappoMan
45fc8423ba move getRadius to public for now 2014-09-12 10:26:47 -07:00
ZappoMan
64e2033b30 move getRadius to public for now 2014-09-12 10:26:24 -07:00
Stephen Birarda
1f2020d169 some url handling repairs, move existing error reply handlers to new format 2014-09-12 10:13:33 -07:00
ZappoMan
e8c1cb7db8 read old format files correctly 2014-09-12 09:38:35 -07:00
Andrew Meadows
4e7a7667b1 remove unused variable 2014-09-12 09:19:03 -07:00
Stephen Birarda
745edb8b0a fix error handling for location naming 2014-09-12 09:10:47 -07:00
ZappoMan
25d051090a swap order of local vs server changes in entity scripting to improve potential conflicts 2014-09-12 08:48:40 -07:00
Andrew Meadows
825be3e1e7 fix for ray-vs-AACubeShape intersection test 2014-09-12 08:40:48 -07:00
Andrew Meadows
a9957ac7df the real fix for ray-vs-plane intersection 2014-09-12 08:40:03 -07:00
Andrew Meadows
ff0872a5f0 add RayIntersectionInfo::getIntersectionPoint() 2014-09-12 08:38:44 -07:00
Andrew Meadows
46089a0611 fix ray-vs-AACube logic 2014-09-12 08:37:47 -07:00
ZappoMan
baaf01683e removed some verbose comments 2014-09-12 08:23:13 -07:00
ZappoMan
024f1b47c2 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities
Conflicts:
	interface/src/entities/RenderableBoxEntityItem.cpp
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/shared/src/Extents.h
2014-09-12 08:18:09 -07:00
ZappoMan
4bce7f8c0b removed debug 2014-09-12 08:14:28 -07:00
ZappoMan
54ef5d4698 fixed bugs in MovingEntitiesOperator, improved getDistanceToBottomOfEntity, isRestingOnSurface 2014-09-12 07:45:33 -07:00
Philip Rosedale
8428b1a4ba Merge pull request #3401 from chansensturm/audio-noise
New stereo audio panning object
2014-09-11 17:53:55 -07:00
Stephen Birarda
b56ea5c936 centralize path creation from position and orientation to AddressManager 2014-09-11 17:17:47 -07:00
Craig Hansen-Sturm
1d0ba52445 implemented new audio panning object which implements constant power sin^2+cos^2=1 law 2014-09-11 17:15:49 -07:00
ZappoMan
77dff69805 fix ray picking to work with registation points 2014-09-11 17:03:01 -07:00
ZappoMan
695569b64b reconcile use of getAACube() and handle rotations properly 2014-09-11 16:43:53 -07:00
ZappoMan
2148baae21 add boxInFrustum 2014-09-11 16:40:32 -07:00
ZappoMan
9f4d199440 move bound proxy rendering to EntityTreeRedering, added helper functions for various bounding boxes 2014-09-11 15:36:13 -07:00
ZappoMan
7db2930d91 remove calls to calculateRotatedExtents() use Extents.rotate() instead 2014-09-11 12:33:38 -07:00
ZappoMan
ceb1740f38 handy conversions between AABox, AACube, and Extents 2014-09-11 12:33:24 -07:00
ZappoMan
a022d47792 improve constness for operators on PropertyFlags<> 2014-09-11 12:33:04 -07:00
ZappoMan
f88970f8fe moved Extents to shared 2014-09-11 12:32:47 -07:00
ZappoMan
2757f16045 remove calls to calculateRotatedExtents() use Extents.rotate() instead 2014-09-11 12:29:47 -07:00
ZappoMan
d616c7fa0c handy conversions between AABox, AACube, and Extents 2014-09-11 12:23:35 -07:00
ZappoMan
7cadc3433a improve constness for operators on PropertyFlags<> 2014-09-11 12:13:34 -07:00
Stephen Birarda
23a0ef2de1 remove some spacing in AddressManager 2014-09-11 12:13:13 -07:00
ZappoMan
13cffa6e44 moved Extents to shared 2014-09-11 12:12:25 -07:00
Craig Hansen-Sturm
893d4686db comments 2014-09-11 11:18:05 -07:00
Ryan Huffman
4315d63fb5 Merge branch 'master' of github.com:highfidelity/hifi into 19831 2014-09-11 11:13:13 -07:00
Stephen Birarda
6d21c4bf0d make lookup for hostnames case insensitive 2014-09-11 11:07:42 -07:00