Bradley Austin Davis
ebf0bf394a
Fix native text rendering by forcing positions to integer values
2016-02-05 11:43:31 -08:00
Zach Pomerantz
d9132f3973
Clean up geometry instanced calls
2016-02-05 11:22:45 -08:00
Zach Pomerantz
b0a9c299ed
Add tone mapping to overlay shaders
2016-02-05 11:18:42 -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
Zach Pomerantz
a1ed29e6f8
Rename setupTransparent->setupBatch
2016-02-05 10:53:01 -08:00
Babiuch, Ryan Nicholas
aab98db812
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-05 12:49:38 -06:00
Zach Pomerantz
aa50d1e98e
Add factor and shading to overlay/translucent light shaders
2016-02-05 10:27:07 -08:00
samcake
57b6ad3c54
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-05 09:23:31 -08: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
samcake
a999e046b5
Showing the LOD angle
2016-02-04 17:59:35 -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
Zach Pomerantz
a4cea0a307
Conform model/overlay shaders
2016-02-04 16:21:56 -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
Zach Pomerantz
44d297e7e2
Differentiate named calls by pipeline
2016-02-04 15:32:47 -08:00
Zach Pomerantz
f0797d8ea0
Move instanced pipeline setup to lambda from batch
2016-02-04 15:32:28 -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
ericrius1
8591de4873
getting avatar position
2016-02-04 11:57:22 -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
samcake
cc7f03e7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-04 10:29:41 -08:00
Zach Pomerantz
cb06d4a9e4
Fix -Wunused-variable for geometry solid stream formats
2016-02-04 10:13:35 -08:00
Zach Pomerantz
9e7e6be549
Fix -Wunused-variable for MeshPart ShapeKeys
2016-02-04 10:06:07 -08:00
Zach Pomerantz
0c31c072a3
Fix -Wreorder for DrawOverlay3D ctor
2016-02-04 10:03:35 -08:00
Zach Pomerantz
3fceaba2fe
Remove extra qualifications to getShapeKey from overlay headers
2016-02-04 10:01:34 -08:00
samcake
513561ba2d
Using an angle for the LOD test
2016-02-04 09:31:21 -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
