Merge branch 'main' into ly-as-sdk/LYN-2948

Browse Source

main

pappeste 5 years ago

parent 4630c82df0 dcb253e08c

commit 22b3cd6d1b

2238 changed files with 4993 additions and 18432 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

0

Editor/CryDesigner_TimeOfDay.xml → Assets/Editor/CryDesigner_TimeOfDay.xml

Unescape Escape View File

0

Editor/Editor.tip → Assets/Editor/Editor.tip

Unescape Escape View File

0

Gems/ScriptCanvas/Assets/Editor/Icons/AssetBrowser/ScriptCanvas_16.png → Assets/Editor/Editor/Icons/AssetBrowser/ScriptCanvas_16.png

Unescape Escape View File

0

Editor/EditorParticlePanels.xml → Assets/Editor/EditorParticlePanels.xml

Unescape Escape View File

0

Editor/EditorParticlePanelsDefault.xml → Assets/Editor/EditorParticlePanelsDefault.xml

Unescape Escape View File

0

Editor/Fonts/Open_Sans/LICENSE.txt → Assets/Editor/Fonts/Open_Sans/LICENSE.txt

Unescape Escape View File

0

Editor/Fonts/Open_Sans/OpenSans-Bold.ttf → Assets/Editor/Fonts/Open_Sans/OpenSans-Bold.ttf

Unescape Escape View File

0

Editor/Fonts/Open_Sans/OpenSans-BoldItalic.ttf → Assets/Editor/Fonts/Open_Sans/OpenSans-BoldItalic.ttf

Unescape Escape View File

0

Editor/Fonts/Open_Sans/OpenSans-ExtraBold.ttf → Assets/Editor/Fonts/Open_Sans/OpenSans-ExtraBold.ttf

Unescape Escape View File

0

Editor/Fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf → Assets/Editor/Fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf

Unescape Escape View File

0

Editor/Fonts/Open_Sans/OpenSans-Italic.ttf → Assets/Editor/Fonts/Open_Sans/OpenSans-Italic.ttf

Unescape Escape View File

0

Editor/Fonts/Open_Sans/OpenSans-Light.ttf → Assets/Editor/Fonts/Open_Sans/OpenSans-Light.ttf

Unescape Escape View File

0

Editor/Fonts/Open_Sans/OpenSans-LightItalic.ttf → Assets/Editor/Fonts/Open_Sans/OpenSans-LightItalic.ttf

Unescape Escape View File

0

Editor/Fonts/Open_Sans/OpenSans-Regular.ttf → Assets/Editor/Fonts/Open_Sans/OpenSans-Regular.ttf

Unescape Escape View File

0

Editor/Fonts/Open_Sans/OpenSans-Semibold.ttf → Assets/Editor/Fonts/Open_Sans/OpenSans-Semibold.ttf

Unescape Escape View File

0

Editor/Fonts/Open_Sans/OpenSans-SemiboldItalic.ttf → Assets/Editor/Fonts/Open_Sans/OpenSans-SemiboldItalic.ttf

Unescape Escape View File

0

Editor/Icons/AssetBrowser/ABC_16.svg → Assets/Editor/Icons/AssetBrowser/ABC_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

Editor/Icons/AssetBrowser/Audio_16.svg → Assets/Editor/Icons/AssetBrowser/Audio_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

0

Editor/Icons/AssetBrowser/CaretClosed_16.svg → Assets/Editor/Icons/AssetBrowser/CaretClosed_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 769 B After Width:  |  Height:  |  Size: 769 B

0

Editor/Icons/AssetBrowser/CaretOpen_16.svg → Assets/Editor/Icons/AssetBrowser/CaretOpen_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 666 B After Width:  |  Height:  |  Size: 666 B

0

Editor/Icons/AssetBrowser/DefaultProduct_16.svg → Assets/Editor/Icons/AssetBrowser/DefaultProduct_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 735 B After Width:  |  Height:  |  Size: 735 B

0

Editor/Icons/AssetBrowser/Default_16.svg → Assets/Editor/Icons/AssetBrowser/Default_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 735 B After Width:  |  Height:  |  Size: 735 B

0

Editor/Icons/AssetBrowser/FBX_16.svg → Assets/Editor/Icons/AssetBrowser/FBX_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

