Howard Stearns
4241f4b305
Convert all simple one-liners containing ') { ' to instead take up three lines.
2016-02-10 12:03:07 -08:00
howard-stearns
cecf2fb611
Up the number.
2016-02-08 17:00:29 -08:00
howard-stearns
d174e86347
fix batonName for entity script case
2016-02-08 16:45:25 -08:00
Howard Stearns
9670cf3fe3
Reference correct filename.
2016-02-08 09:37:56 -08:00
Howard Stearns
61e521bc63
Fix build (and remove unneeded test file).
2016-02-08 09:33:32 -08:00
Howard Stearns
4a50d7c456
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton
2016-02-07 18:41:04 -08:00
Howard Stearns
b08f364447
yes!
2016-02-07 18:29:10 -08:00
Howard Stearns
e52b910e53
connectionTest
2016-02-07 16:39:29 -08:00
Howard Stearns
b6472217c4
Clear accepted/bestPromise .winner when disconnected.
2016-02-07 16:08:40 -08:00
Howard Stearns
8b27b90566
Verify validId before reporting a winning reponse to a proposal.
2016-02-07 14:57:29 -08:00
Howard Stearns
1a0017900c
noisy connectionTest
2016-02-07 14:10:55 -08:00
Howard Stearns
8f714980df
debuggable
2016-02-07 13:49:46 -08:00
Howard Stearns
7b39700136
one ring to rule
2016-02-07 13:33:21 -08:00
Howard Stearns
dc50efe7ec
final?
2016-02-07 10:42:43 -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
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
Philip Rosedale
a98efbc660
Merge pull request #6997 from jagwire/WorkingEnergy
...
Working energy usage for entity manipulation.
2016-02-05 17:17:45 -08:00
Philip Rosedale
dbbeb90873
Merge pull request #7039 from ericrius1/gunFix
...
updated gun position
2016-02-05 16:56:28 -08:00
ericrius1
39bb68931f
updated gun position
2016-02-05 15:48:34 -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
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
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
Anthony J. Thibault
bfeace78f7
AnimInverseKinematics: warning fixes
2016-02-04 18:51:48 -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
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
Stephen Birarda
42e9a4ebf0
fix ATP SendQueue failure to receive after re-activity
2016-02-04 13:43:50 -08:00
Bradley Austin Davis
64597f9d9f
Fixing save dialog issues saving new files
2016-02-04 13:32:52 -08:00
Andrew Meadows
2da46ff26a
server-side release ownership
2016-02-04 13:26:07 -08:00
Andrew Meadows
af57f5d120
add simple and fast DirtyOctreeElementOperator
2016-02-04 13:26:07 -08:00
Andrew Meadows
959f924b1d
flag entity as changed when changing simulatorID
2016-02-04 13:26:07 -08:00
Andrew Meadows
91a2f86482
update some comments
2016-02-04 13:26:06 -08:00
Andrew Meadows
e51edaa117
update some comments
2016-02-04 13:26:06 -08:00
Andrew Meadows
381049acb3
clear simulation ownership when owners vanish
2016-02-04 13:26:06 -08:00
Andrew Meadows
05fb866bb5
fix spelling typo in comment
2016-02-04 13:26:06 -08:00
Andrew Meadows
e3351c05a2
make some methods const
2016-02-04 13:26:06 -08:00
Eric Levin
294a7ee9ad
Merge pull request #7027 from birarda/avatars-property
...
move two AvatarList invokable methods from AvatarManager to AvatarHashMap
2016-02-04 11:41:52 -08:00
Anthony J. Thibault
a8e092272c
AnimStateMachine: added new State parameter interpType
...
interpType defines how the interpolation between two states is performed.
* SnapshotBoth: Stores two snapshots, the previous animation before interpolation begins and the target state at the
interTarget frame. Then during the interpolation period the two snapshots are interpolated to produce smooth motion between them.
* SnapshotPrev: Stores a snapshot of the previous animation before interpolation begins. However the target state is
evaluated dynamically. During the interpolation period the previous snapshot is interpolated with the target pose
to produce smooth motion between them. This mode is useful for interping into a blended animation where the actual
blend factor is not known at the start of the interp or is might change dramatically during the interp.
2016-02-04 10:32:58 -08:00
James B. Pollack
3c9043987f
Merge pull request #7019 from birarda/absolute-paths
...
allow absolute path to entity-server persist file
2016-02-04 08:53:21 -08:00
James B. Pollack
8b09cf3b82
Merge pull request #7024 from birarda/audio-mute-crash
...
fix for audio-mixer mute env crash
2016-02-04 08:53:10 -08:00
Babiuch, Ryan Nicholas
0069849da3
Consider existing velocity in calculating energy costs when editing entities.
2016-02-04 08:55:23 -06:00
Babiuch, Ryan Nicholas
dca7ff967c
Conform to coding standard.
2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 08:18:47 -06:00
Howard Stearns
287d91d4b2
better
2016-02-03 20:57:35 -08:00
