diff options
| author | Kevin Choi <code.kchoi@gmail.com> | 2015-05-25 00:54:24 -0400 |
|---|---|---|
| committer | Kevin Choi <code.kchoi@gmail.com> | 2015-05-25 00:54:24 -0400 |
| commit | ec93668f8d652f826b6e89861746bf655ec29234 (patch) | |
| tree | 639099d471f574e38a6a3793e99240825385be83 /core/object.h | |
| parent | b210f52f4a090ba9a6bf60138b4e5222678ba98e (diff) | |
| parent | f36e7dcb405ead38c33d808f732fd7b4e23d19e5 (diff) | |
Merge pull request #1 from okamstudio/master
improved animation editor
Diffstat (limited to 'core/object.h')
| -rw-r--r-- | core/object.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/object.h b/core/object.h index fc64b91412..8d1f8ebc5a 100644 --- a/core/object.h +++ b/core/object.h @@ -54,6 +54,7 @@ enum PropertyHint { PROPERTY_HINT_ENUM, ///< hint_text= "val1,val2,val3,etc" PROPERTY_HINT_EXP_EASING, /// exponential easing funciton (Math::ease) PROPERTY_HINT_LENGTH, ///< hint_text= "length" (as integer) + PROPERTY_HINT_SPRITE_FRAME, PROPERTY_HINT_KEY_ACCEL, ///< hint_text= "length" (as integer) PROPERTY_HINT_FLAGS, ///< hint_text= "flag1,flag2,etc" (as bit flags) PROPERTY_HINT_ALL_FLAGS, @@ -448,6 +449,7 @@ protected: DVector<String> _get_meta_list_bind() const; Array _get_property_list_bind() const; + Array _get_method_list_bind() const; public: //should be protected, but bug in clang++ static void initialize_type(); |