Editor/Icons/AssetBrowser/Folder_16.svg → Assets/Editor/Icons/AssetBrowser/Folder_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 932 B After Width:  |  Height:  |  Size: 932 B

0

Editor/Icons/AssetBrowser/Font_16.svg → Assets/Editor/Icons/AssetBrowser/Font_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

Editor/Icons/AssetBrowser/GemFolder_16.svg → Assets/Editor/Icons/AssetBrowser/GemFolder_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 2.1 KiB

0

Editor/Icons/AssetBrowser/Image_16.svg → Assets/Editor/Icons/AssetBrowser/Image_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

0

Editor/Icons/AssetBrowser/InputBindings_16.svg → Assets/Editor/Icons/AssetBrowser/InputBindings_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

0

Editor/Icons/AssetBrowser/LegacyAnimation_16.svg → Assets/Editor/Icons/AssetBrowser/LegacyAnimation_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 737 B After Width:  |  Height:  |  Size: 737 B

0

Editor/Icons/AssetBrowser/LegacyMesh_16.svg → Assets/Editor/Icons/AssetBrowser/LegacyMesh_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.5 KiB After Width:  |  Height:  |  Size: 6.5 KiB

0

Editor/Icons/AssetBrowser/LegacySkin_16.svg → Assets/Editor/Icons/AssetBrowser/LegacySkin_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 727 B After Width:  |  Height:  |  Size: 727 B

0

Editor/Icons/AssetBrowser/LensFlare_16.svg → Assets/Editor/Icons/AssetBrowser/LensFlare_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.2 KiB After Width:  |  Height:  |  Size: 4.2 KiB

0

Editor/Icons/AssetBrowser/Lua_16.svg → Assets/Editor/Icons/AssetBrowser/Lua_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB

0

Editor/Icons/AssetBrowser/Material_16.svg → Assets/Editor/Icons/AssetBrowser/Material_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

0

Editor/Icons/AssetBrowser/NonWritable_16.svg → Assets/Editor/Icons/AssetBrowser/NonWritable_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

Editor/Icons/AssetBrowser/Particle_16.svg → Assets/Editor/Icons/AssetBrowser/Particle_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.8 KiB After Width:  |  Height:  |  Size: 5.8 KiB

0

Editor/Icons/AssetBrowser/Slice_16.svg → Assets/Editor/Icons/AssetBrowser/Slice_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 809 B After Width:  |  Height:  |  Size: 809 B

0

Editor/Icons/AssetBrowser/Writable_16.svg → Assets/Editor/Icons/AssetBrowser/Writable_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 975 B After Width:  |  Height:  |  Size: 975 B

0

Editor/Icons/AssetBrowser/XML_16.svg → Assets/Editor/Icons/AssetBrowser/XML_16.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 713 B After Width:  |  Height:  |  Size: 713 B

0

Editor/Icons/AssetBrowser/in_progress.gif → Assets/Editor/Icons/AssetBrowser/in_progress.gif

Unescape Escape View File

0

Editor/Icons/AssetImporter/animation.png → Assets/Editor/Icons/AssetImporter/animation.png

Unescape Escape View File

0

Editor/Icons/AssetImporter/animation_on.png → Assets/Editor/Icons/AssetImporter/animation_on.png

Unescape Escape View File

0

Editor/Icons/AssetImporter/group_icon.png → Assets/Editor/Icons/AssetImporter/group_icon.png

Unescape Escape View File

0

Editor/Icons/AssetImporter/mesh.png → Assets/Editor/Icons/AssetImporter/mesh.png

Unescape Escape View File

0

Editor/Icons/AssetImporter/mesh_on.png → Assets/Editor/Icons/AssetImporter/mesh_on.png

Unescape Escape View File

0

Editor/Icons/AssetImporter/skeleton.png → Assets/Editor/Icons/AssetImporter/skeleton.png

Unescape Escape View File

0

Editor/Icons/AssetImporter/skeleton_on.png → Assets/Editor/Icons/AssetImporter/skeleton_on.png

Unescape Escape View File

0

Editor/Icons/AssetImporter/skin.png → Assets/Editor/Icons/AssetImporter/skin.png

Unescape Escape View File

0

Editor/Icons/AssetImporter/skin_on.png → Assets/Editor/Icons/AssetImporter/skin_on.png

Unescape Escape View File

0

Editor/Icons/AssetImporter/tree.png → Assets/Editor/Icons/AssetImporter/tree.png

Unescape Escape View File

0

Editor/Icons/Assets/InputBindings.png → Assets/Editor/Icons/Assets/InputBindings.png

Unescape Escape View File

0

Editor/Icons/Assets/Lua.png → Assets/Editor/Icons/Assets/Lua.png

Unescape Escape View File

0

Editor/Icons/Assets/PhysicsMaterial.png → Assets/Editor/Icons/Assets/PhysicsMaterial.png

Unescape Escape View File

0

Editor/Icons/Components/AreaLight.svg → Assets/Editor/Icons/Components/AreaLight.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.3 KiB After Width:  |  Height:  |  Size: 4.3 KiB

0

Editor/Icons/Components/Attachment.svg → Assets/Editor/Icons/Components/Attachment.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

0

Editor/Icons/Components/AudioAnimation.svg → Assets/Editor/Icons/Components/AudioAnimation.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 3.7 KiB

0

Editor/Icons/Components/AudioAnimationEventsProxy.svg → Assets/Editor/Icons/Components/AudioAnimationEventsProxy.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

0

Editor/Icons/Components/AudioArea.png → Assets/Editor/Icons/Components/AudioArea.png

Unescape Escape View File

0

Editor/Icons/Components/AudioAreaEnvironment.svg → Assets/Editor/Icons/Components/AudioAreaEnvironment.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB

0

Editor/Icons/Components/AudioEnvironment.svg → Assets/Editor/Icons/Components/AudioEnvironment.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 KiB After Width:  |  Height:  |  Size: 2.5 KiB

0

Editor/Icons/Components/AudioListener.svg → Assets/Editor/Icons/Components/AudioListener.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.6 KiB After Width:  |  Height:  |  Size: 5.6 KiB

0

Editor/Icons/Components/AudioMultiPosition.png → Assets/Editor/Icons/Components/AudioMultiPosition.png

Unescape Escape View File

0

Editor/Icons/Components/AudioPreload.svg → Assets/Editor/Icons/Components/AudioPreload.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 KiB After Width:  |  Height:  |  Size: 2.5 KiB

0

Editor/Icons/Components/AudioProxy.svg → Assets/Editor/Icons/Components/AudioProxy.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 3.7 KiB

0

Editor/Icons/Components/AudioRtpc.svg → Assets/Editor/Icons/Components/AudioRtpc.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 4.5 KiB

0

Editor/Icons/Components/AudioSwitch.svg → Assets/Editor/Icons/Components/AudioSwitch.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

0

Editor/Icons/Components/AudioTrigger.svg → Assets/Editor/Icons/Components/AudioTrigger.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 3.3 KiB

0

Editor/Icons/Components/BehaviorTree.svg → Assets/Editor/Icons/Components/BehaviorTree.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 1.9 KiB

0

Editor/Icons/Components/Box.png → Assets/Editor/Icons/Components/Box.png

Unescape Escape View File

0

Editor/Icons/Components/Box_Shape.svg → Assets/Editor/Icons/Components/Box_Shape.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.6 KiB After Width:  |  Height:  |  Size: 2.6 KiB

0

Editor/Icons/Components/Capsule_Shape.svg → Assets/Editor/Icons/Components/Capsule_Shape.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.3 KiB After Width:  |  Height:  |  Size: 5.3 KiB

0

Editor/Icons/Components/CharacterPhysics.svg → Assets/Editor/Icons/Components/CharacterPhysics.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 1.9 KiB

0

Editor/Icons/Components/Cloth.svg → Assets/Editor/Icons/Components/Cloth.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 4.4 KiB

0

Editor/Icons/Components/CloudGemMessageOfTheDay.svg → Assets/Editor/Icons/Components/CloudGemMessageOfTheDay.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.2 KiB After Width:  |  Height:  |  Size: 2.2 KiB

0

Editor/Icons/Components/ColliderBox.png → Assets/Editor/Icons/Components/ColliderBox.png

Unescape Escape View File

0

Editor/Icons/Components/ColliderCapsule.png → Assets/Editor/Icons/Components/ColliderCapsule.png

Unescape Escape View File

0

Editor/Icons/Components/ColliderCylinder.png → Assets/Editor/Icons/Components/ColliderCylinder.png

Unescape Escape View File

0

Editor/Icons/Components/ColliderMesh.svg → Assets/Editor/Icons/Components/ColliderMesh.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.3 KiB After Width:  |  Height:  |  Size: 6.3 KiB

0

Editor/Icons/Components/ColliderSphere.png → Assets/Editor/Icons/Components/ColliderSphere.png

Unescape Escape View File

0

Editor/Icons/Components/Comment.svg → Assets/Editor/Icons/Components/Comment.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

0

Editor/Icons/Components/Component_Placeholder.svg → Assets/Editor/Icons/Components/Component_Placeholder.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 KiB After Width:  |  Height:  |  Size: 2.5 KiB

0

Editor/Icons/Components/Compound_Shape.svg → Assets/Editor/Icons/Components/Compound_Shape.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.6 KiB After Width:  |  Height:  |  Size: 5.6 KiB

0

Editor/Icons/Components/Cylinder.png → Assets/Editor/Icons/Components/Cylinder.png

Unescape Escape View File

0

Editor/Icons/Components/Cylinder_Shape.svg → Assets/Editor/Icons/Components/Cylinder_Shape.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.2 KiB After Width:  |  Height:  |  Size: 4.2 KiB

0

Editor/Icons/Components/DebugDrawLine.svg → Assets/Editor/Icons/Components/DebugDrawLine.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 4.6 KiB

0

Editor/Icons/Components/DebugDrawObb.svg → Assets/Editor/Icons/Components/DebugDrawObb.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.8 KiB After Width:  |  Height:  |  Size: 4.8 KiB

0

Editor/Icons/Components/DebugDrawRay.svg → Assets/Editor/Icons/Components/DebugDrawRay.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.7 KiB After Width:  |  Height:  |  Size: 5.7 KiB

0

Editor/Icons/Components/DebugDrawSphere.svg → Assets/Editor/Icons/Components/DebugDrawSphere.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.7 KiB After Width:  |  Height:  |  Size: 6.7 KiB

0

Editor/Icons/Components/DebugDrawText.svg → Assets/Editor/Icons/Components/DebugDrawText.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.9 KiB After Width:  |  Height:  |  Size: 4.9 KiB

0

Editor/Icons/Components/Decal.svg → Assets/Editor/Icons/Components/Decal.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

0

Editor/Icons/Components/Disabled/Animation_white.png → Assets/Editor/Icons/Components/Disabled/Animation_white.png

Unescape Escape View File

0

Editor/Icons/Components/Disabled/Attachment_white.png → Assets/Editor/Icons/Components/Disabled/Attachment_white.png

Unescape Escape View File

0

Editor/Icons/Components/Disabled/AudioAreaEnvironment_white.png → Assets/Editor/Icons/Components/Disabled/AudioAreaEnvironment_white.png

Unescape Escape View File

0

Editor/Icons/Components/Disabled/AudioArea_white.png → Assets/Editor/Icons/Components/Disabled/AudioArea_white.png

Unescape Escape View File

0

Editor/Icons/Components/Disabled/AudioEnvironment_white.png → Assets/Editor/Icons/Components/Disabled/AudioEnvironment_white.png

Unescape Escape View File

0

Editor/Icons/Components/Disabled/AudioListener_white.png → Assets/Editor/Icons/Components/Disabled/AudioListener_white.png

Unescape Escape View File

0

Editor/Icons/Components/Disabled/AudioRtpc_white.png → Assets/Editor/Icons/Components/Disabled/AudioRtpc_white.png

Unescape Escape View File

0

Editor/Icons/Components/Disabled/AudioSwitch_white.png → Assets/Editor/Icons/Components/Disabled/AudioSwitch_white.png

Unescape Escape View File

0

Editor/Icons/Components/Disabled/AudioTrigger_white.png → Assets/Editor/Icons/Components/Disabled/AudioTrigger_white.png

Unescape Escape View File

0

Editor/Icons/Components/Disabled/BehaviorTree_white.png → Assets/Editor/Icons/Components/Disabled/BehaviorTree_white.png

Unescape Escape View File

Some files were not shown because too many files have changed in this diff Show More

Write Preview

Loading…

Cancel

Save