Anthony J. Thibault
e2f031e77f
AnimDebugDraw Removed unused drawing code.
2015-11-21 10:57:39 -08:00
Anthony J. Thibault
fe683edb66
Avatar Debug Draw Default Pose now works
2015-11-21 10:53:24 -08:00
Seth Alves
4646c0c103
unmangle merge
2015-11-21 10:49:31 -08:00
Anthony J. Thibault
6cfd831a5a
Menu: Added Developer > Avatar > Debug Draw Position
...
Also renamed "Debug Draw Bind Pose" to "Debug Draw Default Pose"
2015-11-21 09:50:56 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Seth Alves
0b1fa4f60f
add interface for getters for specific joints
2015-11-21 08:21:10 -08:00
Anthony J. Thibault
995958a8f0
Rig: normalized index bounds checking.
2015-11-20 18:45:53 -08:00
Anthony J. Thibault
54408a9c87
AnimVars are now in avatar/rig space
...
This makes it much simpler for code out side of the rig to manipulate AnimVars
* Removed mat4 type from AnimVars
* AnimVariantMap now has a _rigToGeometryTransform matrix
used to transform positions and rotations into the correct coordinate frame.
* Moved AnimPose code to extract a quat from a scaled matrix into GLMHelpers
2015-11-20 18:29:17 -08:00
EdgarPironti
ebbed7c525
Save clip to asset - removing last fix
2015-11-20 18:23:36 -08:00
samcake
de56f698aa
Merge pull request #6444 from EdgarPironti/asset_branch
...
Save clip to asset
2015-11-20 16:28:55 -08:00
Brad Davis
336562b894
Merge pull request #6452 from ctrlaltdavid/20732
...
Make multiline strings from JavaScript's print() readably in log file
2015-11-20 16:25:17 -08:00
EdgarPironti
df2153186d
Fixes
2015-11-20 16:07:31 -08:00
EdgarPironti
e70f6855aa
Fixes
2015-11-20 16:07:30 -08:00
EdgarPironti
35365f9157
Fixes
2015-11-20 16:07:30 -08:00
EdgarPironti
1db6d0e3c1
Upload QByteArray
2015-11-20 16:07:29 -08:00
EdgarPironti
1b18d3656f
Save clip to asset
2015-11-20 16:07:29 -08:00
Stephen Birarda
c8b5f6f737
fix for top on deque when empty
2015-11-20 16:03:18 -08:00
Brad Davis
f45eff3df9
Merge pull request #6455 from samcake/controllers
...
Recording playback the skeleton animation correctly for agents
2015-11-20 15:35:53 -08:00
Stephen Birarda
9ddebc8d13
resolve conflicts on merge with upstream/master
2015-11-20 15:29:44 -08:00
samcake
0dc551409d
Fixing a comment
2015-11-20 15:22:01 -08:00
Anthony J. Thibault
4f8cd6930d
Rig: Fixes for initializing _absolutePoses during initJointStates
2015-11-20 15:13:16 -08:00
samcake
e97e864de7
Getting the animation playback to work
2015-11-20 15:05:17 -08:00
Clément Brisset
5d75fcbfce
Merge pull request #6430 from birarda/unique_linked_data
...
use a unique_ptr for linkedData in Node
2015-11-20 15:01:41 -08:00
Anthony J. Thibault
2f37335d77
Warning fixes
2015-11-20 14:50:42 -08:00
Anthony J. Thibault
30087ef0bd
Removed dead code
2015-11-20 14:37:53 -08:00
Anthony J. Thibault
cb89f09635
Removed EntityRig and AvatarRig. One Rig to rule them all.
2015-11-20 14:27:01 -08:00
Anthony J. Thibault
a77ea8da43
Removed JointStates! You won't be missed.
2015-11-20 14:15:37 -08:00
howard-stearns
1ddcc62db9
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2
2015-11-20 14:05:40 -08:00
howard-stearns
6c784256cb
final(?) cleanup
2015-11-20 13:51:12 -08:00
David Rowe
c72c6a0a47
Make multiline strings from JavaScript's print() readably in log file
...
Addresses quoting of newline characters as "\n" which was introduced in
Qt 5.5.
2015-11-21 10:44:21 +13:00
Brad Hefta-Gaub
c7673aad4a
Merge pull request #6447 from huffman/polyline-texture
...
Add texture property to polyline entity type
2015-11-20 13:31:34 -08:00
Brad Hefta-Gaub
879c42c269
Merge pull request #6451 from jherico/rec5
...
Force synchronous loading of clips in JS
2015-11-20 13:13:34 -08:00
Brad Davis
eef01f8a13
Merge pull request #6443 from ZappoMan/assetJS
...
fix crash with no asset server
2015-11-20 12:58:16 -08:00
Stephen Birarda
b34934b849
resolve conflicts on merge with upstream/master
2015-11-20 11:52:53 -08:00
Brad Davis
cc2a7cbda8
Force synchronous loading of clips in JS
2015-11-20 11:51:08 -08:00
Brad Hefta-Gaub
c22d632c3a
Merge pull request #6446 from jherico/rec4
...
Support writing a clip to a qbytearray
2015-11-20 11:45:39 -08:00
Brad Hefta-Gaub
f1badc017b
CR feedback
2015-11-20 11:43:50 -08:00
Brad Davis
a356f96a7b
Merge pull request #6448 from ZappoMan/messaging
...
fix senderID in messages, dry up code
2015-11-20 11:42:30 -08:00
Clément Brisset
f4b0492b33
Merge pull request #6436 from birarda/ghost-avatar
...
fix for ghosted avatars thanks to check/add race
2015-11-20 11:41:20 -08:00
Brad Hefta-Gaub
7e9190d0e1
Merge branch 'master' of https://github.com/highfidelity/hifi into assetJS
2015-11-20 11:39:50 -08:00
Anthony J. Thibault
a4116e633a
Removed last consumer of JointState class
...
Removed option to render IK constraints used by old animation system
2015-11-20 11:26:54 -08:00
Brad Hefta-Gaub
caa8b0b5b6
fix unix build
2015-11-20 11:07:01 -08:00
Stephen Birarda
19d3d80ff9
fixes for some incorrect assumptions
2015-11-20 11:03:52 -08:00
Anthony J. Thibault
df7ca3bc38
Rig: getJointRotation and getJointTranslation use _relativePoses
2015-11-20 10:36:40 -08:00
Brad Hefta-Gaub
4bbfcb6092
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
2015-11-20 10:30:38 -08:00
Anthony J. Thibault
923d60e452
Rig: Bug fix for copyJointsIntoJointData
2015-11-20 10:30:12 -08:00
Anthony J. Thibault
ad4b8e0001
Avatar transmission fixes, moved JointData into shared
...
* Moved JointData into shared library
* added methods to the rig to copy into and out of JointData
* JointData translations must be in meters this is so the
fixed point compression wont overflow, also, it's a
consistent wire format.
2015-11-20 10:24:24 -08:00
Brad Hefta-Gaub
0e5e33446e
handle old protocol case
2015-11-20 09:57:30 -08:00
Howard Stearns
0f6a37f0f7
remainder->fmod!
2015-11-20 09:49:14 -08:00
Anthony J. Thibault
27685e0425
Bug fixes for other Avatar root translation
2015-11-20 09:33:57 -08:00
Brad Hefta-Gaub
8ba6dfe721
add deprication warning about binary SVOs
2015-11-20 09:29:36 -08:00
Anthony J. Thibault
c2ae6f0c8e
Fix for remote Avatar
...
Make sure to copy the correct data to and from AvatarData::JointData
2015-11-20 09:20:41 -08:00
Brad Hefta-Gaub
abf169ebd9
fix senderID in messages, dry up code
2015-11-20 09:03:21 -08:00
Brad Davis
5adcbcaf5f
Support writing a clip to a qbytearray
2015-11-19 20:23:50 -08:00
Brad Hefta-Gaub
5c6cd9b06c
fix thread safety and crash with no asset server
2015-11-19 18:53:12 -08:00
Anthony J. Thibault
302b6f7e26
Mac and Debug build fixes
2015-11-19 18:28:15 -08:00
Anthony J. Thibault
9e36a79155
Rig: hooked up script overridePoses
2015-11-19 18:14:04 -08:00
samcake
732c911fd7
Merge pull request #6439 from ZappoMan/assetJS
...
add Assets.uploadData() and Assets.downloadData()
2015-11-19 17:56:10 -08:00
Stephen Birarda
5f9c3eea76
use a priority queue to ensure ordering of injectors
2015-11-19 17:42:14 -08:00
Anthony J. Thibault
46d23a9f38
head IK and controller IK work again!
2015-11-19 17:30:56 -08:00
Stephen Birarda
adf41fce19
use alias for unique_lock and mutex
2015-11-19 17:29:20 -08:00
Brad Hefta-Gaub
f80a765a29
add Assets.uploadData() and Assets.downloadData()
2015-11-19 17:28:20 -08:00
Stephen Birarda
3b56df6e99
use deleteLater immediately not that finish is right thread
2015-11-19 17:27:18 -08:00
Howard Stearns
431a8c9584
cleanup
2015-11-19 17:12:50 -08:00
Stephen Birarda
22f5d4df6d
change signature of copy return
2015-11-19 16:25:33 -08:00
Stephen Birarda
430cb7876d
remove a couple of read lockers for AvatarHashMap
2015-11-19 16:22:56 -08:00
Stephen Birarda
40397add43
fix for extra adds in AvatarManager
2015-11-19 16:15:21 -08:00
Brad Davis
e187aaedcb
Load recorded clips from URLs, not file paths
2015-11-19 15:56:37 -08:00
Stephen Birarda
6398a922c6
leverage COW for AvatarHash
2015-11-19 15:43:29 -08:00
Ryan Huffman
9e31614fce
Fix textures property not being sent for polyline
2015-11-19 15:16:46 -08:00
Stephen Birarda
2a05ec650b
fix locking in AvatarHashMap/AvatarManager
2015-11-19 14:17:48 -08:00
Anthony J. Thibault
982e2c06a9
Rig: Switched over to use AnimPoses instead of JointStates
...
* fixed debug rendering
* improved jointState/animPose diff detection code.
2015-11-19 12:14:04 -08:00
Howard Stearns
f6286201f4
cleanup
2015-11-19 11:55:22 -08:00
Ryan Huffman
07d21514c5
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-19 10:47:37 -08:00
Seth Alves
2938f0d835
Merge pull request #6421 from ZappoMan/outOfOrderDelete
...
Possible fix to abandoned lines/entities
2015-11-19 10:26:14 -08:00
Brad Hefta-Gaub
e318537af4
Merge pull request #6425 from birarda/handshake-ds-settings
...
fix case where servers could run without settings
2015-11-19 10:10:28 -08:00
Ken Cooke
2c98976ef2
Fix bug from implicit cast
2015-11-19 10:05:10 -08:00
Seth Alves
98073de0b8
Merge pull request #6426 from ZappoMan/entitiesFileDownload
...
implement support to download the persist file from entity server status page
2015-11-19 09:47:10 -08:00
Brad Hefta-Gaub
45e8ebbe8c
Merge pull request #6432 from huffman/lod-range
...
Increase available range in LOD Tools
2015-11-19 09:40:10 -08:00
Ken Cooke
3060aa960d
Fix the case when local-echo and self-reverb both active
2015-11-19 09:23:58 -08:00
Howard Stearns
7d30cd0159
checkpoint: it works!
2015-11-19 09:18:40 -08:00
Ryan Huffman
8adf456b91
Update range of LOD to go up to 20:2
2015-11-19 08:52:57 -08:00
Ken Cooke
998f6e099f
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb
2015-11-19 08:39:55 -08:00
Ken Cooke
2489eaa30e
Changed the audio pipeline to allow stereo reverberation, using separate source (loopback audio) and listener (received audio) reverbs.
2015-11-19 08:32:13 -08:00
Anthony J. Thibault
721da29432
WIP checkpoint
...
* No longer normalizing scale in AnimSkeleton and AnimClip
This means graph is animating in 'geometry' coordinates
before unit scale is even applied. This is necessary to
properly work with both Avatar based models and ModelEntity
based models
Many things are broken.
* debug rendering (translations are x100)
* IK hand targets
* follow cam
* I did not even dare to try HMD mode
2015-11-18 18:47:33 -08:00
Stephen Birarda
271387f96e
use a unique_ptr for linkedData in Node
2015-11-18 18:03:31 -08:00
samcake
74beeefe06
Merge pull request #6420 from jherico/dargo
...
Make recording and playback work in interface, playback in agent
2015-11-18 17:52:09 -08:00
Brad Hefta-Gaub
456da661ff
implement support to download the persist file from entity server status page
2015-11-18 17:30:07 -08:00
Brad Davis
98cc7408b1
Fixing issues found in AC playback test
2015-11-18 17:17:20 -08:00
Ryan Huffman
2a416ebc61
Merge branch 'master' of https://github.com/highfidelity/hifi into received-message
2015-11-18 16:52:23 -08:00
Anthony J. Thibault
b054ef1488
Rig: fixes for rigs used for ModelEntities.
2015-11-18 16:04:34 -08:00
Anthony J. Thibault
3a74d188b0
AnimSkeleton: Added default poses
2015-11-18 16:03:28 -08:00
Anthony J. Thibault
5ffef7f41a
AnimPose: bug fix for extracting rotations from matrices with large scale
2015-11-18 16:02:30 -08:00
Stephen Birarda
08e6b63090
cleanup debug of received domain-server settings
2015-11-18 15:43:31 -08:00
Stephen Birarda
cb708859fb
resolve conflicts on merge with upstream master
2015-11-18 15:34:56 -08:00
Ryan Huffman
c2648fd6dd
Remove _packetListenerMap
2015-11-18 15:30:43 -08:00
Ryan Huffman
f0ad7f85dc
Add readHead* to ReceivedMessage
2015-11-18 15:30:30 -08:00
Stephen Birarda
3ba0c9d042
resolve conflicts on merge with upstream master
2015-11-18 15:29:39 -08:00
Stephen Birarda
f2ecce6043
use safer domain settings request in audio-mixer
2015-11-18 15:13:29 -08:00
Stephen Birarda
1a066abb26
fix some indentation for UDT_CONNECTION_DEBUG lines
2015-11-18 14:43:56 -08:00
Brad Davis
fd3599acc5
PR comments
2015-11-18 14:32:56 -08:00
Brad Hefta-Gaub
2f3cf82202
don't apply out of order edits to entities that have been deleted
2015-11-18 14:26:18 -08:00
Stephen Birarda
65142a3963
clean up agent comment for domain settings request
2015-11-18 14:20:56 -08:00
howard-stearns
42a1ee353e
checkpoint
2015-11-18 14:09:33 -08:00
Brad Davis
5b8047ded4
Make recording and playback work in interface, playback in agent
2015-11-18 14:04:45 -08:00
Ryan Huffman
3d0afc3c5f
Update entities version number for polyline change
2015-11-18 14:00:00 -08:00
Ryan Huffman
2fe9af54d4
Add textures property to polyline
2015-11-18 13:59:32 -08:00
Anthony Thibault
d3d3ddfaf1
Merge pull request #6417 from AndrewMeadows/avatar-capsule
...
fix bounding capusule calculations for new avatars
2015-11-18 13:02:48 -08:00
Ken Cooke
cc90662bf0
PR feedback
2015-11-18 12:17:27 -08:00
Brad Hefta-Gaub
35677d3a48
Merge pull request #6418 from birarda/test-ds-settings-fail
...
move keepalive pings transparently to NL
2015-11-18 11:12:16 -08:00
Andrew Meadows
5c6df734c5
initialize vector of vec3's
2015-11-18 10:47:53 -08:00
Stephen Birarda
c54dffac12
fix entity-server avg ping, remove debug
2015-11-18 10:32:35 -08:00
Ken Cooke
1a7f06dc95
Removed the commented-out Gverb code
2015-11-18 10:26:06 -08:00
Andrew Meadows
ae88057ad9
remove dangling whitespace
2015-11-18 10:24:10 -08:00
Stephen Birarda
0e3d3451d7
make keep alive pings the responsibility of NL
2015-11-18 10:24:10 -08:00
Brad Davis
2636e43fab
Merge pull request #6413 from samcake/controllers
...
Recording: Moving the Recording js interface to the Script engine
2015-11-18 10:22:55 -08:00
Ken Cooke
8ae3fa61c5
Fix compiler issues
2015-11-18 10:06:40 -08:00
Anthony J. Thibault
b481d7c73d
Merge branch 'master' into tony/remove-joint-states
2015-11-18 09:38:21 -08:00
Andrew Meadows
ee751ed1b9
use kDop volume of avatar mesh parts for capsule
2015-11-18 09:22:40 -08:00
Ken Cooke
c61dad108c
Replace Gverb with new reverb
2015-11-18 09:16:18 -08:00
Ken Cooke
0f214555c1
New algorithmic stereo reverb
2015-11-18 09:13:03 -08:00
Howard Stearns
97898a1ad1
forgot new files
2015-11-17 20:43:40 -08:00
Philip Rosedale
5b853ddf57
Merge pull request #6402 from sethalves/grab-equip
...
grab script bumper is an equip toggle
2015-11-17 20:15:26 -08:00
Philip Rosedale
450608bf5b
Merge pull request #6390 from sethalves/average-near-holds
...
Average near holds
2015-11-17 20:01:46 -08:00
samcake
368f19b4e2
Merging with todays upstream and checking
2015-11-17 18:58:10 -08:00
Anthony J. Thibault
9a39da9050
new absolutePoses work for avatars, but not for model entities.
2015-11-17 18:53:38 -08:00
Brad Hefta-Gaub
ba922290a4
Merge pull request #6407 from jherico/dargo
...
Exclude avatar scales out of the permissable range
2015-11-17 18:41:15 -08:00
Brad Hefta-Gaub
733d93039f
Merge pull request #6403 from jherico/rec3
...
Recording fixes
2015-11-17 17:52:15 -08:00
samcake
d2f3b48637
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-17 17:36:38 -08:00
Stephen Birarda
2aa56b5384
include memory header for unique_ptr
2015-11-17 17:26:45 -08:00
Stephen Birarda
35dd5fb564
include NLPacket in AudioInjector for unique_ptr
2015-11-17 17:26:07 -08:00
Brad Davis
4e57c9114c
Avatar has no dependency on audio or recording anymore
2015-11-17 17:13:53 -08:00
Stephen Birarda
1c485bacff
include the condition_variable header in AIM
2015-11-17 17:11:40 -08:00
Stephen Birarda
d20fd6d7e7
cap max to 40, clarify comment
2015-11-17 17:08:48 -08:00
Stephen Birarda
cf2ad9a877
remove atomic include from AudioInjector
2015-11-17 17:07:29 -08:00
Stephen Birarda
62b218632d
don't use unneeded atomic for AudioInjector State
2015-11-17 17:06:21 -08:00
Stephen Birarda
5dc48dc9dc
resolve conflicts on merge with upstream/master
2015-11-17 17:04:12 -08:00
Stephen Birarda
8e4d7c69ce
handle AudioInjectorManager for scripted ACs
2015-11-17 17:01:11 -08:00
Brad Davis
0ad1d08041
Exclude avatar scales out of the permissable range
2015-11-17 16:46:25 -08:00
Stephen Birarda
935c0cc137
handle AudioInjectorManager cleanup in Application
2015-11-17 16:39:23 -08:00
Brad Hefta-Gaub
293914b84f
added NodeActivated signal to make it easier for users to know when a recently added node has an active socket
2015-11-17 16:31:34 -08:00
Stephen Birarda
ab5c8e072f
handle blocked AudioInjectorManager for restart
2015-11-17 16:31:18 -08:00
Brad Hefta-Gaub
073215d067
handle socketActivated
2015-11-17 15:55:41 -08:00
Brad Hefta-Gaub
9c4286b6ca
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
2015-11-17 15:50:54 -08:00
Stephen Birarda
f5ec458a5e
make activeSocket checks more consistent
2015-11-17 15:38:03 -08:00
Stephen Birarda
3906a747b8
fix a couple of bad checks
2015-11-17 15:33:57 -08:00
Brad Davis
48b0465e56
Fixing race condition on seek, correcting some issues with frame timing
2015-11-17 15:18:32 -08:00
Brad Davis
900f425f35
Recording fixes
2015-11-17 15:18:31 -08:00
Stephen Birarda
d764ff2e87
remove static variables in AudioInjector.cpp
2015-11-17 15:12:04 -08:00
Stephen Birarda
34b8fca83b
add socketActivated signal to NetworkPeer for punch success
2015-11-17 15:04:31 -08:00
Stephen Birarda
7dfdb3c72e
protect LNL packet sending without active socket
2015-11-17 15:04:14 -08:00
Brad Hefta-Gaub
3efbcb7062
debug the late connect case
2015-11-17 14:47:59 -08:00
Brad Hefta-Gaub
d8a3927311
debug the late connect case
2015-11-17 14:43:06 -08:00
Andrew Meadows
2b07daa976
Merge pull request #6404 from hyperlogic/tony/bugfixes-for-avatars-with-no-eyes
...
Bug fixes for avatars with no eyes
2015-11-17 14:29:20 -08:00
Brad Hefta-Gaub
85aa3b3f83
handle subscribe when messages mixer is not available
2015-11-17 14:28:51 -08:00
Stephen Birarda
7da6ec46c4
more handling of various AudioInjector states
2015-11-17 14:20:59 -08:00
Brad Hefta-Gaub
8112b3b57e
add senderUUID to the messageReceived signal
2015-11-17 14:16:22 -08:00
Brad Davis
6664d8d919
Merge pull request #6398 from ZappoMan/messaging
...
messages-mixer
2015-11-17 14:03:03 -08:00
Anthony J. Thibault
e93b5c5838
Bug fixes for avatars with no eyes
...
Changed default eye position to 1.9 meters because
the hifi_team avatars are 2.0 meters tall.
Also, prevent array access with negative indices when eye bones are missing.
ಠ_ಠ
2015-11-17 14:02:27 -08:00
Brad Hefta-Gaub
2f142eb088
add a receiver example
2015-11-17 13:33:30 -08:00
Brad Hefta-Gaub
2d3fe497e4
fix typo
2015-11-17 13:29:28 -08:00
Brad Hefta-Gaub
32bf81ef0d
move MessagesClient to agent
2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub
5b9791d800
add message received signal
2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub
e7a8df306c
fix warnings
2015-11-17 11:18:36 -08:00
Brad Hefta-Gaub
60ae1259fa
more cleanup work
2015-11-17 11:06:27 -08:00
Seth Alves
1d4e1eabcb
Merge branch 'master' of github.com:highfidelity/hifi into grab-equip
2015-11-17 11:01:22 -08:00
Brad Hefta-Gaub
034debc483
cleanup
2015-11-17 10:59:53 -08:00
Clément Brisset
198f1452cf
Merge pull request #6396 from ctrlaltdavid/20738
...
Fix particle aging
2015-11-17 10:47:41 -08:00
Brad Hefta-Gaub
f9a674bca5
implement subscribe/unsubscribe in MessagesClient
2015-11-17 10:01:31 -08:00
Seth Alves
b062d23f61
bumper is now an equip toggle
2015-11-17 09:51:52 -08:00
Brad Hefta-Gaub
6b61ec569c
more work on channels
2015-11-17 09:47:50 -08:00
Sam Gateau
5b92929833
Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client
2015-11-17 09:32:22 -08:00
ZappoMan
f712fae4d2
more hacking
2015-11-17 08:56:21 -08:00
Stephen Birarda
4fa934dccf
make sure AudioInjectorManager process is on AI thread
2015-11-16 18:54:16 -08:00
Stephen Birarda
80115d38e9
tweak the AudioInjectorManager for injector threading
2015-11-16 18:53:09 -08:00
Anthony J. Thibault
80eb247b9c
WIP checkin
...
* AnimManipulator: added absolute and relative position and translation support
* Rig: added _overrideFlags and _overridePoses for script overrides.
2015-11-16 18:49:47 -08:00
Brad Hefta-Gaub
12f206e2f0
more work on messages
2015-11-16 17:00:03 -08:00
Stephen Birarda
aa77c4894c
add an AudioInjectorManager for more efficient threading
2015-11-16 16:04:10 -08:00
Brad Hefta-Gaub
40e69f6946
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
2015-11-16 15:31:06 -08:00
Brad Hefta-Gaub
d42a1a721f
first cut at messages-mixer
2015-11-16 15:26:17 -08:00
David Rowe
b3b73e8cd1
Fix particle aging
2015-11-17 12:02:35 +13:00
Brad Davis
d099f61170
Updating audio record/playback mechanism to more closely match actual audio input
2015-11-16 14:57:24 -08:00
Brad Davis
cb26fc67fc
Move recording interface back to float/seconds
2015-11-16 14:44:22 -08:00
Howard Stearns
35f7a1cf10
Merge pull request #6391 from AndrewMeadows/sisyphus7
...
simplify MyAvatar::deriveBodyFromHMDSensor() take 2
2015-11-16 13:55:22 -08:00
Seth Alves
36af315e5d
Merge pull request #6383 from birarda/goodbye-packet
...
send a hopeful disconnect packet from ACs and Interface
2015-11-16 11:28:48 -08:00
Anthony J. Thibault
55adedcec8
Merge branch 'master' into tony/remove-joint-states
2015-11-16 11:22:44 -08:00
Stephen Birarda
584e35e4ab
have killNodeWithUUID return success to avoid double lookup
2015-11-16 10:58:11 -08:00
Stephen Birarda
52716b8f95
emit a ready signal if Sound has downloaded
2015-11-16 10:55:25 -08:00
Stephen Birarda
789290f540
Merge pull request #6370 from Atlante45/locker
...
QTryRead/WriteLocker
2015-11-16 10:22:45 -08:00
Seth Alves
b567a4846d
Merge branch 'master' of github.com:highfidelity/hifi into average-near-holds
2015-11-16 10:08:01 -08:00
Seth Alves
89ed3751ae
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-14 14:00:20 -08:00
Brad Davis
7a34d4f567
Merge pull request #6387 from samcake/controllers
...
Recording : Updating the recorder.js and a few fixes
2015-11-13 17:56:57 -08:00
samcake
89e5db11a0
More fixes
2015-11-13 17:41:41 -08:00
samcake
8c21ac144e
Fixing review comments
2015-11-13 16:45:19 -08:00
U-GAPOS\andrew
6733767d8b
use animation state to compute bodyInSensorFrame
2015-11-13 16:39:40 -08:00
Seth Alves
b0d24be58f
add a way to get a list of all actions of a certain type from an entity. hold actions average their positional targets.
2015-11-13 16:02:39 -08:00
Seth Alves
3b6b56f316
formatting
2015-11-13 14:26:43 -08:00
Seth Alves
3746920655
allow action updates from others when we are the simulation owner
2015-11-13 13:56:30 -08:00
Seth Alves
919ea5f1a0
send action updates even if we aren't the simulation owner
2015-11-13 12:37:07 -08:00
Stephen Birarda
429a4d51d5
Merge pull request #6375 from Atlante45/resize
...
Fix models resizing
2015-11-13 10:23:05 -08:00
