Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update event edit #27

Merged

Conversation

yanOO1497
Copy link

Conflicts:

editor/inspector/assets/fbx/event-editor/editor.js

Re: cocos-creator/fireball#

Changelog:
*

# Conflicts:
#	editor/inspector/assets/fbx/event-editor/editor.js
@shrinktofit shrinktofit merged commit ea73e1b into shrinktofit:UnifyEventInterfaces Aug 2, 2021
shrinktofit added a commit that referenced this pull request Aug 6, 2021
* Unify animation event interfaces

* update event edit (#27)

# Conflicts:
#	editor/inspector/assets/fbx/event-editor/editor.js

Co-authored-by: 媛媛 <yuanyuan1497@foxmail.com>
@yanOO1497 yanOO1497 deleted the 8_2_fix_event_edit_ branch August 13, 2021 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants