Commit Graph

546 Commits

Author SHA1 Message Date
michabr c66e2f4bcf Initial phase of UI Canvas Editor rendering with Atom (#164)
* Move Draw2d.h to Include folder

* Initial phase of UI Canvas Editor rendering with Atom

* Simplify Draw2d by removing BeginDraw2d/EndDraw2d which is no longer needed

* Fix compile errors for non-unity builds
2021-04-21 23:30:11 -07:00
AMZN-mnaumov 88d0853cfd Merge pull request #186 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15296
[ATOM-15296] Fixing deadlock related to thumbnails
2021-04-21 21:24:38 -07:00
AMZN-mnaumov 9acf50481a Merge pull request #120 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14073
[ATOM-14073] Double click launches Material Editor
2021-04-21 20:18:02 -07:00
mnaumov 5f0e7f2cbc merge from main 2021-04-21 19:21:02 -07:00
Luis Sempé 8996976efb Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
Fixed Lua IDE startup
2021-04-21 17:34:31 -07:00
rhongAMZ cbc7b60eb8 Merge pull request #203 from aws-lumberyard-dev/animation/rhhong/dev
Animation Editor: Removing all layouts causes the Animation Editor to be unusable
https://jira.agscollab.com/browse/LYN-3139
2021-04-21 16:31:36 -07:00
luissemp 49322b040b Fixed Lua IDE startup 2021-04-21 15:37:15 -07:00
mnaumov af00191e82 merge from main 2021-04-21 15:21:03 -07:00
cgalvan 7a6b0c16b7 Merge pull request #206 from aws-lumberyard-dev/cgalvan/RemoveLegacyEditTools
[LYN-3105] Removed legacy CEditTool class and all sub-classes.
2021-04-21 16:43:14 -05:00
cgalvan 143c2516c6 Merge pull request #211 from aws-lumberyard-dev/cgalvan/FixEMFXDocking
[LYN-3137] Fixed EMFX floating dock widgets not responding to docking events.
2021-04-21 16:06:26 -05:00
Chris Galvan ee90a73744 [LYN-3105] Fixed missing include. 2021-04-21 16:04:55 -05:00
Olex Lozitskiy 2063b0ba9a Merge pull request #145 from aws-lumberyard-dev/Atom/olexl/ATOM-15275
ATOM-15275 RedCode legacy version of DirectXShaderCompiler
2021-04-21 16:54:58 -04:00
Steve Pham 97fd0df098 Merge pull request #205 from aws-lumberyard-dev/SPEC-5833-main
Update Lua package revs and hashes to use new re-built Lua packages that pass scrubbing validation
2021-04-21 13:13:37 -07:00
Vicky 3b8d81f6a3 Merge pull request #204 from aws-lumberyard-dev/Atom/qingtao/LYN-2772
LYN-2772 Atom: Adding White Box Component to an Entity silently crashes the Editor
2021-04-21 12:54:31 -07:00
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 2021-04-21 14:54:19 -05:00
rhhong d2eafe7995 Merge branch 'main' into animation/rhhong/dev 2021-04-21 12:51:16 -07:00
Chris Galvan 5f8ffdfdc1 [LYN-3137] Fixed EMFX floating dock widgets not responding to docking events. 2021-04-21 14:48:00 -05:00
Aristo7 9e874ae2ed Merged main in 2021-04-21 15:34:29 -04:00
Vincent Liu 626f7c00fe [SPEC-1856] Convert AWSGameLiftServerSDK to new 3rdparty system (#198)
Remove old 3rdparty reference in code, and replace with new target.
Lib has been promoted to prod bucket (https://jira.agscollab.com/browse/SPEC-6469)
2021-04-21 12:07:34 -07:00
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 2021-04-21 13:57:16 -05:00
Steve Pham add0b44812 Merge pull request #196 from aws-lumberyard-dev/SPEC-3516
Fixing install script for selecting specific version of Cmake and adding +x permissions to the file
2021-04-21 11:55:11 -07:00
carlitosan b5b7903e56 Merge pull request #183 from aws-lumberyard-dev/carlitosan_scripting_first
Replace execution out look up string compares and hashes with simple array index. And bug fixes and tests. LY-124552, LYN-2855, LYN-2920, LYN-2815
2021-04-21 11:40:56 -07:00
qingtao 99e91e3e80 LYN-2772 Atom: Adding White Box Component to an Entity silently crashes the Editor
Fixed a buffer creation issue with white box mesh.
2021-04-21 11:30:24 -07:00
spham 5906731cd1 Update Lua package revs and hashes to use new re-built Lua packages that pass scrubbing validation 2021-04-21 11:30:00 -07:00
rhhong e05b7d5bb5 Animation Editor: Removing all layouts causes the Animation Editor to be unusable
Making the anim graph layout the default layout, cannot be removed from the menu.
2021-04-21 11:19:13 -07:00
Esteban Papp 92c77dca11 LYN-3069 Revert some 3rdparty changes and address issue (#185)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed
2021-04-21 11:16:27 -07:00
Olex Lozitskiy e3b48c16bd Merge pull request #170 from aws-lumberyard-dev/Atom/olexl/openimageio_3p_update
Updated OpenImageIO 3p package to rev2
2021-04-21 13:21:19 -04:00
chcurran bb976438fc Merge branch 'main' into carlitosan_scripting_first 2021-04-21 09:54:35 -07:00
chcurran 4faa64e31d Fix string format build error 2021-04-21 09:42:33 -07:00
amzn-sean 743d6a511a Merge pull request #192 from aws-lumberyard-dev/physx_character_create
Character controller now uses Add/Remove Simulated Body API
2021-04-21 17:37:35 +01:00
spham a14cd0102e Fixed cmake version targeting 2021-04-21 09:28:28 -07:00
spham cb142107e7 Fixed targeting of cmake version 2021-04-21 09:27:34 -07:00
Scott Romero 8e67ff55c0 Adding option to override inclusion of test targets in build
Merge pull request #180 from aws-lumberyard-dev/SPEC-6436
2021-04-21 08:20:34 -07:00
Aaron Ruiz Mora 5524668f61 Updating O3DE to use 3rdParty PhysX package rev2 on iOS (#189) 2021-04-21 15:35:53 +01:00
SergeyAMZN 662633d070 Merge pull request #193 from aws-lumberyard-dev/MultiplayerPipeline
Tabs/whitespace fixes (missed in a previous PR)
2021-04-21 15:30:36 +01:00
pereslav 374f690b5d tabs/whitespace fixes 2021-04-21 13:34:44 +01:00
SergeyAMZN 0a09ab7c8e Merge pull request #173 from aws-lumberyard-dev/MultiplayerPipeline
Merging current state of multiplayer pipeline to main
2021-04-21 12:54:28 +01:00
Ulugbek Adilbekov 8c3b528905 Re-reenable blast tests (#160)
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
2021-04-21 12:27:23 +01:00
amzn-sean 7ac246bab5 Character controller now uses Add/Remove Simulated Body 2021-04-21 11:13:27 +01:00
amzn-sean b0cb5a381b Merge pull request #104 from aws-lumberyard-dev/fixed_LYN-2998_main
LYN-2998
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
fixed entities not being deselected when entering game mode in editor.
2021-04-21 11:09:32 +01:00
Tommy Walton b95865b2d8 Simple Motion component doesn't animate actors (#179)
Buffers that have InputAssembly bind flags but also have ShaderRead flags should create buffer views
2021-04-21 08:37:51 +01:00
Benjamin Jillich 041f68c238 [LYN-2859] EMotionFX: Getting active states from anim graph via script crashes the editor (#150) 2021-04-21 07:54:37 +02:00
dmcdiarmid-ly 421a1dbfdb Merge pull request #153 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14706
[ATOM-14706] Add DiffuseProbeGridClassificationPass
2021-04-20 20:31:28 -07:00
mnaumov 5f4275336c Fixing deadlock related to thumbnails
Adding smoothing to thumbnails in AssetBrowser
2021-04-20 20:05:32 -07:00
Nicholas Van Sickle e8cd122b86 Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
Cherry-pick viewport fixes to main
2021-04-20 19:45:01 -07:00
Shirang Jia 3f8af33496 Merge pull request #175 from aws-lumberyard-dev/build_strike/SPEC-6304
Add lambda function to delete branch EBS volumes on Github branch deletion action
2021-04-20 19:12:28 -07:00
Shirang Jia c6cd492196 Merge pull request #143 from aws-lumberyard-dev/build_strike/SPEC-6433
Add repository name to EBS volume tag
2021-04-20 19:11:37 -07:00
karlberg 7adbdb2889 Fix some include paths after rename/refactor 2021-04-20 18:37:53 -07:00
chcurran 651f9819af Merge branch 'main' into carlitosan_scripting_first 2021-04-20 18:34:24 -07:00
karlberg 0da6d5ad61 Missed the associated cmake changes 2021-04-20 18:23:17 -07:00