birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
93db356fbb60df4dce08a36a9cb75481fe3d9fa2
o3de/Assets/Editor
T
History
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
..
Editor/Icons/AssetBrowser
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
Fonts/Open_Sans
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
Icons
Hasareej fix whitebox and physx cluster icons (#1398)
2021-06-18 11:45:48 +01:00
LambdaFunctions
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Materials
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
ObjectIcons
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
Objects
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
Plugins/ParticleEditorPlugin
UI Editor Viewport fixes
2021-05-11 21:38:15 -07:00
Prefabs
Added fly camera input component to default level prefab (#1555)
2021-06-24 10:16:56 -05:00
Presets/MobileSettings
Removed deprecated assets (GeomCache files)
2021-05-04 12:59:49 -05:00
Scripts
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
Styles
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
Translation
Updating IsNetEntityRole helper methods for more clarity. Also added tooltip scripting and comments for code
2021-06-17 16:16:38 -07:00
UI
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
asset_thumbnail.tod
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
CryDesigner_TimeOfDay.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
default_time_of_day.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
EditorParticlePanels.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
EditorParticlePanelsDefault.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
LevelTemplates.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
MapScreenshotSettings.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
MissionTemplate.lua
Final update copyright headers to reference license files at the repo root (#1693)
2021-06-30 19:51:55 -07:00
ModellingPanel.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
NewEntityTemplate.ent_template
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
NewEntityTemplate.lua_template
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
ObjectTemplates.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
PropertyEnumerations.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
SoundTemplates.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
ToolBox.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
uiCanvasEditorResolutionPresets.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
UserTools.xml
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00