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
Seth Alves
6ec5b12081
send to network when an action is deleted, also
2015-11-13 09:52:35 -08:00
Seth Alves
3f7f5a2bbd
send to network when an action is deleted, also
2015-11-13 09:49:31 -08:00
Seth Alves
5acbb74362
send to network when an action is deleted, also
2015-11-13 09:45:06 -08:00
samcake
f43738e75a
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-13 09:42:33 -08:00
Seth Alves
7979fb38cf
don't always send actiondata along with other physics related properties
2015-11-13 09:25:17 -08:00
Sam Gateau
89d120ab3d
Few fixes to make the recorder.js run
2015-11-12 22:24:11 -08:00
Seth Alves
dbaea5770a
include action data in properties suppressed by non-simulation ownership
2015-11-12 18:28:26 -08:00
Brad Hefta-Gaub
ecaa50c0ff
fix for infinite loop in erase entities special packet
2015-11-12 18:25:18 -08:00
Stephen Birarda
ea38c4cc49
don't allow domain check-ins while shutting down
2015-11-12 18:04:15 -08:00
samcake
1fd37b51a2
trying to get somewhere....
2015-11-12 17:54:35 -08:00
Stephen Birarda
6b2987eef8
handle domain server node removal in NodeList
2015-11-12 17:47:51 -08:00
Seth Alves
ed8a604e13
adjust how the decision to send action changes over the wire is made
2015-11-12 17:36:45 -08:00
Stephen Birarda
e52e9be44c
re-broadcast disconnects from domain-server
2015-11-12 17:23:39 -08:00
Seth Alves
756b382a75
adjust how the decision to send action changes over the wire is made
2015-11-12 17:12:20 -08:00
Seth Alves
6f83f32ecc
adjust how the decision to send action changes over the wire is made
2015-11-12 16:27:54 -08:00
Stephen Birarda
1c9396d66e
handle disconnect request in domain-server
2015-11-12 15:43:03 -08:00
Seth Alves
d7be1699a7
adjust how the decision to send action changes over the wire is made
2015-11-12 15:27:10 -08:00
Stephen Birarda
8bdb81d832
send disconnect packet from node when leaving domain
2015-11-12 15:03:19 -08:00
Stephen Birarda
0a64242160
cleanup string grabbing for PacketType enum
2015-11-12 14:43:25 -08:00
Seth Alves
a78b1619be
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 14:20:23 -08:00
Seth Alves
a8cd891e48
adjust how the decision to send action changes over the wire is made
2015-11-12 14:19:23 -08:00
Brad Hefta-Gaub
da651ac475
fix mac compiler error
2015-11-12 13:47:27 -08:00
Brad Hefta-Gaub
8bfb368a61
fix mac compiler error
2015-11-12 13:32:43 -08:00
Brad Hefta-Gaub
33110eda30
fix mac compiler error
2015-11-12 13:25:50 -08:00
Brad Hefta-Gaub
14a6e1fb6b
fix mac compiler error
2015-11-12 13:24:25 -08:00
Brad Hefta-Gaub
66a2b38f50
switch various status to use thread safe atomics
2015-11-12 13:09:51 -08:00
samcake
da8270d50b
Merge pull request #6377 from jherico/rec3
...
Cleaning up clip and transform
2015-11-12 11:50:10 -08:00
Brad Davis
ee1545f649
Cleaning up clip and transform
2015-11-12 11:48:47 -08:00
Stephen Birarda
288ee0e9e8
add a NodeDisconnect packet
2015-11-12 11:39:32 -08:00
Seth Alves
2e635bd936
cleanups
2015-11-12 11:14:25 -08:00
Seth Alves
a366633f84
cleanups
2015-11-12 11:03:44 -08:00
Seth Alves
93da3ed5bd
if our simulation-bid priority matches the remote one, don't bid.
2015-11-12 11:03:34 -08:00
Seth Alves
3519dd248b
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 09:53:11 -08:00
samcake
319f9fc30e
Merge pull request #6376 from ZappoMan/fixModelCrash
...
fix crash in Model::deleteGeometry when _rig is not initialized
2015-11-12 09:37:30 -08:00
James B. Pollack
39f44115be
Merge pull request #6373 from Atlante45/rotationBetween
...
Rotation between
2015-11-12 09:25:56 -08:00
Brad Hefta-Gaub
eefe26d96a
fix crash in Model::deleteGeometry when _rig is not initialized
2015-11-12 09:24:49 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
Seth Alves
83d5c9cf4a
arrange status icons in two rows of 4 each
2015-11-11 18:54:07 -08:00
Atlante45
954391ae3e
Fix models resizing
...
When models are MUCH bigger one one axis than the others
and we modify the scale only of one of those small axis,
it wouldn't propagate because the change was relatively
too small conpared to the size of the model
2015-11-11 18:33:26 -08:00
Anthony J. Thibault
e698d3c1e8
Isolate JointStates within the Rig class
...
Except for SkeletalModel::computeBounds() JointStates are now completly
encapsulated by the Rig. Now we can start using AnimPoses instead and
in parallel with the JointState implementation. Then we can assert that
they are identical, before removing JointStates.
This check in has many comments with the AJT tag.
Each one of these cases will need to be revisitied and fixed.
In particular // AJT: LEGACY will be used to enclose all code
in the Rig which manipulates the _jointState QVector.
2015-11-11 18:23:58 -08:00
Atlante45
118d05d824
Use a clearer function
2015-11-11 17:24:50 -08:00
Seth Alves
a16a477134
fix warning
2015-11-11 16:51:55 -08:00
Seth Alves
d1a9a32e91
Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug
2015-11-11 16:35:13 -08:00
Seth Alves
715a46ee82
show actions in status icons
2015-11-11 16:35:04 -08:00
Seth Alves
cffe4551dd
merge from upstream
2015-11-11 16:15:07 -08:00
Seth Alves
07f3d8eca0
more debugging prints
2015-11-11 16:03:08 -08:00
Atlante45
e4897a8de7
Use new constants
2015-11-11 15:58:27 -08:00
Atlante45
115b63a117
Simplify rotationBetween
2015-11-11 15:54:48 -08:00
Anthony J. Thibault
11440f92f4
Removed rig animations
...
* Deleted AnimationHandle class
* Removed enableAnimGraph and anableRigAnimations from Menu.
* Removed *some* references to old IK system.
But it is still used when computing collision bounding volumes
2015-11-11 15:32:57 -08:00
Brad Hefta-Gaub
4fddc86851
tweaks to click
2015-11-11 15:26:16 -08:00
Brad Hefta-Gaub
eb598bd3d3
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-11-11 15:15:34 -08:00
Brad Hefta-Gaub
2f903a9513
CR feedback and some cleanup
2015-11-11 14:21:14 -08:00
Brad Hefta-Gaub
bdfe304f7a
remove some logging
2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
040bae6014
more debugging
2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub
5576cf188e
Merge branch 'master' of https://github.com/highfidelity/hifi into moreEraseHistory
2015-11-11 12:14:03 -08:00
Brad Hefta-Gaub
866116d285
more debugging
2015-11-11 12:13:47 -08:00
Anthony J. Thibault
56e96ed24c
Merge branch 'master' into tony/script-start-stop-anim
2015-11-11 11:33:24 -08:00
Seth Alves
f07d5d9d3f
show network and physics status on boxes and spheres
2015-11-11 11:32:12 -08:00
Seth Alves
31ebe5dba1
terse logging for sim ownership
2015-11-11 08:51:10 -08:00
Ryan Huffman
26daa58c65
Merge branch 'master' of https://github.com/highfidelity/hifi into physics-continuous-collision-detection
2015-11-11 08:47:59 -08:00
Seth Alves
c2b0ccd6b3
show simulation ownership with status icons
2015-11-11 08:30:04 -08:00
Atlante45
65e9dc4be5
Fixup return types
2015-11-10 18:39:59 -08:00
Atlante45
d5c44466c4
Take Callables with rvalue ref
2015-11-10 18:27:14 -08:00
Atlante45
4d8fa58dd3
Coding standard
2015-11-10 18:23:23 -08:00
Atlante45
7cf2ad2215
Remove lockFor... and expand ReadWriteLockable
2015-11-10 18:19:12 -08:00
Atlante45
3557eacbd0
Add QTryRead/WriteLocker classes
2015-11-10 18:18:29 -08:00
Seth Alves
4cf84a4e5b
use makeEntityItemStatusGetters from more entity types
2015-11-10 17:14:09 -08:00
Seth Alves
7b4dd9a908
Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug
2015-11-10 17:06:16 -08:00
Seth Alves
39b92d2b52
terse log when ownership changes
2015-11-10 17:06:12 -08:00
Seth Alves
66387c4530
use icons to show network and physics status
2015-11-10 17:02:57 -08:00
Anthony J. Thibault
e1d0a97807
Implemented MyAvatar.prefetchAnimation() JS method
2015-11-10 16:51:48 -08:00
Brad Hefta-Gaub
fc3602d780
change context menu to RightPrimaryThumb, add filter to mouse click to not count slow clicks
2015-11-10 16:46:58 -08:00
Anthony J. Thibault
936c55a94e
New MyAvatar animation JS interface
...
JavaScript changes:
* removed MyAvatar.playAnimation
* removed MyAvatar.stopAnimation
* removed MyAVatar.getGetAnimationDetails
* removed MyAvatar.startAnimationByRole
* removed MyAvatar.stopAnimationByRole
* removed MyAVatar.getGetAnimationDetailsByRole
* removed MyAVatar.clearJointPriorities
* added MyAvatar.overrideAnimation(url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreAnimation()
* added MyAvatar.getAnimationRoles()
* added MyAvatar.overrideRoleAnimation(role, url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreRoleAnimation(role)
* added MyAvatar.prefetchAnimation(url)
* update kneel.js with new api.
* added theBird.js to test role override api.
C++ changes:
* Added getParent() and replaceChild() to AnimNode
* Added findByName() and traverse() to AnimNode
* Changed AnimStateMachine to hold nodes by childIndex instead of smart pointer.
This allows script to replace nodes dynamically via overrideRoleAnimation
2015-11-10 16:34:38 -08:00
Brad Hefta-Gaub
3316b63bf6
add a fixme comment
2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub
006a1d60c8
keep some additional erase entities history and send to viewers
2015-11-10 15:31:51 -08:00
Seth Alves
774e2ab6d6
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:13:07 -08:00
Seth Alves
97fec5b814
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:09:53 -08:00
Seth Alves
df5d161721
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:02:17 -08:00
Seth Alves
4df65e4c11
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-10 15:02:07 -08:00
Seth Alves
e067195dfe
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 14:42:40 -08:00
Seth Alves
82bd506086
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 14:32:57 -08:00
Eric Levin
a2abc11df1
Merge pull request #6351 from huffman/script-path-resolution
...
Update script engine path resolution behavior to behave consistently
2015-11-10 14:10:42 -08:00
Seth Alves
5e4f30b2bb
improve terse entity logging. change how action data sending is triggered
2015-11-10 13:58:09 -08:00
samcake
d3d5d3a19e
Removing useless code
2015-11-10 12:02:20 -08:00
Seth Alves
d043011a11
Merge branch 'render-debug-fixup' of github.com:sethalves/hifi into rework-visual-physics-debug
2015-11-10 10:16:02 -08:00
Seth Alves
8e466190e0
working toward display icons for debug/status display
2015-11-10 10:15:58 -08:00
Seth Alves
b9ca509f07
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
2015-11-10 09:50:12 -08:00
Seth Alves
d535109caf
attempt to fix render-collision hull feature
2015-11-10 09:49:31 -08:00
samcake
2cf2257783
Fix warning
2015-11-10 09:20:43 -08:00
samcake
d1df6854ac
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-10 09:16:28 -08:00
Ryan Huffman
7c5f0bb620
Update RADIUS_MOTION_THRESHOLD_MULTIPLIER
2015-11-10 08:51:22 -08:00
Brad Hefta-Gaub
0ea901fd72
fix various warnings
2015-11-10 08:34:58 -08:00
Sam Gateau
06a87012ad
Removing the setJointTranslations which is not helping...
2015-11-09 23:38:51 -08:00
Sam Gateau
b47c5dbff2
Cleaning the code to remove the old rec format and the use of separate joint Rotationns/Translations arrays
2015-11-09 23:12:04 -08:00
Anthony J. Thibault
eacc2cae0c
WIP checkpoint
2015-11-09 18:36:23 -08:00
samcake
77e21b7190
Trying to fix the animation recording and playback, but still not good
2015-11-09 18:18:30 -08:00
Brad Hefta-Gaub
021a6e689d
added some asserts to test future mistakes that would cause render item leaks
2015-11-09 17:09:17 -08:00
Anthony J. Thibault
af2b3bb9d5
MyAvatar: removed priority, hold and maskedJoints from playAnimation js call
2015-11-09 16:56:49 -08:00
Brad Hefta-Gaub
e47b049200
fix render item leak on Model::reset()
2015-11-09 16:41:40 -08:00
Ryan Huffman
7694958b20
Merge branch 'master' of https://github.com/highfidelity/hifi into physics-continuous-collision-detection
2015-11-09 15:22:26 -08:00
