birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,178 Commits 3 Branches 3 Tags
f5effaabcccefc138aa29f018ea2cc2b04e90b57
Commit Graph

1755 Commits

Author SHA1 Message Date
srikappa-amzn 1ca67cad80 Moved PrefabSavePreference settings registry code from PrefabEditorEntityOwnershipInterface to PrefabLoaderInterface 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-08-24 18:34:51 -07:00
Jeremy Ong c3e83387db Address additional PR feedback 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-24 19:33:34 -06:00
srikappa-amzn 79dd041d02 Add helper methods to create and execute save level dialogs 
Changes in this commit :
- Added AreDirtyTemplatesPresent() method to PrefabSystemComponentInterface
- Added ConstructSaveLevelDialog() helper method to create the save level dialog
- Added ExecuteSavePrefabsDialog() helper method to create and execute the save prefabs dialog

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-08-24 17:23:06 -07:00
puvvadar 2ef5e956ba Fix a function header comment 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-08-24 16:26:32 -07:00
puvvadar decf15df21 Move packet dispatch to return an enum that includes a pending option 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-08-24 16:19:38 -07:00
Mikhail Naumov bb90c4ddfe Disabling RootSpawnable warning (#3427) 
* Disabling RootSpawnable warning

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Revert "Disabling RootSpawnable warning"

This reverts commit c14e8d93945043498ab494bf608312cf5e1ad50d.

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* commenting out warning

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-24 15:43:26 -07:00
Jeremy Ong a9b4ad3486 Compile out tracker in release mode 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-24 16:38:43 -06:00
Chris Burel 86770deefa Add linux equivalents for all the places that enumerate platforms (#3325) 
* Add linux equivalents for all the places that enumerate platforms

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix the AssetFileInfoListComparisonTest fixture to not hardcode the PC platform

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-08-24 14:10:59 -07:00
Jeremy Ong c37c0cab08 Refactor budget definitions as named functions instead of template specializations 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-24 15:07:30 -06:00
Jeremy Ong 5e04c3737f Add preliminary budget tracking system and remove driller integration 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-24 15:07:29 -06:00
Jeremy Ong 07a14bdce1 Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller 
NOTE: The memory driller is still intact for now to avoid needing to
modify allocators, but the frame/cpu portions of driller and the
standalone executable are now gone.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-24 15:07:27 -06:00
Esteban Papp d91dbe3d92 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-24 11:49:35 -07:00
Esteban Papp 5361cf3b26 Merge branch 'development' into cmake/win_fix_wnew 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-24 11:49:07 -07:00
carlitosan 4e0399b283 Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development 
JSON serialization of SC Editor Assets
 2021-08-24 11:45:18 -07:00
Esteban Papp 5ca84cb07e Merge branch 'development' into cmake/win_fix_wnew 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/Cry_Camera.h
#	Code/Legacy/CryCommon/IShader.h
 2021-08-24 10:46:18 -07:00
Esteban Papp 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
#	Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
#	Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
 2021-08-24 10:43:48 -07:00
AMZN-koppersr 0d74d3ed5d Merge pull request #3377 from aws-lumberyard-dev/mnaumov/LYN-4539 
Allowing prefabs with missing components to load, and clarifying error message
 2021-08-24 10:42:40 -07:00
Esteban Papp cd9621f16e Remove unnecessary ALIGN macros 2021-08-24 10:35:14 -07:00
SergeyAMZN de4f2fc629 Merge pull request #3411 from aws-lumberyard-dev/MPWeaponSQ2 
Added a helper function for constructing CollisionGroup from CollisionGroups::Id. Removed remaining touch bending related code
 2021-08-24 18:23:42 +01:00
Mikhail Naumov 6c1ae1e618 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-24 09:45:01 -07:00
Esteban Papp a901a41b3a Merge branch 'development' into cmake/remove_align_macros 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-24 08:27:07 -07:00
hultonha 8c573979a9 Updates to camera tests to support different delta times and some further tidy-up (#3324) 
* updates to camera tests to support different delta times and some further tidy-up

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* support variable delta time in mouse move test

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-08-24 16:25:08 +01:00
pereslav 21605f15cc CR Feedback addressing 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-08-24 16:00:00 +01:00
pereslav 7d4f8e4281 Added a helper function for constructing CollisionGroup from CollisionGroups::Id. Removed remaining touch bending related code 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-08-24 13:39:54 +01:00
Esteban Papp a2cab41cdc trying a better fix for winioctl issue 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-23 18:15:13 -07:00
Esteban Papp 07ea4edbc2 Fixes for Mac/iOS 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-23 17:51:13 -07:00
Esteban Papp 63a2925720 more fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-23 17:21:59 -07:00
Mikhail Naumov 90912759f7 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-23 17:08:00 -07:00
Esteban Papp b820c36c80 clang is more specific where the modifier should be 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-23 16:17:10 -07:00
chcurran 794c22c02e merge latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-23 16:02:58 -07:00
Esteban Papp 31addc43dc Windows and Linux compiling 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-23 14:02:45 -07:00
Mike Balfour 97a053a540 Initial stub terrain gem (#3368) 
This is the initial Terrain Gem. In this PR, it doesn't do anything, but it contains all of the initial code, icons, and build scripts for the gem to compile and build successfully. The follow-up PR will contain the first round of functioning code.

Also, with the creation of the gem, the TerrainSurfaceDataSystemComponent is getting relocated from the SurfaceData Gem to the Terrain Gem. This should have no impact, as that component has provided no active functionality in o3de. (It will start working again with the initial terrain system code in the next PR)

This also adds a couple of null guards to prefab code to prevent AP crashes, and fixed an incorrect service dependency in the VegetationSystemComponent that was exposed by moving the TerrainSurfaceDataSystemComponent.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2021-08-23 15:41:57 -05:00
Mikhail Naumov f7eaa4490f fixing syntax errors 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-23 13:40:01 -07:00
michabr 89cc27fdef Fix input priority conflict with LyShine and ImGuiPass (#3329) 
* Fix input priority conflict with LyShine and ImGuiPass

Signed-off-by: abrmich <abrmich@amazon.com>

* Add GetPriorityDebugUI() input listener priority

Signed-off-by: abrmich <abrmich@amazon.com>
 2021-08-23 13:05:19 -07:00
Mikhail Naumov f224d657be Ronald's feedback 
Co-authored-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-23 13:02:12 -07:00
Esteban Papp 6bdef50444 Code/Framework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-23 13:00:45 -07:00
Mikhail Naumov 875918deda Allowing prebas with missing components to load, and clarifying error message 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-23 12:59:13 -07:00
Esteban Papp 8c526eeeb6 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-23 11:13:56 -07:00
amzn-sean b4279ab3d8 Remove touchbending references in PhysX Gem (#3320) 
* minor comments update

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-08-23 14:54:56 +01:00
Esteban Papp 53dfb1a39e remove unnecessary ALIGN macros 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 20:36:11 -07:00
Esteban Papp 7558a3d233 fixes for Android 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 19:40:13 -07:00
chcurran d7d2e84fee Added all the missing serializer support, fixed up serialization notification 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-20 19:35:38 -07:00
Esteban Papp c07b9d31bf PR comments/improvements 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 19:21:50 -07:00
Esteban Papp 2e228d94f0 push/pop mismatch 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 18:39:40 -07:00
Esteban Papp e98bab8a75 fixing format strings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 18:39:00 -07:00
Esteban Papp 257557c692 Code/Framework/AzToolsFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 17:56:42 -07:00
Esteban Papp fbbcdfd3ca Code/Framework/AzQtComponents 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 17:56:25 -07:00
Esteban Papp 657853c093 Code/Framework/AzNetworking 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 17:56:09 -07:00
Esteban Papp ece541b79f Code/Framework/AzManipulatorTestFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 17:55:54 -07:00
Esteban Papp 4efaafeb96 Code/Framework/AzFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 17:55:28 -07:00