Brad Davis
98cc7408b1
Fixing issues found in AC playback test
2015-11-18 17:17:20 -08:00
Brad Davis
fd3599acc5
PR comments
2015-11-18 14:32:56 -08:00
Brad Davis
5b8047ded4
Make recording and playback work in interface, playback in agent
2015-11-18 14:04:45 -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
Philip Rosedale
9c29ba2ca3
Merge pull request #6408 from imgntn/newbubble
...
Change out bubble model
2015-11-17 20:30:59 -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
Brad Hefta-Gaub
a1e10a9f04
Merge pull request #6309 from thoys/20724
...
CR for Job #20724 - Camera entity mode
2015-11-17 20:05:22 -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
Brad Hefta-Gaub
963510a3f2
Merge pull request #6414 from jherico/dargo
...
Fix OpenSSL 64 bit search logic
2015-11-17 19:33:19 -08:00
Brad Davis
ec918a1cf5
Fix OpenSSL 64 bit search logic
2015-11-17 19:10:16 -08:00
Brad Hefta-Gaub
6247aa207f
Merge pull request #6412 from birarda/master
...
fix for messages-mixer bail early on empty settings
2015-11-17 19:09:43 -08:00
samcake
c1675bba21
Fix typo introduced by debug
2015-11-17 19:01:29 -08:00
samcake
368f19b4e2
Merging with todays upstream and checking
2015-11-17 18:58:10 -08:00
Stephen Birarda
2355ba70ca
just remove messages-mixer settings grabbing all together
2015-11-17 18:55:09 -08:00
Stephen Birarda
c21fbc9a46
fix for messages-mixer bail early on empty settings
2015-11-17 18:53:23 -08:00
Brad Hefta-Gaub
96b877df97
Merge pull request #6410 from AlessandroSigna/groupRecording
...
Group recording - better structure
2015-11-17 18:46:14 -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
dbd74dc9e2
Merge pull request #6411 from jherico/chiana
...
A couple fixes for windows 64 bit builds
2015-11-17 18:36:57 -08:00
Brad Davis
68c6718d1c
Fixes for windows 64 bit builds
2015-11-17 18:22:00 -08:00
AlessandroSigna
5400381583
improved the structure
2015-11-17 18:03:26 -08:00
AlessandroSigna
8566d84709
fixed cleanup - unload
2015-11-17 18:03:25 -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
Seth Alves
94f18672d4
equip from a distance uses a spring to pull the object to the hand before equipping it
2015-11-17 17:18:16 -08:00
Brad Davis
4e57c9114c
Avatar has no dependency on audio or recording anymore
2015-11-17 17:13:53 -08:00
James B. Pollack
b340a99d69
Merge pull request #6290 from zzmp/examples/growth
...
Add growth script to examples
2015-11-17 17:01:28 -08:00
James B. Pollack
e0a9048287
new bubble model
2015-11-17 16:59:14 -08:00
Brad Davis
0ad1d08041
Exclude avatar scales out of the permissable range
2015-11-17 16:46:25 -08:00
Brad Davis
d87b8a749f
Merge pull request #6405 from ZappoMan/messaging
...
Messaging Improvements
2015-11-17 16:41:35 -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
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
Brad Hefta-Gaub
4ef04f4080
Merge pull request #6406 from birarda/peer-active-signal
...
add socketActivated signal to NetworkPeer for punch success
2015-11-17 15:50:47 -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
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
Seth Alves
5ae3c5aea0
adjust size of near-grab radius.
2015-11-17 14:59:06 -08:00
Seth Alves
c6051bb325
reduce size of near-grab radius. don't draw pick laser until we know we aren't going to do a near grab
2015-11-17 14:58:20 -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
Brad Hefta-Gaub
6dfcc53c27
properly handle removing subscribers from channels when the subscriber node disconnects
2015-11-17 14:19:13 -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
f54374b66a
remove unused settings
2015-11-17 13:40:04 -08:00
