birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,699 Commits 3 Branches 3 Tags
5c0bbe7ac1f659c39dae36fbbe2fcbadbc2e716c
Commit Graph

6699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chcurran 5c0bbe7ac1 add SC cvar settings cache 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-07 14:32:24 -07:00
chcurran 64ab627f03 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-09-07 09:35:04 -07:00
Esteban Papp e20c270580 Fixes install failures when RenderDoc and/or PIX are enabled 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-07 07:59:03 -07:00
moraaar f551e69b2b PythonProxyNotificationHandler::OnEventGenericHook acquires the Python GIL before executing (#3904) 
- Protected python execution of OnEventGenericHook by trying to lock the GIL and show a descriptive error when it was not possible to lock.
- Improved mechanism to lock python mutex and GIL in PhytonSystemComponent. Acquiring/releasing GIL once per thread.
- Added unit test to verify errors are fired when trying to execute OnEventGenericHook from another thread (as it should not able to acquire the GIL).
- Improved python threading tests to actually using python buses.

Signed-off-by: moraaar moraaar@amazon.com
 2021-09-07 15:35:04 +01:00
hultonha 33299399af File renames for settings updates 
Merge pull request #3952 from aws-lumberyard-dev/hultonha_GH-3579_tidyup
 2021-09-07 09:16:31 +01:00
AMZN-AlexOteiza c002515036 Merge pull request #3945 from aws-lumberyard-dev/reorg_px2 
Final part of PhysX/Whitebox/NvCloth/Blast Standarization of paths and multiple fixes
 2021-09-06 22:18:28 +02:00
hultonha b8f65cc78b updates after file renames 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-06 18:24:45 +01:00
ANT\aljanru 9159eccb25 Fixes for periodic and gpu tests affected by the move 2021-09-06 17:03:10 +02:00
Hulton-Harrop 3e9a415b27 EditorPreferences modernize file rename 
Signed-off-by: Hulton-Harrop <hultonha@amazon.co.uk>
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-06 15:06:45 +01:00
Hulton-Harrop 6c1185bcbb rename CEditorPreferencesPage_ViewportMovmement to CEditorPreferencesPage_ViewportCamera 
Signed-off-by: Hulton-Harrop <hultonha@amazon.co.uk>
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-06 15:06:43 +01:00
Benjamin Jillich 784542d82e EMotionFX: Resetting motion sets is not registered in the Motions pane which may lead to a crash (#3762) 
Remove motion set callback was missing and the window wasn't updated in case it was hidden.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-09-06 16:00:16 +02:00
hultonha a374ea29f2 Expose setting to adjust angular manipulator circle bound (#3932) 
* add debug drawing for angular manipulator bounds

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

* remove editor viewport settings from RenderViewport

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

* add setting for angular manipulator circle bound

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

* update minimum value allowed for some camera settings

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

* updates following review feedback, some small tidy-up

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

* update comment

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-06 14:22:57 +01:00
hultonha 6cc9a33845 Add a new implementation for cone/ray intersect to simplify code and fix issue with current implementation (#3902) 
* add a new implementation for cone/ray intersect to simplify and fix existing issue

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

* move new ray/cone intersection function to AzToolsFramework - repond to PR comments

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

* updates following PR feedback

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

* add additional comment to give more context to the intersection function

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

* update google test expect usage

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-06 11:36:17 +01:00
ANT\aljanru 73b9f1bb40 Removed comment for line 2021-09-06 11:42:39 +02:00
ANT\aljanru 3ca4a8c54a Removed SC connections that fail to compile for now 2021-09-06 00:25:58 +02:00
ANT\aljanru 44d2a9275f Blast tests 2021-09-05 23:37:55 +02:00
ANT\aljanru cdfaabc2ca Merge fix, removed editor preferences change by accident 2021-09-05 22:32:26 +02:00
ANT\aljanru 3023462644 Reorg script canvas files for px tests 2021-09-05 22:20:10 +02:00
ANT\aljanru 96c124b950 Reorg setreg files for physx tests 2021-09-05 22:20:08 +02:00
ANT\aljanru 0fb9bc160e Fixed console text color in batch mode 2021-09-05 22:20:06 +02:00
ANT\aljanru 4220c52330 Standarization: Python files 
Signed-off-by: ANT\aljanru <aljanru@amazon.co.uk>
 2021-09-05 22:19:57 +02:00
ANT\aljanru c33dd26ff9 Renamed Levels 
Signed-off-by: ANT\aljanru <aljanru@amazon.co.uk>
 2021-09-05 22:18:00 +02:00
Esteban Papp 761f90b5b9 Find file for renderdoc and better wiring 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 18:27:45 -07:00
Esteban Papp a63954d6cf simplifying how PIX is passed 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 18:26:59 -07:00
Esteban Papp e215dd4423 prevents 3rdParty that are not in the source tree from being installed 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 18:23:11 -07:00
Esteban Papp 9929782e86 Changes how renderdoc is added, since this is not a real 3rdParty we want to depend on but some functionality we want to enable/disable 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 17:32:37 -07:00
chcurran 4ed7feae5d Keep editor alive when not in focus 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-03 14:44:19 -07:00
chcurran e1e1779ec6 Fix for file size limit in JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-03 14:04:06 -07:00
hershey5045 15e889a2f6 Reintroduce materialtype dependency on fbx files. (#3934) 
Signed-off-by: Robin <rbarrand@amazon.com>

Co-authored-by: Robin <rbarrand@amazon.com>
 2021-09-03 13:51:15 -07:00
Esteban Papp 925bcee0db Create Deploy Script that can copy a Project Game Release Layout to a standalone location 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 13:28:22 -07:00
chiyenteng f7d4d80e5b Add prefab reparenting python auto tests (#3653) 
* Add prefab reparenting python auto tests

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

* modify prefab python auto test framework

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

* remove extra spaces

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

* delete unused files

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

* delete unused files

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

* fix nits

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

* Refactor prefab python tests

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

* Fix nits

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

* Modify comments

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

* Fix nits and add comments for Prefab.py

Signed-off-by: chiyteng <chiyteng@amazon.com>
 2021-09-03 14:06:22 -05:00
rgba16f [Amazon] 64a561a948 update revision of lz4 package used by o3de (#3911) 
* Update windows & android builtin lz4 package version

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update linux builtin packages to use the new lz4 vcpkg

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update Mac & iOS builtins to use the new lz4 vcpkg

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update MultiplayerCompression Gem LZ4Compressor to use the replacement for deprecated LZ4compressHC function

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-09-03 10:19:45 -07:00
AMZN-AlexOteiza 2ca03367bb Re-added removed xfails by accident (#3901) 
Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
 2021-09-03 18:32:15 +02:00
Esteban Papp bfdcf74ea0 PR comments/suggestions 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 09:10:47 -07:00
hultonha 5851031d2e Expose the ability to control manipulator line bounds (#3890) 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-03 10:14:03 +01:00
Esteban Papp 1aa7059d01 generates paks for release 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-02 18:24:49 -07:00
Esteban Papp 9a6a1ba97a fixes monolithic release 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-02 18:24:25 -07:00
chcurran c8ed6d287c Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-09-02 18:14:39 -07:00
chcurran f4dbeb6538 Fix list of manual inspection graphs 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 18:14:00 -07:00
chcurran e69a5bc092 fix progress bar for upgrades 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 17:44:52 -07:00
chcurran 3822f92882 fix manual inpsection window 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 17:32:53 -07:00
chcurran 6cc627a643 remove reference to old test 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 16:44:13 -07:00
chcurran a353005296 only track dependent assets with valid ids, as sanity check 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 16:43:07 -07:00
chcurran 9de22d5e54 Fix dependency errors after conversion to JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 16:39:04 -07:00
Esteban Papp dc4424b131 Merge branch 'development' into issues/3202 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h
 2021-09-02 14:23:47 -07:00
SJ daf901e809 Set target_file variable since it's still being used in Mac runtime dependencies cmake file (#3905) 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-09-02 14:16:13 -07:00
chcurran e7135832f6 remove unit tests with old style assets 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 13:56:31 -07:00
chcurran b5a32e1c4c remove temporay files in all cases 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-09-02 13:33:11 -07:00
Artur K 567c0ae24d Modernization + AZStd::function compare fix. (#3680) 
* Modernization + small fix.

Modernize ( `bool`/`override`/other) code in AzCore, AzFramework, AzQtComponents, AzToolsFramework, etc.
Replaced a `bind` or two, use `using` in a few places as well.

Fix nullptr comparison of AZStd::function.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply review-based changes

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-09-02 14:55:09 -05:00
Chris Galvan b3c8b0f5f3 Merge pull request #3889 from aws-lumberyard-dev/cgalvan/FixMacApplicationIcons 
Updated legacy Editor and Asset Processor icons on Mac to O3DE icons.
 2021-09-02 12:52:37 -05:00