e8cdff627c
Merge commit '4ad6d3e9f75880558d4003474621b9ada3aef060' into puvvadar/gitflow_211118_o3de
2021-11-19 09:16:31 -08:00
3e35640dc6
Merge commit '2321afecfba5c1d83158cc22f0da7f1285d2199c' into puvvadar/gitflow_211118_o3de
2021-11-19 09:16:26 -08:00
8b5a322d67
Merge commit '9cbd323a3b799c3cc7fb285a96ba7ed2cace896b' into puvvadar/gitflow_211118_o3de
2021-11-19 09:16:20 -08:00
f65f744358
Merge commit 'ac959bcc01a52f1738e439b0291dfb8b0a73b388' into puvvadar/gitflow_211118_o3de
2021-11-19 09:16:14 -08:00
6cd0852f8d
Merge commit 'edb15946ca06072c26a5979f8a1682526ec5fce2' into puvvadar/gitflow_211118_o3de
2021-11-19 09:16:08 -08:00
ef25271d80
Merge commit 'e8576acbb0510717d57f168096a9cc6ad0c2fbf9' into puvvadar/gitflow_211118_o3de
2021-11-19 09:16:01 -08:00
89235fb546
Merge commit '76d2e125c294e1183ef55320417fa34a6f9d5e27' into puvvadar/gitflow_211118_o3de
2021-11-19 09:15:56 -08:00
b559b7f39f
Merge commit '7213e2cd8763e59b2998f7945f42cec16af22b8e' into puvvadar/gitflow_211118_o3de
2021-11-19 09:15:50 -08:00
c677fbff18
Merge commit '12e3a652d72865cc4a70c54487f5424abf6c9b81' into puvvadar/gitflow_211118_o3de
2021-11-19 09:15:43 -08:00
a49496f94b
Merge commit '06e5c394e2faa746b4a2bb70dd908e36e0a9bb77' into puvvadar/gitflow_211118_o3de
2021-11-19 09:15:37 -08:00
7dfd790de2
Fix typo
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-11-18 21:01:38 -08:00
e091b91300
Fix typo
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-11-18 20:25:47 -08:00
2fa83b5cfd
Add debug logging to diagnose AP Logs
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-11-18 19:49:43 -08:00
6b08e66e82
Cleaning up warns in Terrain PBR material
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-11-18 17:59:43 -08:00
4ad6d3e9f7
Updated project manager backgrounds ( #5770 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-18 16:54:04 -08:00
2321afecfb
Merge pull request #5760 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16762
...
Fix for SSR initialization and visual quality improvements
2021-11-18 17:31:27 -07:00
9cbd323a3b
Merge pull request #5763 from aws-lumberyard-dev/Atom/antonmic/AuxGeomFeedback
...
Capsule light aux geom: addressed feedback from previous PR plus some cleanup
2021-11-18 15:19:08 -08:00
ac959bcc01
Dragging an entity from outside the focused Prefab into it may crash the Editor ( #5762 )
...
* Replace Instance References with EntityId of the Prefab Container (WIP)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Use the invalid entity id for the root instance and get the root instance every time to prevent weird Prefab EOS shenanigans.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Revert unnecessary changes, fix IsOwningPrefabBeingFocused to match previous behavior. Disable some tests that no longer apply correctly due to the testing environment not relying on the Prefab EOS.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix minor typo in test comment
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-11-18 15:06:58 -08:00
38c89e37c2
Re-resolving Base.prefab with stabilization
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-11-18 14:39:20 -08:00
edb15946ca
Update resource mapping tool schema version ( #5729 )
...
* Update resource mapping tool schema version
Signed-off-by: allisaurus <34254888+allisaurus@users.noreply.github.com >
2021-11-18 14:35:24 -08:00
e8576acbb0
Replace old Developer Preview release name with Stable 21.11 ( #5759 )
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-11-18 14:16:56 -08:00
cf4ef5e73b
Addressed feedback from previous PR plus some cleanup
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-11-18 13:37:06 -08:00
2ab7866702
Re-resolve base.prefab
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-11-18 13:32:11 -08:00
76d2e125c2
Merge pull request #5751 from aws-lumberyard-dev/Prism/PythonLoggerWarn
...
Change warn to warning to remove deprecation messages from Python
2021-11-18 12:43:26 -08:00
7f4ab7a1c2
Added a frame delay before activating SSR, several visual quality improvements
...
Signed-off-by: dmcdiar <dmcdiar@amazon.com >
2021-11-18 13:10:07 -07:00
cd4eca7f75
Fix missing comma in prefab
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-11-18 11:55:38 -08:00
b7fca29fe1
Fix tabs
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-11-18 10:54:08 -08:00
7213e2cd87
Merge pull request #5750 from aws-lumberyard-dev/scripting/4060
...
Renamed RequestTaggedEntities to Get Entity By Tag as it only returns the first entity
2021-11-18 10:24:54 -08:00
12e3a652d7
Merge pull request #5737 from aws-lumberyard-dev/Atom/antonmic/FixForCapsuleAuxGeom
...
Fixed capsule auxgeom draw for lights and other aux geom issues
2021-11-18 10:16:31 -08:00
06e5c394e2
Updating AssetBrowser tests around new TableView model and removed several xfails from tests that now pass ( #5727 )
...
Signed-off-by: jckand-amzn <jckand@amazon.com >
2021-11-18 10:07:19 -08:00
83f42fed5f
Change warn to warning to remove deprecation messages from Python
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-18 09:49:05 -08:00
868cac6d47
Merge commit '1b63ca3bc0924a143b2952cdf88cca0e8a57dc57' into puvvadar/gitflow_211118_o3de
2021-11-18 09:43:46 -08:00
d0fcbc954c
Merge commit '44d693a4448422548d7c15e54a3827242f0bd20f' into puvvadar/gitflow_211118_o3de
2021-11-18 09:43:39 -08:00
5aee691cd8
Merge commit '78263b7f13bf5d0fac824a4c025c46c88138a59c' into puvvadar/gitflow_211118_o3de
2021-11-18 09:43:33 -08:00
6943db86b5
Merge commit 'a54a149877ee2054b315e9b9276dfec255713f62' into puvvadar/gitflow_211118_o3de
2021-11-18 09:43:27 -08:00
27648dea0e
Merge commit 'f18f5318c0559c1a899fcf04f219bea387f454f4' into puvvadar/gitflow_211118_o3de
2021-11-18 09:43:21 -08:00
3cfb94009e
Merge commit 'ca6b7d1d1f6659f5711677482f688ac35c95bf8e' into puvvadar/gitflow_211118_o3de
2021-11-18 09:43:15 -08:00
d38b390409
Merge commit 'bf4f52e146b09a3171c98926e29d0101be868dc8' into puvvadar/gitflow_211118_o3de
2021-11-18 09:43:09 -08:00
de6c1213a7
Merge commit 'cf540b6f44c7e439505a29d8d2ce4989c4ae8232' into puvvadar/gitflow_211118_o3de
2021-11-18 09:43:03 -08:00
5e0acc11ef
Merge commit 'b533a9566a0a221dd4f70486ab2a3d397bcae5c7' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:56 -08:00
724ff3b011
Merge commit 'd222aeef48ad10224958e682294e704c10ee06df' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:47 -08:00
a1aeec3381
Merge commit '555776fd7f24f7a89aa637c68d746b7d647fdea5' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:41 -08:00
9b2193653b
Merge commit 'c375f073395b88ada7b1b5b01ce3142992af97a9' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:35 -08:00
c1081ebd5d
Merge commit 'a8dcfbbb1390bca0a2ed3629b0c47c1af6358e77' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:29 -08:00
b37f75f060
Merge commit '713a3916f5c101c324f8e2f2e06b49bf521da783' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:23 -08:00
ccf208debe
Merge commit '95c8398c791a305b33205776c8b7959b263e6f62' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:17 -08:00
29562fd7c5
Merge commit '6b1fb04a1c3a8515a60fa06fc8cac242e441cba9' into puvvadar/gitflow_211118_o3de
2021-11-18 09:41:49 -08:00
bdded3e051
Merge commit 'a1cf76ec653da9229f24ba82863724a65d24859a' into puvvadar/gitflow_211118_o3de
2021-11-18 09:39:24 -08:00
f44a9e196c
Merge commit '33abae100880cf835fd6feb53e3fc03af68d0961' into puvvadar/gitflow_211118_o3de
2021-11-18 09:37:50 -08:00
01a31f2c7b
Merge commit 'd0ebe4ee10741eac2d0a623610b89a44f0f3cb49' into puvvadar/gitflow_211118_o3de
2021-11-18 09:37:44 -08:00
puvvadar
Alex Peterson
dmcdiarmid-ly
antonmic
Danilo Aimini
allisaurus
AMZN-Phil
dmcdiar
Luis Sempé
jckand-amzn
AMZN-Phil