ericrius1
85ddb7100c
fixed gap range bug
2016-02-08 16:51:04 -08:00
ericrius1
b60ba0c5a7
can now change loop
2016-02-08 16:22:05 -08:00
ericrius1
bad4a5d601
changed ac script to take into account duration
2016-02-08 12:49:56 -08:00
ericrius1
c169a7cdd5
calculating clip length
2016-02-08 12:36:14 -08:00
ericrius1
6b240dfd5f
calculating length of wav file
2016-02-08 12:34:46 -08:00
ericrius1
193857f344
added explanatory comment about format of interval time
2016-02-08 11:51:52 -08:00
ericrius1
2a7a81f01c
Merge branch 'master' into acSoundSearcher
2016-02-08 10:07:05 -08:00
ericrius1
4ab3bd204d
no comment
2016-02-08 10:05:11 -08:00
Brad Hefta-Gaub
7939f1381c
Merge pull request #7036 from jherico/qml
...
Fix native text rendering by forcing positions to integer values
2016-02-08 09:45:57 -08:00
Brad Hefta-Gaub
c28612ea9a
Merge pull request #7037 from sethalves/dressing-room
...
Dressing room + grab fixes
2016-02-08 09:19:29 -08:00
Brad Hefta-Gaub
3f0ebf7732
Merge pull request #7031 from AndrewMeadows/simulation-ownership
...
server can clear simulation ownership
2016-02-06 19:19:39 -08:00
Eric Levin
0932df621a
Changed MIN_TIME_INTERVAL to be in milliseconds
2016-02-05 22:15:16 -08:00
Eric Levin
053f163b92
Changed wait time of avatar list query to entity query to update time so avatar positions don't pile up
2016-02-05 22:13:25 -08:00
Brad Hefta-Gaub
7e22ac997a
Merge pull request #7029 from birarda/atp-test
...
fix ATP SendQueue failure to receive after re-activity
2016-02-05 19:36:53 -08:00
Brad Hefta-Gaub
eebf6f8883
Merge pull request #7021 from hyperlogic/tony/animation-mirror-support
...
AnimClip: Animation mirror support
2016-02-05 19:25:01 -08:00
ericrius1
6d64da2df7
expiration time is 5 seconds now
2016-02-05 17:28:55 -08:00
Philip Rosedale
a98efbc660
Merge pull request #6997 from jagwire/WorkingEnergy
...
Working energy usage for entity manipulation.
2016-02-05 17:17:45 -08:00
ericrius1
4c33c6e171
clean up
2016-02-05 17:13:29 -08:00
Philip Rosedale
dbbeb90873
Merge pull request #7039 from ericrius1/gunFix
...
updated gun position
2016-02-05 16:56:28 -08:00
ericrius1
1c54de6f57
better logging
2016-02-05 16:11:43 -08:00
ericrius1
a5c037b23f
possible bug fix for sound not playing on avatar rentry
2016-02-05 16:09:30 -08:00
ericrius1
39bb68931f
updated gun position
2016-02-05 15:48:34 -08:00
ericrius1
208007c9d8
log
2016-02-05 15:43:15 -08:00
Seth Alves
d567020283
trying to zero velocity during an equiped adjustment
2016-02-05 15:01:46 -08:00
Seth Alves
07c70a1ba2
refix double action grabs
2016-02-05 14:25:46 -08:00
Seth Alves
b1267f9d37
try to put things back when a double-parent equip is released. if an equpped object is pulled too far from a hand, automatically unequip it.
2016-02-05 13:53:45 -08:00
ericrius1
609ddda74e
adjusting for interval and interval spread
2016-02-05 13:49:44 -08:00
Andrew Meadows
09bdccb18c
Merge pull request #7032 from hyperlogic/tony/standing-jump
...
MyAvatar: Standing Takeoff and In-Air Animations
2016-02-05 13:45:52 -08:00
ericrius1
a65c869239
removed commenting
2016-02-05 13:36:31 -08:00
ericrius1
120c5ac370
Able to switch url sounds
2016-02-05 13:35:45 -08:00
Brad Hefta-Gaub
f738f2b6f6
Merge pull request #7035 from howard-stearns/fix-mouth-movement
...
fix-mouth-movement
2016-02-05 12:08:23 -08:00
Howard Stearns
47694b90ee
Fix inverted boolean that was preventing other people's avatars from mouth-animating.
2016-02-05 11:47:21 -08:00
Bradley Austin Davis
ebf0bf394a
Fix native text rendering by forcing positions to integer values
2016-02-05 11:43:31 -08:00
ericrius1
355f60f088
Not adding deleted avatars to the list of avatars to use for querying
2016-02-05 11:07:21 -08:00
Anthony J. Thibault
f13e31c7fc
CharacterController: removed unnecessary code.
2016-02-05 10:53:58 -08:00
Babiuch, Ryan Nicholas
aab98db812
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-05 12:49:38 -06:00
ericrius1
aa49db9992
updating sound volume
2016-02-04 19:21:12 -08:00
Anthony J. Thibault
bfeace78f7
AnimInverseKinematics: warning fixes
2016-02-04 18:51:48 -08:00
Seth Alves
ae6a5aa286
add some debugging to handControllerGrab
2016-02-04 18:10:43 -08:00
Seth Alves
27711a04b9
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
2016-02-04 18:10:03 -08:00
ericrius1
9b0e20d82b
stopping sound injector if sound was looping
2016-02-04 17:57:25 -08:00
Anthony J. Thibault
51189cfc50
AnimInverseKinematics: opened up UpLeg and Leg constraints
...
This improves the quality of the jump animations, while IK is enabled.
2016-02-04 17:56:41 -08:00
Anthony J. Thibault
8ca8550f26
MyAvatar: Standing Takeoff and In-Air Animations
...
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.
CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
2016-02-04 17:56:07 -08:00
Andrew Meadows
725f9e29a3
Merge pull request #7026 from hyperlogic/tony/fly-like-an-eagle
...
MyAvatar: Use head to turn while flying in HMD mode
2016-02-04 17:52:47 -08:00
ericrius1
f6a091b941
basic of new design working
2016-02-04 17:41:52 -08:00
ericrius1
16af9b9e31
deleting sound entity if it hasn't been around for a while
2016-02-04 17:12:25 -08:00
ericrius1
c8704234b1
basic setup for new design
2016-02-04 16:19:23 -08:00
Brad Hefta-Gaub
817245accc
Merge pull request #7025 from jherico/qml
...
QML Work
2016-02-04 16:03:39 -08:00
Babiuch, Ryan Nicholas
fb5236e9b2
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 16:50:43 -06:00
Bradley Austin Davis
dc0e038535
Add drive selection to the file dialog
2016-02-04 13:51:43 -08:00