浏览代码
Merge branch 'master' into feature/generic-animation-rigs
Merge branch 'master' into feature/generic-animation-rigs
# Conflicts: # CHANGELOG.md/feature-generic-animation-rigs
Thomas ICHÉ
3 年前
当前提交
28d1e0ad
共有 231 个文件被更改,包括 1195 次插入 和 437 次删除
-
5CHANGELOG.md
-
2Editor/CheckWindow/CheckWindow.cs
-
5Editor/CustomInspectors/ActionBaseEditor.cs
-
2Editor/CustomInspectors/EventBaseEditor.cs
-
16Editor/CustomInspectors/IngredientEditor.cs
-
4Editor/CustomInspectors/LogicBaseEditor.cs
-
2Editor/CustomInspectors/ManagerEditor.cs
-
4Editor/CustomInspectors/RigEditor.cs
-
1Editor/GameViewLink/LinkGameView.cs
-
2Editor/IngredientsExplorer/IngredientsExplorerWindow.cs
-
6Icons/Actions/ic-action-attach.png
-
34Icons/Actions/ic-action-attach.png.meta
-
7Icons/Actions/ic-action-audio.png
-
34Icons/Actions/ic-action-audio.png.meta
-
5Icons/Actions/ic-action-director.png
-
27Icons/Actions/ic-action-director.png.meta
-
5Icons/Actions/ic-action-event.png
-
34Icons/Actions/ic-action-event.png.meta
-
6Icons/Actions/ic-action-exit.png
-
34Icons/Actions/ic-action-exit.png.meta
-
5Icons/Actions/ic-action-generic.png
-
34Icons/Actions/ic-action-generic.png.meta
-
6Icons/Actions/ic-action-list.png
-
34Icons/Actions/ic-action-list.png.meta
-
10Icons/Actions/ic-action-log.png
-
27Icons/Actions/ic-action-log.png.meta
-
9Icons/Actions/ic-action-message.png
-
34Icons/Actions/ic-action-message.png.meta
-
4Icons/Actions/ic-action-mouse.png
-
34Icons/Actions/ic-action-mouse.png.meta
-
7Icons/Actions/ic-action-randomseed.png
-
14Icons/Actions/ic-action-randomseed.png.meta
-
7Icons/Actions/ic-action-rigidbody.png
-
21Icons/Actions/ic-action-rigidbody.png.meta
-
4Icons/Actions/ic-action-save.png
-
34Icons/Actions/ic-action-save.png.meta
-
5Icons/Actions/ic-action-screen.png
-
34Icons/Actions/ic-action-screen.png.meta
-
3Icons/Actions/ic-action-spawn.png
-
34Icons/Actions/ic-action-spawn.png.meta
-
4Icons/Actions/ic-action-teleport.png
-
34Icons/Actions/ic-action-teleport.png.meta
-
11Icons/Actions/ic-action-time.png
-
34Icons/Actions/ic-action-time.png.meta
-
2Icons/Actions/ic-action-timeline.png
-
34Icons/Actions/ic-action-timeline.png.meta
-
7Icons/Actions/ic-action-trash.png
-
34Icons/Actions/ic-action-trash.png.meta
-
9Icons/Actions/ic-action-ui.png
-
27Icons/Actions/ic-action-ui.png.meta
-
9Icons/Actions/ic-generic-action.png
-
34Icons/Actions/ic-generic-action.png.meta
-
50Icons/Discover/Discover Icon.png.meta
-
50Icons/Discover/DiscoverAsset Icon.png.meta
-
6Icons/Events/ic-event-awake.png
-
34Icons/Events/ic-event-awake.png.meta
-
24Icons/Events/ic-event-destroy.png
-
34Icons/Events/ic-event-destroy.png.meta
-
6Icons/Events/ic-event-enable-disable.png
-
34Icons/Events/ic-event-enable-disable.png.meta
-
5Icons/Events/ic-event-generic.png
-
21Icons/Events/ic-event-generic.png.meta
-
6Icons/Events/ic-event-keyboard.png
-
34Icons/Events/ic-event-keyboard.png.meta
-
11Icons/Events/ic-event-message.png
-
34Icons/Events/ic-event-message.png.meta
-
4Icons/Events/ic-event-start.png
-
34Icons/Events/ic-event-start.png.meta
-
8Icons/Events/ic-event-trigger.png
-
34Icons/Events/ic-event-trigger.png.meta
-
6Icons/Logic/ic-generic-logic.png
-
7Icons/Misc/ic-counter.png
-
5Icons/Misc/ic-crate.png
-
4Icons/Misc/ic-factory.png
-
2Icons/Misc/ic-first-person-controller.png
-
3Icons/Misc/ic-gamepad-input.png
-
3Icons/Misc/ic-globals.png
-
3Icons/Misc/ic-interactive-user.png
-
6Icons/Misc/ic-interactive.png
-
7Icons/Misc/ic-pickup-effect.png
-
7Icons/Misc/ic-pickup.png
-
6Icons/Misc/ic-scene.png
-
8Icons/Misc/ic-timer.png
-
47Icons/Misc/ic-timer.png.meta
-
9Icons/Misc/ic-toolbox.png
-
4Icons/Rigs/ic-rig-director-control.png
-
34Icons/Rigs/ic-rig-director-control.png.meta
-
8Icons/Rigs/ic-rig-float.png
-
34Icons/Rigs/ic-rig-float.png.meta
-
8Icons/Rigs/ic-rig-follow-path.png
-
34Icons/Rigs/ic-rig-follow-path.png.meta
-
6Icons/Rigs/ic-rig-lookat.png
-
34Icons/Rigs/ic-rig-lookat.png.meta
-
7Icons/Rigs/ic-rig-reachposition.png
-
34Icons/Rigs/ic-rig-reachposition.png.meta
-
3Icons/Rigs/ic-rig-rotate.png
-
34Icons/Rigs/ic-rig-rotate.png.meta
-
2Runtime/Ingredients/Counter/CounterAction.cs.meta
-
2Runtime/Ingredients/Counter/CounterLogic.cs.meta
-
2Runtime/Ingredients/Factory/FactorySetTargetAction.cs.meta
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue