Bläddra i källkod

Merge branch 'master' of https://github.com/BearishSun/BansheeEngine.git

marco.bellan 9 år sedan
förälder
incheckning
1013f619e0
100 ändrade filer med 1 tillägg och 1 borttagningar
  1. 1 1
      CONTRIBUTING.md
  2. BIN
      Data/Editor/GUISkin.asset
  3. BIN
      Data/Editor/ResourceManifest.asset
  4. BIN
      Data/Editor/Skin/Icons/sprite_AnimationClipIcon.psd.asset
  5. BIN
      Data/Editor/Skin/Icons/sprite_AnimationClipIcon.psd16.asset
  6. BIN
      Data/Editor/Skin/Icons/sprite_AnimationClipIcon.psd32.asset
  7. BIN
      Data/Editor/Skin/Icons/sprite_AnimationClipIcon.psd48.asset
  8. BIN
      Data/Editor/Skin/Icons/sprite_AudioClipIcon.psd.asset
  9. BIN
      Data/Editor/Skin/Icons/sprite_AudioClipIcon.psd16.asset
  10. BIN
      Data/Editor/Skin/Icons/sprite_AudioClipIcon.psd32.asset
  11. BIN
      Data/Editor/Skin/Icons/sprite_AudioClipIcon.psd48.asset
  12. BIN
      Data/Editor/Skin/Icons/sprite_CSharpIcon.psd.asset
  13. BIN
      Data/Editor/Skin/Icons/sprite_CSharpIcon.psd16.asset
  14. BIN
      Data/Editor/Skin/Icons/sprite_CSharpIcon.psd32.asset
  15. BIN
      Data/Editor/Skin/Icons/sprite_CSharpIcon.psd48.asset
  16. BIN
      Data/Editor/Skin/Icons/sprite_FolderIcon.psd.asset
  17. BIN
      Data/Editor/Skin/Icons/sprite_FolderIcon.psd16.asset
  18. BIN
      Data/Editor/Skin/Icons/sprite_FolderIcon.psd32.asset
  19. BIN
      Data/Editor/Skin/Icons/sprite_FolderIcon.psd48.asset
  20. BIN
      Data/Editor/Skin/Icons/sprite_FontIcon.psd.asset
  21. BIN
      Data/Editor/Skin/Icons/sprite_FontIcon.psd16.asset
  22. BIN
      Data/Editor/Skin/Icons/sprite_FontIcon.psd32.asset
  23. BIN
      Data/Editor/Skin/Icons/sprite_FontIcon.psd48.asset
  24. BIN
      Data/Editor/Skin/Icons/sprite_GUISkinIcon.psd.asset
  25. BIN
      Data/Editor/Skin/Icons/sprite_GUISkinIcon.psd16.asset
  26. BIN
      Data/Editor/Skin/Icons/sprite_GUISkinIcon.psd32.asset
  27. BIN
      Data/Editor/Skin/Icons/sprite_GUISkinIcon.psd48.asset
  28. BIN
      Data/Editor/Skin/Icons/sprite_IconError.png.asset
  29. BIN
      Data/Editor/Skin/Icons/sprite_IconError32.png.asset
  30. BIN
      Data/Editor/Skin/Icons/sprite_IconErrorDark.png.asset
  31. BIN
      Data/Editor/Skin/Icons/sprite_IconInfo.png.asset
  32. BIN
      Data/Editor/Skin/Icons/sprite_IconInfo32.png.asset
  33. BIN
      Data/Editor/Skin/Icons/sprite_IconInfoDark.png.asset
  34. BIN
      Data/Editor/Skin/Icons/sprite_IconWarning.png.asset
  35. BIN
      Data/Editor/Skin/Icons/sprite_IconWarning32.png.asset
  36. BIN
      Data/Editor/Skin/Icons/sprite_IconWarningDark.png.asset
  37. BIN
      Data/Editor/Skin/Icons/sprite_InspectorAddIcon.png.asset
  38. BIN
      Data/Editor/Skin/Icons/sprite_InspectorAddIconOn.png.asset
  39. BIN
      Data/Editor/Skin/Icons/sprite_InspectorApplyIcon.png.asset
  40. BIN
      Data/Editor/Skin/Icons/sprite_InspectorApplyIconOn.png.asset
  41. BIN
      Data/Editor/Skin/Icons/sprite_InspectorCancelIcon.png.asset
  42. BIN
      Data/Editor/Skin/Icons/sprite_InspectorCancelIconOn.png.asset
  43. BIN
      Data/Editor/Skin/Icons/sprite_InspectorClearIcon.png.asset
  44. BIN
      Data/Editor/Skin/Icons/sprite_InspectorClearIconOn.png.asset
  45. BIN
      Data/Editor/Skin/Icons/sprite_InspectorCloneIcon.png.asset
  46. BIN
      Data/Editor/Skin/Icons/sprite_InspectorCloneIconOn.png.asset
  47. BIN
      Data/Editor/Skin/Icons/sprite_InspectorCreateIcon.png.asset
  48. BIN
      Data/Editor/Skin/Icons/sprite_InspectorCreateIconOn.png.asset
  49. BIN
      Data/Editor/Skin/Icons/sprite_InspectorDeleteIcon.png.asset
  50. BIN
      Data/Editor/Skin/Icons/sprite_InspectorDeleteIconOn.png.asset
  51. BIN
      Data/Editor/Skin/Icons/sprite_InspectorEditIcon.png.asset
  52. BIN
      Data/Editor/Skin/Icons/sprite_InspectorEditIconOn.png.asset
  53. BIN
      Data/Editor/Skin/Icons/sprite_InspectorMoveDownIcon.png.asset
  54. BIN
      Data/Editor/Skin/Icons/sprite_InspectorMoveDownIconOn.png.asset
  55. BIN
      Data/Editor/Skin/Icons/sprite_InspectorMoveUpIcon.png.asset
  56. BIN
      Data/Editor/Skin/Icons/sprite_InspectorMoveUpIconOn.png.asset
  57. BIN
      Data/Editor/Skin/Icons/sprite_InspectorResizeIcon.png.asset
  58. BIN
      Data/Editor/Skin/Icons/sprite_InspectorResizeIconOn.png.asset
  59. BIN
      Data/Editor/Skin/Icons/sprite_LibraryClearSearchIcon.png.asset
  60. BIN
      Data/Editor/Skin/Icons/sprite_LibraryClearSearchIconOn.png.asset
  61. BIN
      Data/Editor/Skin/Icons/sprite_LibraryHomeIcon.png.asset
  62. BIN
      Data/Editor/Skin/Icons/sprite_LibraryHomeIconOn.png.asset
  63. BIN
      Data/Editor/Skin/Icons/sprite_LibraryOptionsIcon.png.asset
  64. BIN
      Data/Editor/Skin/Icons/sprite_LibraryOptionsIconOn.png.asset
  65. BIN
      Data/Editor/Skin/Icons/sprite_LibraryUpIcon.png.asset
  66. BIN
      Data/Editor/Skin/Icons/sprite_LibraryUpIconOn.png.asset
  67. BIN
      Data/Editor/Skin/Icons/sprite_MaterialIcon.psd.asset
  68. BIN
      Data/Editor/Skin/Icons/sprite_MaterialIcon.psd16.asset
  69. BIN
      Data/Editor/Skin/Icons/sprite_MaterialIcon.psd32.asset
  70. BIN
      Data/Editor/Skin/Icons/sprite_MaterialIcon.psd48.asset
  71. BIN
      Data/Editor/Skin/Icons/sprite_MeshIcon.psd.asset
  72. BIN
      Data/Editor/Skin/Icons/sprite_MeshIcon.psd16.asset
  73. BIN
      Data/Editor/Skin/Icons/sprite_MeshIcon.psd32.asset
  74. BIN
      Data/Editor/Skin/Icons/sprite_MeshIcon.psd48.asset
  75. BIN
      Data/Editor/Skin/Icons/sprite_PhysicsMaterialIcon.psd.asset
  76. BIN
      Data/Editor/Skin/Icons/sprite_PhysicsMaterialIcon.psd16.asset
  77. BIN
      Data/Editor/Skin/Icons/sprite_PhysicsMaterialIcon.psd32.asset
  78. BIN
      Data/Editor/Skin/Icons/sprite_PhysicsMaterialIcon.psd48.asset
  79. BIN
      Data/Editor/Skin/Icons/sprite_PhysicsMeshIcon.psd.asset
  80. BIN
      Data/Editor/Skin/Icons/sprite_PhysicsMeshIcon.psd16.asset
  81. BIN
      Data/Editor/Skin/Icons/sprite_PhysicsMeshIcon.psd32.asset
  82. BIN
      Data/Editor/Skin/Icons/sprite_PhysicsMeshIcon.psd48.asset
  83. BIN
      Data/Editor/Skin/Icons/sprite_PrefabIcon.psd.asset
  84. BIN
      Data/Editor/Skin/Icons/sprite_PrefabIcon.psd16.asset
  85. BIN
      Data/Editor/Skin/Icons/sprite_PrefabIcon.psd32.asset
  86. BIN
      Data/Editor/Skin/Icons/sprite_PrefabIcon.psd48.asset
  87. BIN
      Data/Editor/Skin/Icons/sprite_SceneCenterIcon.png.asset
  88. BIN
      Data/Editor/Skin/Icons/sprite_SceneCenterIconOn.png.asset
  89. BIN
      Data/Editor/Skin/Icons/sprite_SceneLocalIcon.png.asset
  90. BIN
      Data/Editor/Skin/Icons/sprite_SceneLocalIconOn.png.asset
  91. BIN
      Data/Editor/Skin/Icons/sprite_SceneMoveIcon.png.asset
  92. BIN
      Data/Editor/Skin/Icons/sprite_SceneMoveIconOn.png.asset
  93. BIN
      Data/Editor/Skin/Icons/sprite_SceneMoveSnapIcon.png.asset
  94. BIN
      Data/Editor/Skin/Icons/sprite_SceneMoveSnapIconOn.png.asset
  95. BIN
      Data/Editor/Skin/Icons/sprite_ScenePivotIcon.png.asset
  96. BIN
      Data/Editor/Skin/Icons/sprite_ScenePivotIconOn.png.asset
  97. BIN
      Data/Editor/Skin/Icons/sprite_SceneRotateIcon.png.asset
  98. BIN
      Data/Editor/Skin/Icons/sprite_SceneRotateIconOn.png.asset
  99. BIN
      Data/Editor/Skin/Icons/sprite_SceneRotateSnapIcon.png.asset
  100. BIN
      Data/Editor/Skin/Icons/sprite_SceneRotateSnapIconOn.png.asset

+ 1 - 1
CONTRIBUTING.md

@@ -1 +1 @@
-Before contributing please sign the <a href="https://www.clahub.com/agreements/BearishSun/BansheeEngine">Contributor License Agreement</a>. This agreement gives us rights to use your contribution.
+Before contributing please sign the <a href="https://cla-assistant.io/BearishSun/BansheeEngine">Contributor License Agreement</a>. This agreement gives us rights to use your contribution.

BIN
Data/Editor/GUISkin.asset


BIN
Data/Editor/ResourceManifest.asset


BIN
Data/Editor/Skin/Icons/sprite_AnimationClipIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_AnimationClipIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_AnimationClipIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_AnimationClipIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_AudioClipIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_AudioClipIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_AudioClipIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_AudioClipIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_CSharpIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_CSharpIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_CSharpIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_CSharpIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_FolderIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_FolderIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_FolderIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_FolderIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_FontIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_FontIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_FontIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_FontIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_GUISkinIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_GUISkinIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_GUISkinIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_GUISkinIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_IconError.png.asset


BIN
Data/Editor/Skin/Icons/sprite_IconError32.png.asset


BIN
Data/Editor/Skin/Icons/sprite_IconErrorDark.png.asset


BIN
Data/Editor/Skin/Icons/sprite_IconInfo.png.asset


BIN
Data/Editor/Skin/Icons/sprite_IconInfo32.png.asset


BIN
Data/Editor/Skin/Icons/sprite_IconInfoDark.png.asset


BIN
Data/Editor/Skin/Icons/sprite_IconWarning.png.asset


BIN
Data/Editor/Skin/Icons/sprite_IconWarning32.png.asset


BIN
Data/Editor/Skin/Icons/sprite_IconWarningDark.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorAddIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorAddIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorApplyIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorApplyIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorCancelIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorCancelIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorClearIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorClearIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorCloneIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorCloneIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorCreateIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorCreateIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorDeleteIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorDeleteIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorEditIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorEditIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorMoveDownIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorMoveDownIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorMoveUpIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorMoveUpIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorResizeIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_InspectorResizeIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_LibraryClearSearchIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_LibraryClearSearchIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_LibraryHomeIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_LibraryHomeIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_LibraryOptionsIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_LibraryOptionsIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_LibraryUpIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_LibraryUpIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_MaterialIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_MaterialIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_MaterialIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_MaterialIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_MeshIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_MeshIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_MeshIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_MeshIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_PhysicsMaterialIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_PhysicsMaterialIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_PhysicsMaterialIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_PhysicsMaterialIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_PhysicsMeshIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_PhysicsMeshIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_PhysicsMeshIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_PhysicsMeshIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_PrefabIcon.psd.asset


BIN
Data/Editor/Skin/Icons/sprite_PrefabIcon.psd16.asset


BIN
Data/Editor/Skin/Icons/sprite_PrefabIcon.psd32.asset


BIN
Data/Editor/Skin/Icons/sprite_PrefabIcon.psd48.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneCenterIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneCenterIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneLocalIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneLocalIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneMoveIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneMoveIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneMoveSnapIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneMoveSnapIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_ScenePivotIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_ScenePivotIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneRotateIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneRotateIconOn.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneRotateSnapIcon.png.asset


BIN
Data/Editor/Skin/Icons/sprite_SceneRotateSnapIconOn.png.asset


Vissa filer visades inte eftersom för många filer har ändrats