birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,882 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 '8116e239f4'
${ noResults }
Commit Graph

76 Commits (8116e239f4cd3ba5ec320d2dfd9ea752c57809fc)

Author SHA1 Message Date
Royal OBrien 1061e17b36
Merge pull request #2112 from AMZN-scspaldi/scspaldi_cleanupLuaWindow 
Added Lua Editor window to kill process list.
 5 years ago
Sean Sweeney 9e81cedf80
Merge pull request #1979 from aws-lumberyard-dev/system_test_example_update 
System test example update
 5 years ago
evanchia 12a8cc7cd7 Removing deleted test from CMakeLists and updated in line comments for sample test 
Signed-off-by: evanchia <evanchia@amazon.com>
 5 years ago
scspaldi 6d2fbacda5 Added Lua Editor window to kill process list. 
Signed-off-by: scspaldi <scspaldi@amazon.com>
 5 years ago
Cynthia Lin eb9304c28d
Preparation for automated benchmarks (#1923) 
* ly_test_tools: Add filebeat_client module from o3de-mars.

Slightly modified with default parameters and exceptions in order to act as an individual component.

Signed-off-by: Cynthia Lin <cyntlin@amazon.com>

* scripts: Remove timestamp_aggregator.py to prepare for moving into ASV automated test repository.

Signed-off-by: Cynthia Lin <cyntlin@amazon.com>
 5 years ago
evanchia ca29b95371 Merge branch 'development' into system_test_example_update 5 years ago
evanchia bc7e12278c changed nullrenderer arg for sanity test 
Signed-off-by: evanchia <evanchia@amazon.com>
 5 years ago
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 5 years ago
evanchia 9067fc3b99 Updating/Removing LyTestTools sample tests 
Signed-off-by: evanchia <evanchia@amazon.com>
 5 years ago
evanchia 6308d01456 Minor changes to system example test to match docs 
Signed-off-by: evanchia <evanchia@amazon.com>
 5 years ago
nvsickle dee591921e Fix exception bubble-up 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 5 years ago
nvsickle 3549e5b946 More fussing with logs 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 5 years ago
nvsickle 3ee15f1912 Try to get some actual log output out of this 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 5 years ago
hultonha 2ea9bfb144 merge stabilization/2106 into development 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 5 years ago
lumberyard-employee-dm b11cd2d17f
O3DE License Scan Updates (#1808) 
* Removing Tools/Redistributable folder
None of the files within it are used by O3DE or are needed for
distribution at all

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing the GetGlyphRangesJapanese function from imgui_draw.cpp

That function is licensed under the
Creative Commons Attribution-ShareAlike 2.1 Japan (CC BY-SA 2.1 JP)

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 5 years ago
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 5 years ago
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>
 5 years ago
amzn-hdoke be519bb36a
Allow overriding of AWSAttribution settings to skip consent dialog for automated testing (#1650) 
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
 5 years ago
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 5 years ago
Terry Michaels 149863c527
Removed Amazon as Company for QSettings (#1649) 
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
 5 years ago
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago
Terry Michaels 7a2a2dc0d7
Updated branding for application names (#1617) 5 years ago
evanchia-ly-sdets e9e740e355
Merge pull request #1527 from aws-lumberyard-dev/linux_sanity_fix 
fixing linux sanity tests
 5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
Nicholas Van Sickle b032177418
Merge pull request #1443 from aws-lumberyard-dev/nvsickle/MergeStabilizationJun18 
Merge stabilization/2106 into development
 5 years ago
evanchia-ly-sdets 989178d285
Merge pull request #1377 from aws-lumberyard-dev/test_tools_example_test 
Fixing test tools example test
 5 years ago
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 5 years ago
evanchia 3310110b9a Fixing test tools example test 5 years ago
evanchia cf7f1defeb added warning message 5 years ago
evanchia 017845e285 fixing project() func to read project.json 5 years ago
evanchia 009e96d601 fixing ly_test_tools function and unit tests 5 years ago
evanchia 1f31bac640 fixing linux sanity tests 5 years ago
sharmajs-amzn b24c83122e
fixes for missing dependency tests (#1141) 5 years ago
Sean Sweeney 371a2f71ca
Merge pull request #972 from aws-lumberyard-dev/LyttFindExternal 
Tests search for external project definition relative to build directory
 5 years ago
Terry Michaels 9b1be43367
Renamed osx_gl to mac and es3 to android for cache folders (#949) 5 years ago
sweeneys 79d66dd492 Search for external project definition before searching for internal projects 5 years ago
amzn-sj d369912727 Merge branch 'main' into LYN-2461 5 years ago
sharmajs-amzn 44ec0211a0
fixes for missing dependency test (#850) 5 years ago
amzn-sj b63f2449c9 Remove reference to deleted function 5 years ago
amzn-sj 268fd8b714 Remove bootstrap.cfg and references to it. 5 years ago
sweeneys 9141221843 Reduce AP race conditions and fix minor bugs 5 years ago
bosnichd 4aff32e719
More red code (#732) 
Remove:
- Code/CryEngine/CryCommon/Platform
- Some unused Code/CryEngine/CryCommon/Mock files
- Code/Tools/CryXML and almost all of Code/Tools/CryCommonTools
- Code/Tools/TestBed/ResourceCompilerImage
- Tools/DeepBandwidthToExcel
- Various .p4ignore files
 5 years ago
SSpalding 67c3801d73
Log monitor encoding fix (#729) 
Fixed log monitor encoding bug.
 5 years ago
jromnoa d26c4614ba add unit tests for WinGenericLauncher class 5 years ago
jromnoa a1b4844f6a Merge branch 'main' into Atom/jromnoa/SPEC-6728-fix-material-editor-launcher 5 years ago
jromnoa 757a26825a adds new HOST_OS_GENERIC_EXECUTABLE constant and adds error handling if the executable doesn't exist in the path provided 5 years ago
jromnoa 5885899497 fix tabbing, add WinGenericLauncher class import to ly_test_tools.launchers.__init__ 5 years ago
jromnoa 8766790f48 re-add WinGenericLauncher for custom .exe launchers instead of the hard-coded ones (i.e. able to use 'MaterialEditor.exe' instead of 'Editor.exe' for a WinLauncher class) 5 years ago
evanchia b6890eef5c removed debugging text 5 years ago
evanchia fc03734b41 Fixes dedicated servers in LyTestTools 5 years ago