sphrose 4e5b62ee25 conflict fix ...

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

2021-12-03 11:36:58 +00:00

..

AtomCore

Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409)

2021-11-15 12:11:58 +00:00

AzAndroid/java/com/amazon

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

AzCore

Rename sr_regset-file CVar to sr_regset_file (#6067)

2021-12-01 13:16:19 -06:00

AzFramework

conflict fix

2021-12-03 11:36:58 +00:00

AzGameFramework

Update how Project Filepaths are calculated when not supplied via command line (#5194)

2021-11-04 11:02:18 -05:00

AzManipulatorTestFramework

Update intersect behavior for positioning entities in the viewport (#5906)

2021-11-30 15:07:40 +00:00

AzNetworking

Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409)

2021-11-15 12:11:58 +00:00

AzQtComponents

Fix failing zero color conversion test on Linux

2021-12-02 08:50:03 -08:00

AzTest

Removed trait AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS

2021-12-02 10:20:55 -08:00

AzToolsFramework

Prefab/unit tests for deletion (#6034)

2021-12-02 08:09:28 -08:00

GFxFramework

More fixes

2021-09-08 16:50:57 -07:00

GridMate

Remove old "Integ" functionality from tests (#4688)

2021-10-15 08:53:26 -07:00

CMakeLists.txt

Remove crcfix (#3294)

2021-08-18 12:38:00 -07:00