birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,417 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'cd5df6b372'
${ noResults }
Commit Graph

1536 Commits (cd5df6b372e6c60d9fc270d618f708049d9bc86d)

Author SHA1 Message Date
Esteban Papp d91dbe3d92 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
carlitosan 4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development 
JSON serialization of SC Editor Assets
 4 years ago
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
 4 years ago
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
 4 years ago
Esteban Papp cd9621f16e
Remove unnecessary ALIGN macros 4 years ago
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
 4 years ago
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>
 4 years ago
Esteban Papp a901a41b3a Merge branch 'development' into cmake/remove_align_macros 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
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>
 4 years ago
pereslav 21605f15cc CR Feedback addressing 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
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>
 4 years ago
Esteban Papp 07ea4edbc2 Fixes for Mac/iOS 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
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>
 4 years ago
Esteban Papp b820c36c80 clang is more specific where the modifier should be 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
chcurran 794c22c02e merge latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp 31addc43dc Windows and Linux compiling 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
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>
 4 years ago
Mikhail Naumov f7eaa4490f fixing syntax errors 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 4 years ago
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>
 4 years ago
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>
 4 years ago
Esteban Papp 6bdef50444 Code/Framework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Mikhail Naumov 875918deda Allowing prebas with missing components to load, and clarifying error message 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 4 years ago
Esteban Papp 8c526eeeb6 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
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>
 4 years ago
Esteban Papp 53dfb1a39e remove unnecessary ALIGN macros 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 7558a3d233 fixes for Android 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
chcurran d7d2e84fee Added all the missing serializer support, fixed up serialization notification 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 4 years ago
Esteban Papp c07b9d31bf PR comments/improvements 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 257557c692 Code/Framework/AzToolsFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp fbbcdfd3ca Code/Framework/AzQtComponents 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 657853c093 Code/Framework/AzNetworking 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp ece541b79f Code/Framework/AzManipulatorTestFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 4efaafeb96 Code/Framework/AzFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 847fe108b7 Code/Framework/AtomCore 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp d4ee5423a9 Code/Framework/AzCore 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 9d5e7abfb1 Code/Framework/GridMate 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 588d702e43 Code/Framework/AzToolsFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 9245a31196 more fixes for Code 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp c8c29b1aff
Enable warning MSVC 4296: 'operator': expression is always false 4 years ago
Esteban Papp 8bc9ed3d01
removing some rad leftovers (#3366) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp b3023242d0 Merge branch 'development' into cmake/win_fix_warn_4296 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp a35464ca08 more fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
puvvadar 4e618db62d
Merge pull request #3082 from aws-lumberyard-dev/MultiplayerForwardDeclControllerErrorFix 
Fix Multiplayer AutoComponent Delete Incomplete Type Compile Error
 4 years ago
Mike Balfour bf42e3f02a
Non-terrain-gem changes in support of upcoming terrain work. (#3345) 
In preparation for a prototype Terrain Gem to get submitted, there are a few changes that are needed outside of the Terrain Gem as well:

The TerrainDataNotificationBus lives in AzFramework/Terrain, and needed to be extended to contain an optional OnTerrainDataChanged event to notify other systems when a terrain region has changed.
The HeightmapUpdateNotificationBus was removed, as this was a legacy file from the old already-removed terrain system.
The EditorWrappedComponentBase<> wrapper received a small optimization to ensure that ConfigurationChanged() is only called when the value of visibility actually changes. With prefabs, it appears that sometimes OnEntityVisibilityChanged could be called multiple times in a row with the same visibility value.
The TerrainSurfaceDataSystemComponent was updated to use the correct busses, and is ready to be moved to the Terrain Gem in a subsequent PR.

Signed-off-by: Mike Balfour 82224783+mbalfour-amzn@users.noreply.github.com
 4 years ago
Esteban Papp cf6c7c4d8d some unused fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp 62a0041245 enable warning 4296: 'operator': expression is always false 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Chris Galvan c1f236a70b
Merge pull request #3337 from aws-lumberyard-dev/cgalvan/ComponentSearchIncludeCategory 
Include the category name when performing search in the component palette.
 4 years ago
Esteban Papp d098b25b03
Adding support for ASan (Windows/MSVC) and fixing AzCore 4 years ago
Esteban Papp a97bccbf38 some fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago