Brad Hefta-Gaub
|
2d3fe497e4
|
fix typo
|
2015-11-17 13:29:28 -08:00 |
|
Seth Alves
|
d21a2fee20
|
don't use spatial-key for normal grab, only equip. allow switching from a near or far grab to an equip.
|
2015-11-17 13:12:22 -08:00 |
|
Brad Hefta-Gaub
|
32bf81ef0d
|
move MessagesClient to agent
|
2015-11-17 12:59:12 -08:00 |
|
Seth Alves
|
5fd5a47325
|
Merge branch 'master' of github.com:highfidelity/hifi into grab-equip
|
2015-11-17 12:45:28 -08:00 |
|
Leonardo Murillo
|
c3d882e849
|
Merge pull request #6399 from birarda/qt-5.5
change BUILD guides for Qt 5.5.1 and default homebrew recommendation
|
2015-11-17 14:41:00 -06:00 |
|
Stephen Birarda
|
46c8d7b3f8
|
fix for release build undeclared identifier
|
2015-11-17 12:32:45 -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
|
1c2c37ff44
|
more cleanup work
|
2015-11-17 11:10:12 -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
|
c27a127739
|
add example script
|
2015-11-17 10:41:26 -08:00 |
|
Brad Hefta-Gaub
|
1f7c70a0d1
|
implement proper sending
|
2015-11-17 10:28:50 -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 |
|
samcake
|
1206c3518c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
|
2015-11-17 09:33:24 -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
|
f6953f2496
|
Merge branch 'messaging' of https://github.com/ZappoMan/hifi into messaging
|
2015-11-17 08:58:06 -08:00 |
|
ZappoMan
|
f712fae4d2
|
more hacking
|
2015-11-17 08:56:21 -08:00 |
|
samcake
|
9a651c6194
|
Merge pull request #6400 from jherico/rec3
Fixing recording interface times
|
2015-11-16 21:54:14 -08:00 |
|
Brad Hefta-Gaub
|
eb4bb1cc03
|
more work
|
2015-11-16 19:34:53 -08:00 |
|
Brad Hefta-Gaub
|
5f04e4a167
|
more work
|
2015-11-16 19:29:54 -08:00 |
|
samcake
|
8553033d59
|
Refactoring the mess for the Agent
|
2015-11-16 19:27:28 -08:00 |
|
Brad Hefta-Gaub
|
1e0b66a68f
|
more work
|
2015-11-16 19:23:39 -08:00 |
|
samcake
|
065c148e0f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
|
2015-11-16 18:31:48 -08:00 |
|
samcake
|
71cc36fdd8
|
removing ms to seconds conversion in MyAvatar
|
2015-11-16 18:31:24 -08:00 |
|
samcake
|
ba952581d0
|
Merge pull request #6389 from AlessandroSigna/groupRecording
added group recording feature
|
2015-11-16 17:57:11 -08:00 |
|
samcake
|
d66049f323
|
Merge pull request #6386 from AlessandroSigna/recorder
added examples for messages synchronization
|
2015-11-16 17:55:32 -08:00 |
|
samcake
|
e6d0b93703
|
Merge pull request #6394 from EdgarPironti/record_branch
ControlledAC.js refactoring
|
2015-11-16 17:53:38 -08:00 |
|
AlessandroSigna
|
f40ff69c75
|
added scripts for group recording
|
2015-11-16 17:27:00 -08:00 |
|
Brad Hefta-Gaub
|
12f206e2f0
|
more work on messages
|
2015-11-16 17:00:03 -08:00 |
|
EdgarPironti
|
b6c27588b6
|
ControlledAC.js refactoring
|
2015-11-16 16:50:47 -08:00 |
|
Brad Davis
|
8a27a2fba5
|
Fixing recording interface times
|
2015-11-16 16:29:10 -08:00 |
|
Stephen Birarda
|
d2b8ba740a
|
change BUILD guides for 5.5.1 and homebrew recs
|
2015-11-16 15:59:52 -08:00 |
|
Stephen Birarda
|
f17af601ab
|
update BUILD for cmake version change
|
2015-11-16 15:52:48 -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 |
|
samcake
|
f036a28602
|
Merge pull request #6392 from jherico/rec3
Recording refactoring
|
2015-11-16 15:08:41 -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 |
|
U-GAPOS\andrew
|
df05a9c8aa
|
fix bug: bodySensorMatrix constantly reset when walking
|
2015-11-16 12:02:16 -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 |
|
Stephen Birarda
|
584e35e4ab
|
have killNodeWithUUID return success to avoid double lookup
|
2015-11-16 10:58:11 -08:00 |
|
Stephen Birarda
|
8dcf245b74
|
Merge pull request #6395 from hyperlogic/tony/avatar-mixer-identity-fixes
AvatarMixer: remove redundant identity packet send
|
2015-11-16 10:35:42 -08:00 |
|
Stephen Birarda
|
789290f540
|
Merge pull request #6370 from Atlante45/locker
QTryRead/WriteLocker
|
2015-11-16 10:22:45 -08:00 |
|