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

110 Commits

Author SHA1 Message Date
Esteban Papp 2147b1d128 Merge branch 'development' into cmake/SPEC-7484 2021-08-10 14:30:07 -07:00
Esteban Papp ec1a08d487 Merge branch 'development' into cmake/SPEC-7484 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ConfigGroup.cpp
#	Code/Editor/ControlMRU.cpp
#	Code/Editor/CryEdit.cpp
#	Code/Editor/CryEdit.h
#	Code/Editor/IEditorImpl.cpp
#	Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
 2021-08-10 09:23:34 -07:00
John c2a2d1c5c7 Add changes from TIF/Feature branch. 
Signed-off-by: John <jonawals@amazon.com>
 2021-08-10 14:20:46 +01:00
John 7b0118268c Remove missing header from cmake. 
Signed-off-by: John <jonawals@amazon.com>
 2021-08-06 20:40:37 +01:00
John d7c1185dc2 Add previously approved changes. 
Signed-off-by: John <jonawals@amazon.com>
 2021-08-06 20:09:53 +01:00
Esteban Papp e28d04aea6 Merge branch 'development' into cmake/SPEC-7484 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
 2021-08-05 20:05:25 -07:00
Esteban Papp 9bab676109 enabling test impact framework tool build and fixed it 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-03 20:25:21 -07:00
Esteban Papp e28602dbbb linux fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-03 17:59:35 -07:00
pappeste 95914e3fd6 merging from development + fixing linux 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-27 19:32:07 -07:00
Esteban Papp da474357f3 Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361) 
* Some var cleanup so it shows better-organized in cmake-gui. Some vars were also not following the namign convention we are using
Removed some unnecessary messaging
Fixed a TIF bug where it would report the wrong test in a message, fixed a message that was being triggered
Changed TIF to be enabled just by the binary so running the ci_build scripts locally doesnt trigger TIF messaging
Removed `LY_ENABLE_MULTIPLAYER_COMPRESSION`, it was not being used

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* handling case where a parameter can be empty

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* needs to be var name, not contents

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-26 14:14:56 -07:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213) 
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
 2021-07-16 15:25:48 -07:00
jonawals 06c65be40a Add handling for integrity failures when applying and resolving change lists (#1993) 
* ApplyAndResoveChangeList integration failure policy

Signed-off-by: John <jonawals@amazon.com>

* Default integrity failure policy for TIAF sequences

Signed-off-by: John <jonawals@amazon.com>

* Fix superfluous quotation marks

Signed-off-by: John <jonawals@amazon.com>

* Remove superfluous args parse

Signed-off-by: John <jonawals@amazon.com>

* Fix broken storage of last commit hash

Signed-off-by: John <jonawals@amazon.com>
 2021-07-08 15:59:05 -05:00
John c5a4fd382d Address PR comments 2021-07-05 16:25:29 +01:00
John f86708a812 Fix run payload checking logic 2021-07-05 15:28:20 +01:00
John 2003d81aba Fix missing log call site 2021-07-05 15:05:17 +01:00
John b63468d95e Fix API comments 2021-07-05 14:58:42 +01:00
John 0d7d507889 Fix instrumented non-gtests treated as failures 2021-07-05 14:58:25 +01:00
Chris Galvan 40f9761f86 Fixed more copyright header issues caused by script replacement 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 16:21:26 -05:00
Chris Galvan b9e06e70d9 Fixed copyright header issues per new validator 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 15:34:04 -05:00
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 12:42:44 -05:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693) 
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
 2021-06-30 19:51:55 -07:00
Gene Walters 9814e9dc6c Adding missing o3de copyright headers 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 16:31:06 -07:00
Gene Walters 6fb2558e44 Merge branch 'upstream/development' into genewalt/gitflow_210628 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 15:40:46 -07:00
Gene Walters f905b71844 Adding missing o3de copyright headers 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 13:48:45 -07:00
John c145a9a74a Add missing files from addressing PR comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 19:46:21 +01:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
John 0e6a266e89 Remove frontend console tests 2021-06-16 11:47:17 +01:00
John 1cef72ab8d Fix uncommented tests 2021-06-10 17:32:16 +01:00
John af0bcb0636 Remove test files 2021-06-10 14:58:34 +01:00
John 169d4da288 Address PR comments 2021-06-10 14:54:46 +01:00
jonawals e2d601ad59 Merge branch 'TIF/Runtime' into TIF/Jenkins 2021-06-08 16:52:26 +01:00
jonawals dd93c42342 Fix missing keys 2021-06-08 16:49:49 +01:00
jonawals a9e6eaa57a Fix anon enum clash with uber files 2021-06-08 16:43:02 +01:00
jonawals 98670a21bc Fix missing copyright header 2021-06-08 15:42:49 +01:00
jonawals 656aa528d8 Implement new handling of tiaf seed data 2021-06-08 13:39:37 +01:00
jonawals 7a884c85b3 Address PR comments 2021-06-08 12:19:07 +01:00
jonawals 9e187d67a4 Fix typo with delete files filter 2021-06-08 12:08:42 +01:00
jonawals c9351f4d45 Make TestEngine clean up artifact dir before runs 2021-06-08 12:05:38 +01:00
jonawals e0f953cf6b Address PR comments 2021-06-08 11:59:06 +01:00
jonawals a56591fa12 Address PR comments 2021-06-07 18:38:54 +01:00
jonawals f603b08d05 Address PR comments 2021-06-07 18:37:20 +01:00
jonawals cc9e8a72e4 Fix coverage clear bug and other minor refactors 2021-06-07 17:45:48 +01:00
jonawals 796b5be286 Address PR comments 2021-06-07 15:32:17 +01:00
jonawals a0feeec608 Add console output to runtime 2021-06-07 10:56:07 +01:00
jonawals d341dab7f5 Address PR comments 2021-06-07 10:39:58 +01:00
jonawals 0da739ef18 Add curiously missing comments 2021-06-07 09:05:29 +01:00
jonawals 4ed0c7b1d8 Add drafting of failed tests 2021-06-07 08:52:20 +01:00
jonawals b00f569090 Address PR comments 2021-06-06 19:09:24 +01:00
jonawals ac42a9a748 Changes for read-only runs and new test suites 2021-06-04 19:33:26 +01:00