Commit Graph

18 Commits

Author SHA1 Message Date
Esteban Papp 5c0ba0253d git.ignore cleanup (#6760)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-10 10:01:17 -08:00
John 7fa80ee501 Merge commit '99d0c39273fed3742acffa0fafd07038e5ef4b25' into jonawals/gitflow_211125_o3de 2021-11-25 10:22:55 +00:00
lumberyard-employee-dm 99d0c39273 O3DE.exe Project-Centric "Open Editor" fix (#5852)
* The O3DE.exe Open Editor button now attempts to open the Editor in the
build directory of the project being opened.

If their is no Editor within the build directory of the Project, it uses
the Editor.exe in the current O3DE.exe executable directory if it exists

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

* Engine .gitignore now ignores the build directory if placed in the
AutomatedTesting project

Previously it was just ignoring a `[Bb]uild` directory if it was
directly within the engine root.
This change matches the behavior of the project templates.

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

* Renamed the ProjectUtils GetEditorDirectory function to
GetEditorExecutablePath

Added a platform specific implementation for retrieving the path to the
Editor executable in the GetEditorExectuablePath function.

It first attempts to locate the Editor via checking the project build
directory for an Editor executable before falling back to checking the
binary directory of the currently running O3DE executable.

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

* Correct the MacOS GetEditorExecutablePath to return the Editor path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-23 18:25:00 -06:00
Brian Herrera 2206d2d8f1 Add restricted folder to gitignore
Signed-off-by: brianherrera <briher@amazon.com>
2021-11-05 13:12:38 -07:00
Esteban Papp b7291cf740 adding ignore rule in AP for install folder and making exclusion rule in gitignore to match the one of build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-01 08:45:22 -07:00
Jeremy Ong 4a05d6f7ec Add CMakeUserPresets.json file to gitignore
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-25 14:06:47 -06:00
chcurran 8571e71d93 Add JSON serializer support for the Lua component properties
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-09 15:42:55 -07:00
kberg-amzn 3bb62ca3f7 Merge pull request #2315 from aws-lumberyard-dev/MultiplayerWeapons
Multiplayer weapons
2021-07-21 17:37:21 -07:00
L4stR1t3s 9596aa0ddf Added .vs/ (Visual Studio cache when using CMake builds instead of solutions) and out/. (Visuql Studio uses this as default build directory when opening a folder with a CMakeLists.txt and immediately creates it) to .gitignore. (#2306)
Signed-off-by: L4stR1t3s <frederik.decaster@gmail.com>
2021-07-21 15:07:24 -07:00
kberg-amzn bd5226aac5 Changes to fix rewindable attributes incorrectly used on read-only archetype data, fix some bad logic in the pre-render blending code, adding a serializer for AZ::Transform, and adding our client.cfg and server.cfg files to .gitignore
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-07-07 10:41:44 -07:00
lumberyard-employee-dm 59934e6be1 Updating the ProjectManager code and scripts with new layout of the o3de package scripts 2021-05-26 00:23:21 -05:00
lumberyard-employee-dm 911ad84e53 Updating the exclusion rule for the install folder to only include an install folder at the root of the repo 2021-05-23 23:26:31 -05:00
pappeste 412bf67772 changing the default prefix (install path) to be <source_dir>/install to workaround the "build/*" filter in the AP
This is also better since we support installing different configuraitons/platforms in the same prefix
2021-05-05 12:08:55 -07:00
evanchia 77d40cbd84 updating gitignore for python packages 2021-04-23 09:27:59 -07:00
qingtao fa7f61cf0d ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
- Added pause/resume button to ImGui Profiler to pause/resume profiling
- Added showing pass execution timeline
- Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult.
- Update some functions names in Pass.
- Stop showing accumulated time for ParentPass.
- Fixed a crash issue with ImGuiManager which doesn't have default font.
2021-04-14 22:48:46 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00