pappeste a421b4cb71 Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948 ...

# Conflicts:
#	scripts/o3de.py

2021-05-26 09:06:49 -07:00

..

build

Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere

2021-05-25 23:48:55 -05:00

bundler

Fix shader list tool bug mixing positional and non-positional argparse flags

2021-04-29 11:19:45 -07:00

commit_validation

Remove legacy serialization and QPropertyTree (#684)

2021-05-11 09:31:02 -06:00

ctest

Caught KeyError and changed to log message. (#782)

2021-05-18 11:13:59 -07:00

detect_file_changes

Set scripts to be executable

2021-03-26 09:26:12 -07:00

o3de

Simplified the o3de package gem enable/disable logic

2021-05-26 04:46:16 -05:00

project_manager

Removed tool and server gem query functions from the ProjectManager projects.py script

2021-05-26 04:57:43 -05:00

scrubbing

Inclusive language edit

2021-05-25 12:59:24 -07:00

CMakeLists.txt

Updated the registration.py script register_engine_path function to add

2021-05-18 22:23:07 -05:00

o3de.bat

Surrouding the setting of the BASE_PATH within double quotes in the o3de.bat script. This allows to allow paths with spaces in it leading to the engine root directory to work properly when running the script

2021-05-26 10:40:47 -05:00

o3de.py

Adjusting o3de path to run from install (authored by @lumberyard-employee-dm)

2021-05-26 08:17:09 -07:00

o3de.sh

O3de updates restricted download (#229)

2021-05-10 12:03:36 -07:00