8743155b73
Merge pull request #76 from aws-lumberyard-dev/Atom/qingtao/ATOM-13791
...
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
LYN-2908 Pressing Home button crashes the Editor
2021-04-15 15:19:25 -07:00
7f53b931a3
Merge branch 'main' into Atom/guthadam/material_dialog_button_and_modality_fixes
2021-04-15 16:59:09 -05:00
b7ce56a036
Merge branch 'main' into mpgem_editor
2021-04-15 14:37:56 -07:00
2309c06709
Fix merge error in MP Gem Module
2021-04-15 14:37:15 -07:00
abf26eede1
Bump REsourcePoolBuilder as the bufferBindFlags were updated
2021-04-15 14:00:40 -07:00
ef30f49bf9
Fixed a linux compile issue.
2021-04-15 13:29:29 -07:00
76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs
...
Make creation of new prefabs use a relative path to the project
2021-04-15 13:20:18 -07:00
66517b22e0
Updating how to calculate the ENGINE_ROOT path based on the CURRENT_PATH value
2021-04-15 13:06:27 -07:00
a9516c6498
updated the ref to dccsi env that changed
2021-04-15 15:04:36 -05:00
9516912b9c
Merge branch 'main' into Atom/guthadam/material_dialog_button_and_modality_fixes
2021-04-15 15:03:26 -05:00
020d7801bb
Make sure Recent Files list is correctly enabled/disabled when the list changes ( #73 )
...
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
2021-04-15 14:28:57 -05:00
8a589ff3e1
Merge pull request #68 from aws-lumberyard-dev/Atom/dmcdiar/LYN-2772
...
[LYN-2772] Adding White Box Component to an Entity silently crashes the Editor
2021-04-15 12:26:37 -07:00
a5fdbddeda
Merged MultiplayerPipeline from CodeCommit
2021-04-15 20:24:50 +01:00
e0a9c4b154
Merge branch 'main' of https://github.com/aws-lumberyard/o3de
2021-04-15 14:22:06 -05:00
dbae71c511
Fixes for android nightly unit tests
...
- Fix broken test launcher caused by change in unit test module registry format
- Fix test runner script's ENGINE_ROOT (re-parenting) path caused by move of file to different folder
- Adding step to always perform an android sdk update to latest creating and launching android virtual device (AVD)
2021-04-15 11:57:23 -07:00
f938fde4b0
Compile fix
2021-04-15 11:54:45 -07:00
48e53ac66b
Correctingtypo
2021-04-15 13:50:29 -05:00
2f698626cf
Merge pull request #64 from aws-lumberyard-dev/nvsickle/CherryPickContextMenuFix
...
Cherry-pick: Fix context menu popping up in EditorViewportWidget when it shouldn't
2021-04-15 11:33:57 -07:00
0997a2cfbf
Merge branch 'main' into sceneapi_script_regression
2021-04-15 13:22:45 -05:00
80f8c0f68b
behavior context class SceneGraph::NodeIndex -> "NodeIndex"
2021-04-15 13:21:24 -05:00
c63f09adce
Merge branch 'main' into Prefab/CreatePrefab
2021-04-15 11:08:27 -07:00
a9345646f8
fixing a hardcoded path typo that someone submitted on accident.
2021-04-15 13:08:13 -05:00
cc7b4fc251
Updated all materials, did some mesh cleaning adding source file as well.
2021-04-15 13:06:27 -05:00
4da29a09d2
Merge branch 'main' into Prefab/RelativePathForNewPrefabs
2021-04-15 11:01:15 -07:00
a81ca4490f
Move EMotionFX's OpenGL dependency to 3rd Party and make sure Mac builds successfully
2021-04-15 10:42:34 -07:00
2baa0db2de
Standardizing dialog button boxes across material editor and component
...
Making dialogs modal
https://jira.agscollab.com/browse/ATOM-15173
https://jira.agscollab.com/browse/ATOM-15174
2021-04-15 12:38:07 -05:00
9d84fdcb23
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
2021-04-15 18:26:54 +01:00
7ff0c5c33a
fix reserve call that should have been resize - add extra handling to output error
2021-04-15 18:17:02 +01:00
f5791ee60a
Fixed compile error and added Setters to Node Palette
2021-04-15 10:08:07 -07:00
53e84b3820
Fixed scoping rules for variables
2021-04-15 09:35:09 -07:00
14f7883425
Merge pull request #15 from aws-lumberyard-dev/limit_max_scale
...
setting max value for scale
2021-04-15 17:27:07 +01:00
fbe1b53617
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into main
2021-04-15 09:24:06 -07:00
01dc097fa6
Merge pull request #66 from aws-lumberyard-dev/pruiksma/ATOM-15240
...
ATOM-15240 Fixing thumbnails attempting to use a feature processor that no longer exists.
2021-04-15 11:20:19 -05:00
3f49553b46
Merge branch 'main' into non-uniform-scale-visibility
2021-04-15 17:07:25 +01:00
582b098ed2
removing unused local variable
2021-04-15 17:06:56 +01:00
ebebc05cd1
Reenable Blast Automated tests ( #42 )
...
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com >
2021-04-15 16:16:31 +01:00
3bbef11d15
Merge branch 'main' into non-uniform-scale-visibility
2021-04-15 14:17:11 +01:00
e989a2e697
Merge branch 'limit_max_scale' of https://github.com/aws-lumberyard-dev/o3de into limit_max_scale
2021-04-15 14:00:44 +01:00
10ab7666db
Merge branch 'main' into limit_max_scale
2021-04-15 13:44:53 +01:00
2bfb93e5e1
fixing non-uniform scale for mesh on activation
2021-04-15 12:34:35 +01:00
23cf2d5d68
SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects.
2021-04-15 12:24:48 +01:00
20c1454e4b
Added the ShaderRead buffer bind flag to the static and dynamic input assembly pools, and one creation of a static input assembly buffer.
2021-04-15 03:41:20 -07:00
390aa36480
Merge branch 'main' into LYN-1901
2021-04-15 11:08:04 +01:00
11081aeddd
Changed logo to O3DE
2021-04-15 11:01:08 +01:00
7c5f7181eb
updates following review feedback - remove explicit resize and update concrete type to alias
2021-04-15 10:32:46 +01:00
4c582a2b0a
Merge branch 'main' into non-uniform-scale-mesh
2021-04-15 08:29:57 +01:00
79a34f87b0
fixing merge conflicts
2021-04-15 08:28:50 +01:00
d8169e08fb
merging from main
2021-04-15 08:18:11 +01:00
b6492121ca
Merge branch 'main' into Prefab/CreatePrefab
2021-04-15 00:07:29 -07:00
fa7f61cf0d
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
...
- Added pause/resume button to ImGui Profiler to pause/resume profiling
- Added showing pass execution timeline
- Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult.
- Update some functions names in Pass.
- Stop showing accumulated time for ParentPass.
- Fixed a crash issue with ImGuiManager which doesn't have default font.
2021-04-14 22:48:46 -07:00
Vicky
guthadam
puvvadar
moudgils
qingtao
srikappa-amzn
spham
gallowj
Terry Michaels
dmcdiarmid-ly
pereslav
mbalfour
luissemp
Nicholas Van Sickle
jackalbe
srikappa
amzn-sj
hultonha
greerdv
Ken Pruiksma
greerdv
Ulugbek Adilbekov
amzn-sean
dmcdiar
jjjoness