← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/Physics/common/PHY_Pro.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Physics/common/PHY_Pro.h
46
46
        bool       m_do_anisotropic;        // Should I do anisotropic friction? 
47
47
        bool       m_do_fh;                 // Should the object have a linear Fh spring?
48
48
        bool       m_do_rot_fh;             // Should the object have an angular Fh spring?
 
49
        MT_Scalar  m_step_height;                       // Max height of climbable steps (Character)
 
50
        MT_Scalar  m_jump_speed;                        // Velocity of jumps (Character)
 
51
        MT_Scalar  m_fall_speed;                        // Max velocity of falling (Character)
49
52
};
50
53
 
51
54
 
59
62
        bool      m_fh_normal;             // Should the object slide off slopes?
60
63
};
61
64
 
62
 
#endif //__PHY_PRO_H__
63
 
 
 
65
#endif  /* __PHY_PRO_H__ */