birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,804 Commits 3 Branches 3 Tags
853cffbf7bcfde4ebdb9cab4fd4bc1cd2fa6f2c1
Commit Graph

6804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Esteban Papp b28349be73 Fixes for Android 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 15:36:48 -07:00
Esteban Papp 51fe681dbd address PR comments 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 15:21:32 -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
Esteban Papp ec8e6bcadf Fixes clang cases 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 13:27:31 -07:00
srikappa-amzn f6ce3678fa Used actual types instead of auto and some more minor changes 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-03 12:34:32 -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
Esteban Papp 6773af91bc fixes windows warnings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 11:11:28 -07:00
Esteban Papp e8495cf829 adds equivalent warnign for windows 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 11:11:04 -07:00
Esteban Papp 522e4bff9e Merge branch 'development' into cmake/warn_format_security 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	cmake/Platform/Common/Clang/Configurations_clang.cmake
 2021-09-03 11:10:40 -07: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
srikappa-amzn 8331b8dd8a Fix a compile error by changing to const instead of constexpr 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-03 01:34:32 -07:00
srikappa-amzn fbf92e9775 Merge branch 'development' into Prefab/SaveAllPrefabs 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-02 23:40:54 -07:00
srikappa-amzn 5a8998add1 Added function comments and nullptr checks 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-02 23:35:28 -07: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
srikappa-amzn 7e75559200 Removed unused Qt classes and do some more code clean up 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-02 17:26:32 -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
srikappa-amzn f6acf4321d Did a major refactor of ui to be less dependent on levels 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-02 15:37:29 -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
Esteban Papp 188f54fee0 Fixes Ninja non-multi config generator and potentially other non-multi config generators (#3867) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-02 08:56:29 -07:00
cgalvan d577702935 Updated legacy Editor and Asset Processor icons on Mac to O3DE icons. 
Signed-off-by: cgalvan <cgalvan1337@gmail.com>
 2021-09-02 09:39:15 -05:00
moraaar 34dc8e3cbc Fixed unused variable warnings (#3880) 
- Fixed error in iOS profile non-unity build error: unused variable 'INVALID_OFFSET'. The global variable is static const only visible to the cpp, removed since it's not used.
- Fixed error in windows release 'timeoutSeconds': unreferenced formal parameter

Signed-off-by: moraaar <moraaar@amazon.com>
 2021-09-02 13:15:14 +01:00