Commit graph

34583 commits

Author SHA1 Message Date
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
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
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
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
Seth Alves
1d4e1eabcb Merge branch 'master' of github.com:highfidelity/hifi into grab-equip 2015-11-17 11:01:22 -08:00
Clément Brisset
198f1452cf Merge pull request #6396 from ctrlaltdavid/20738
Fix particle aging
2015-11-17 10:47:41 -08:00
Seth Alves
b062d23f61 bumper is now an equip toggle 2015-11-17 09:51:52 -08:00
samcake
9a651c6194 Merge pull request #6400 from jherico/rec3
Fixing recording interface times
2015-11-16 21:54:14 -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
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
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
Anthony J. Thibault
7aefc5c9f7 AvatarMixer: remove redundant identity packet send
Removed AvatarClientData::checkAndSetHasReceivedFirstPackets boolean.
This is handled by the AvatarClientData::checkAndSetHasReceivedFirstPacketsFrom
set.
2015-11-16 10:14:28 -08:00
Clément Brisset
b795b66b35 Merge pull request #6365 from sethalves/rework-visual-physics-debug
grab fix + physics logging/debug changes
2015-11-16 09:06:05 -08:00
Philip Rosedale
8e6c860a24 Merge pull request #6393 from hyperlogic/tony/avatar-mixer-identity-fixes
Fix for missing avatars on entry
2015-11-14 20:23:34 -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
Anthony J. Thibault
245150333b Fix for missing avatars on entry
This should fix the issue where a persons avatar was occasionally not visible to others
for a long period of time.  This was due to several factors:

1) When a new avatar was added to the simulation that identity packet was not broadcast to
other avatars on the server. This would rely on random logic to send the identity eventually.
This is fixed in this PR, by sending identity packets to all other clients when a new clients
arrive.

2) The random identity logic was not being executed if the sequence number check caused an update
to be skipped.  This means the probability of sending a random packet was reduced significantly,
especially for clients that were loading geometry on entry.  This was fixed by doing the random
check before sequence number check.

3) The 1/300 probably used in the check was too low, this was only a 63% chance of sending a identity
packet within 5 seconds.  This was fixed by changing the probability to 1/187, which is a 80% chance
to send an identity packet within 5 seconds.

4) The randFloat() implementation slightly reduced the identity packet probability due to quantization errors.
This has been replaced by a C++ std random number generator.
2015-11-13 18:08:18 -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
U-GAPOS\andrew
049fe4abee minor cleanup 2015-11-13 17:42:12 -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
AlessandroSigna
5e395713a6 fix script url 2015-11-13 16:33:54 -08:00
AlessandroSigna
5b66416b8c added cleanup before delete 2015-11-13 16:32:22 -08:00
AlessandroSigna
c8349dda6e added examples for messages synchronization 2015-11-13 16:32:20 -08:00
samcake
64e2cc7b2a Merge pull request #6385 from EdgarPironti/record_branch
Fixes to Master recording for ACs
2015-11-13 15:48:22 -08:00
EdgarPironti
a80871a7a8 Fixes 2015-11-13 15:00:38 -08:00
EdgarPironti
eb0d91fc7e Fixes to Master recording for ACs 2015-11-13 15:00:38 -08:00
Seth Alves
3b6b56f316 formatting 2015-11-13 14:26:43 -08:00
U-GAPOS\andrew
91bc7ca062 cleanup start/stop logic for HMD follow 2015-11-13 14:04:36 -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
Seth Alves
1d0a2ddd3d grab debugging script 2015-11-13 11:15:57 -08:00