birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,949 Commits 3 Branches 3 Tags
8408f6b815e41b3de0b5b214ffdbf23c2fa7e6cf
Commit Graph

3949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hasareej 8408f6b815 PR feedback changes 2.0 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-06-30 18:02:44 +01:00
hasareej 32687cbcb2 PR feedback changes 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-06-30 18:01:52 +01:00
hasareej df0fede8d2 Hiding the 2 Clusters during Gameplay mode 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-06-30 18:00:52 +01:00
balibhan 6392788212 Merge pull request #1547 from aws-lumberyard-dev/build_game_launcher 
Test game launcher with GPU
 2021-06-30 21:25:30 +05:30
Jacob Hilliard ed9232563d [ATOM-15862] Fixing CPU profiler to save multiple regions within the same thread (#1636) 
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
 2021-06-30 08:51:32 -07:00
Steve Pham 03c8110d02 Replaced remaining CryTek copyright notices 
- Replaced 'CryTek' with 'Contributors to the Open 3D Engine Project' in ConsoleHelpGen.cpp (#1667)
- Removed remaining 'Crytek Engine Source File.. Copyright (C), Crytek Studios' in various Editor source files
- Replaced 'modifications by CryTek' and 'modifications by Amazon' with 'Modified from original'
 2021-06-30 08:27:43 -07:00
Aaron Ruiz Mora 68f1410956 Using prefabs generated by the conversion tool (#1675) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-06-30 16:18:14 +01:00
Benjamin Jillich 3a5b8808a0 [LYN-4879] Incorrect colour UI issue on Gem Configure (#1678) 
* Aligned the column headers to the elements
* Moved the styling of the gem column header labels to the qss
* Fixed the scrollbar for the gem list view

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-06-30 17:12:01 +02:00
SergeyAMZN 18d4f1022f Merge pull request #1677 from aws-lumberyard-dev/MultiplayerEditorFixes2 
Merged ctrl+g fixes from MultiplayerEditorFixes
 2021-06-30 14:47:19 +01:00
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-06-30 13:20:07 +01:00
dmcdiarmid-ly c4a20405e2 Merge pull request #1666 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14526 
[ATOM-14526] DiffuseProbeGrid and ReflectionProbe components alter box shape size
 2021-06-29 23:27:38 -07:00
Nicholas Van Sickle 84853175e5 Merge pull request #1669 from aws-lumberyard-dev/nvsickle/FixCenterOnAABB 
Fix Viewport camera position failing to update when "Find in viewport……" is activated
 2021-06-29 20:51:26 -07:00
AMZN-mnaumov 48c5854666 Merge pull request #1621 from aws-lumberyard-dev/Atom/mnaumov/LYN-4544cherryPick 
[LYN-4544] Fixing thumbnail crashing on bad data
 2021-06-29 18:48:41 -07:00
nvsickle 528279af32 Fix Viewport camera position failing to update when "Find in viewport" is activated 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-06-29 18:19:23 -07:00
Guthrie Adams ade4199c28 Merge pull request #1662 from aws-lumberyard-dev/Atom/guthadam/ATOM-15892_fixing_material_slot_clear_overrides 
ATOM-15892 fixing material component clear overrides button
 2021-06-29 20:05:06 -05:00
guthadam 64186b4ec6 ATOM-15892 fixing material component clear overrides button 
The clear material override properties button was not sending the notification to update the entity or undo state.

Signed-off-by: guthadam <guthadam@amazon.com>
 2021-06-29 18:45:40 -05:00
dmcdiar b65a2da548 Changed the DiffuseProbeGrid and ReflectionProbe components to only override the Box size if it's at the default (unit) 
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
 2021-06-29 16:10:03 -07:00
Scott Romero 0b3884985e [stabilization/2106] generalize progress screen text and split out download/execution progress (#1654) 2021-06-29 15:57:22 -07:00
Terry Michaels ffc05872cc Updated Helpers Icon per UX (#1658) 
Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-06-29 17:37:34 -05:00
Vincent Liu f7c96e44b0 [LYN-4848] Migrate remaining doc links to o3de.org (#1632) 2021-06-29 14:56:09 -07:00
mrieggeramzn ed193c82fa Merge pull request #1652 from aws-lumberyard-dev/Atom/mriegger/tgs 
Bumping threadgroup sizes
 2021-06-29 14:16:20 -07:00
Esteban Papp 9f0bbf3b74 SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634) 
* git mv Code\CryEngine Code\Legacy
* redirecting CMakeLists.txt
* fixing uic warning
* Some more CryEngine mentions
* validation scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-06-29 13:51:24 -07:00
Riegger 57d2f28826 Bumping threadgroup sizes 
Signed-off-by: Riegger <mriegger@amazon.com>
 2021-06-29 13:20:55 -07:00
AMZN-ScottR 73c0efbd90 [cpack/2106-progress-screen] generalize progress screen text and split out download/execution progress 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-06-29 12:39:12 -07:00
Nicholas Van Sickle f570925c0d Merge pull request #1637 from aws-lumberyard-dev/nvsickle/FixRapidCameraSwitch 
Fix switching cameras rapidly in the Editor accidentally copying camera positions
 2021-06-29 12:37:04 -07:00
Terry Michaels 149863c527 Removed Amazon as Company for QSettings (#1649) 
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-06-29 14:00:11 -05:00
nvsickle 26c123dd56 Switch Python camera API to use Atom directly 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-06-29 11:41:10 -07:00
Roman e1f6d45b04 Defer the render plugin reinit to main thread (#1626) 
Fix a problem with reloading actor in emfx studio crashes the editor 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-06-29 11:24:54 -07:00
AMZN-stankowi 0095e5aa6a Updated AssImp to rev11, latest build for all platforms (#1563) 2021-06-29 10:50:42 -07:00
Ken Pruiksma 1ee4f7b447 Adjusting alpha on grazing angles so it doesn't affect the diffuse response. (#1599) 2021-06-29 12:45:10 -05:00
Aaron Ruiz Mora 2d27c13b31 Created cloth slice assets as prefabs (#1646) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-06-29 18:30:35 +01:00
jackalbe a9227e1962 {LYN-4456} FileIO hooks for LegacyTestAdapter (#1635) 
* Could not reproduce the unit test fail for the m_app->BeforeRun() failure,
* so I am adding file IO hooks to listen for errors during the fixture setup

Tests: failed to repro the issue
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
 2021-06-29 11:59:51 -05:00
Terry Michaels 8fe33c9afc Removed references to Lumberyard (#1645) 
Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-06-29 11:06:15 -05:00
Danilo Aimini a76a7291b5 Replace Asset Processor system tray icon with a more readable one. (#1639) 
Signed-off-by: daimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-06-29 08:55:03 -07:00
Danilo Aimini b1f54a2090 Replace the splash screen and about us image with a temporary gradient until the official one has been finalized. (#1642) 
Signed-off-by: daimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-06-29 08:54:40 -07:00
amzn-phist 75e7472cda Fixes audio crash and issues w/ audio playback (#1633) 
This was caused by the main thread audio update not being called all the
time, especially Editor Game mode.

The crash was due to main thread containers not being processed and
emptied of their requests.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 2021-06-29 10:54:27 -05:00
Aaron Ruiz Mora f01587c159 Editor launcher missed to set 'sv_isDedicated' to false like the launchers (#1643) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-06-29 16:10:26 +01:00
AMZN-nggieber 61d0ed0b5c Replace project template previews with default project preview (#1622) 2021-06-28 19:58:20 -07:00
AMZN-nggieber a5e66505a0 Fix issue moving and renaming projects at the same time (#1620) 2021-06-28 19:58:00 -07:00
hershey5045 ccb784d7d5 Fix weight blending in look modification postfx. (#1627) 
Signed-off-by: Robin <rbarrand@amazon.com>
 2021-06-28 19:49:35 -07:00
hershey5045 c45ec34f16 Add max value for editor bloom intensity. (#1630) 
Signed-off-by: Robin <rbarrand@amazon.com>
 2021-06-28 19:20:03 -07:00
moudgils 7780b83fdc Fix SSR Reflections on Mac amongst other things (#1618) 
Fix writing to the correct mip in Metal
Set default m_outputScale to 1 in order to fix a 1/0 error
Add support for logging/printing errors pertaining to GPU crashes.
Setting Release queue's collection latency to MaxFrames.
Fix managed mem synchronization related offset bug
 2021-06-28 17:57:06 -07:00
SJ 9dc961ec35 [iOS] Fix incorrect window size being used when rendering on newer iPhones with bigger screens. (#1625) 
* [iOS] Fix incorrect window size being used when rendering on newer iPhones with bigger screens.

Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-06-28 17:53:43 -07:00
AMZN-Phil a67ce87102 Merge pull request #1612 from aws-lumberyard-dev/LYN-4768 
Fix gem name and author bounding rects and make headings readable
 2021-06-28 17:28:25 -07:00
Scott Romero 587c945f24 [stabilization/2106] add option to launch the project manager after install (#1606) 2021-06-28 17:26:23 -07:00
nvsickle 4874a48c18 Fix switching cameras rapidly in the Editor accidentally copying camera positions 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-06-28 15:54:35 -07:00
mnaumov 0b28c15637 [LYN-4544] Fixing thumbnail crashing on bad data 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-06-28 11:17:49 -07:00
Alex Peterson c7d000e14b Updating LFS config to new endpoint (#1619) 
Signed-off-by: alexpete <alexpete@amazon.com>
 2021-06-28 11:08:21 -07:00
darapan 19695cfd12 "Fixing review comments" 2021-06-28 10:02:30 -07:00
sharmajs-amzn deadf448c9 Fix for module file path (#1598) 2021-06-28 09:45:05 -07:00