Commit Graph

2075 Commits (08c85a40bc0ea2a70cac232fb48f84f445a81708)

Author SHA1 Message Date
Artur K 08c85a40bc
Fix logic in ReadConnectionSettingsFromSettingsRegistry (#2825)
In case an asset platform setting is missing it was supposed to be set to a 'pc' value.
Instead it was set to an empty string.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
5 years ago
Terry Michaels 92a5fb6df2
Add a toggle to clear console every time ctrl+G is activated
LYN-3705 As a dev I want a toggle to clear console every time I hit ctrl+G
5 years ago
hultonha 6c7365918b
Fix a few issues in CCryEditDoc
Merge pull request #2846 from nemerle/cryedit_fixups_try2
5 years ago
hultonha 5640880aea
Changes to update where some viewport actions are called from (legacy removal)
Merge pull request #2828 from aws-lumberyard-dev/legacy_shortcut_update

This change removes code from CCryEditApp that no longer needs to be there
5 years ago
sphrose 126280bb93 Merge branch 'development' into LYN-3705-2 5 years ago
hultonha 1169c82b98
Make camera controller priority customizable (#2826)
* make 'should handle' logic customizable

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates to get priority function

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* minor comment tweak

Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
srikappa-amzn 7404622b48
Clear prefab templates on new level creations and loads (#2842)
* Clear prefab templates on new level creations and loads

Signed-off-by: srikappa-amzn <srikappa@amazon.com>

* Fixed failing prefab unit tests after change to clear templates

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
5 years ago
nemerle 627dcc49f1 GetActivePathName was using default - constructed enum DocumentEditingMode()
Also, SaveLevel was not using destName when constructing newFilePath

Other code changes:

* LogLoadTime is simplified by using QFile
* reduce nesting in DoSaveDocument by using early return.
* marked a few eligible methods as const
* Simplified OnEnvironmentPropertyChanged a bit

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
5 years ago
lumberyard-employee-dm 21ca3a4aea
The enable-gem command registers gem with project if not registered (#2817)
* The enable_gems command now registers the gem with the project if only registered with o3de_manifest.json

Updated the `enable_gems` command to register the gem with the project if the gem is not registered with either the project or the engine being used.
This allows the gem to be added to the build system if it wasn't registered before.

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

* Adding quoting around the invocation of the OpenProjectManager command

The --project-path parameter now is able to pass in a path with spaces
to the invocation of the Project Manager.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
moraaar dbb6c1ae46
Fixed EntitySpawnTicket move constructor (#2832)
Signed-off-by: moraaar <moraaar@amazon.com>
5 years ago
aaguilea c9e16c1c42 Erased some legacy function that are no longer necessary
Signed-off-by: aaguilea <aaguilea@amazon.com>
5 years ago
aaguilea d06ec45aaa changes to the move rotate and scale
Signed-off-by: aaguilea <aaguilea@amazon.com>
5 years ago
AMZN-AlexOteiza 45ebf57d3f
Fixed bug in hash_table that made rehash() function run forever (#2745)
* Fixed bug in hash_table that made rehash() function to run infinitely on specific conditions when inserting an already existing element

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Replaced erasing to happen in the source list instead

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* minor comment improvement

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Small commment improvement

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Small comment fix

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Added assert and fixed code with incorrect hashing

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* .

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Addressed PR comments, reverted to void* as it size_t hash is different

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Fixed build on linux

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Addressed PR comments

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
5 years ago
puvvadar 1e94bb8a76
Merge pull request #2754 from aws-lumberyard-dev/mp_connectionset_timeout
Add connection interface timeout config and remove Ctrl+G timer
5 years ago
Alex Peterson 38fd92a15a
Always display all gems in Gem Catalog (#2341)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
5 years ago
Chris Galvan eb94d5b7a0
Merge pull request #2717 from aws-lumberyard-dev/nvsickle/EditorCameraFOV
Ensure Editor FOV corrects on viewport resize
5 years ago
puvvadar 00470acc1c Add const to timeout enabled getter
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
AMZN-Phil 149833af56
Merge pull request #2401 from aws-lumberyard-dev/PM-logs-and-processcheck
Check for build process exit status and display log link in more cases.
5 years ago
AMZN-stankowi 6520c347e4
Disabling a flaky test (#2749) ContainerFilterTest_ContainersWithAndWithoutFiltering_Success
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
5 years ago
puvvadar 6964e4f7e9 Missed one variable rename
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
puvvadar 573fe425d7 Also rename some variables to match renamed timeout funcs
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
puvvadar 115f669679 Rename timeout functions for readability
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
puvvadar 07e2bea1fe Add connection interface timeout config and remove Ctrl+G timer
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
Jeremy Ong 2491620826
Merge pull request #2681 from aws-lumberyard-dev/rgba16f/UnInlineAzCoreJob
Move most AZ::Job function bodies out of the header
5 years ago
Esteban Papp d03c2c9977
Copy jinja/py files to the install folder (#2643)
* Copy jinja/py files to the install folder

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

* code review comment

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

* moving AzAutoGen to cmake folder and removing the header-only project

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Chris Galvan 32542fd84b
Merge pull request #1927 from aws-lumberyard-dev/GroupToggleSwitch
Created a toggle switch to enable and disable groups through the Edit Context
5 years ago
Chris Galvan 8f6fd3a327
Merge pull request #2713 from aws-lumberyard-dev/cgalvan/RemovedLegacyEditorIcons
Removed legacy ObjectIcons and shelve icons from Editor.
5 years ago
nvsickle 74498089c3 Ensure Editor FOV corrects on resize
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
AMZN-stankowi 9ee9730294
Automated test for scene files with and without python scripts running python incorrectly (#2373)
* Cleared m_scriptFilename between scene files.
This fixes a bug where a Python script file would be run on a scene file
that didn't have a script file set.
Added a general case version to SceneBuilderWorker.cpp, to make it easy
to mark all scene files as dirty.
Automated tests for this will come in a separate pull request.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Work in progress automated tests

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Python test done

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Sorted jobs work now. This may sort too aggressively, I'll remove the additional sorting after some testing.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Cleaned up test

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed stray '

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed temp code from test

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Command line help options for AP
Removed job sorting that wasn't actually sorting jobs

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Changed constant variable names to match coding standards

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
5 years ago
Chris Galvan 37c3f01771 Removed legacy ObjectIcons and shelve icons from Editor.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
lumberyard-employee-dm 8014475abf
Adding newline to the end of the new Job.cpp file
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
rgba16f 8088e6662a modify new jobs.cpp file to match AzCore standard of opening namespace AZ rather than prepend AZ:: to every function
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
5 years ago
rgba16f b5895bc09b Move most AZ::Job function bodies out of the header
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
5 years ago
Steve Pham b46a80be2c
Fix for Linux/Vulkan/Editor crash on startup
* Temporary fix for Linux/Vulkan/XCB where the swap chain is not ready to present until the resize is complete
* Fix invalid GUID from LinuxXcbConnectionManager

Signed-off-by: spham-amzn <spham@amazon.com>
5 years ago
lumberyard-employee-dm bb372f05cd
Fixed the emplace function implementations for stack and queue (#2657)
* Fixed the emplace function implementations for stack and queue

Cleaned up several functions in the stack, queue and priority_queue
classes that were non-standard or weren't needed.

Updated the "style" of the code to use more modern concepts: "typedef" ->
"using", empty constructor body -> default keyword.

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

* Replaced the custom implementations of AZStd stack, (proirity)queue

Theses classes now have a template alias to the standard library version
of the classes

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
Nicholas Van Sickle 70b3840288
Fix the home key popping up ImGui when it shouldn't. (#2620)
This disables WM_INPUT forwarding to the input system while in game mode and makes ImGui listen to the synthetic keyboard events from the viewport instead - these synthetic events go through Qt's event system, so will only show up when the viewport "sees" a home key press.

Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
srikappa-amzn c9301a8c94
Fix a bug in patching templates and improve error messaging (#2394)
* Fix a bug in patching templates and improve error messaging
* Fixed incorrect order of function arguments
* Fix build errors regarding c style strings and casting entity ids

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
5 years ago
moraaar 38b64466ec
Merge pull request #2528 from aws-lumberyard-dev/ibtehajn/rigid_body_axis_locking
Implement axis locking options for rigid bodies

Signed-off-by: moraaar <moraaar@amazon.com>
5 years ago
chcurran eefc448dce remove stack tracer change and attempt to restore SC tests
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran 6dc750815b Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 5 years ago
Esteban Papp f0cafd0e9d
Create RUN target as helpers for the project-centric workflow (#2520)
* Create RUN target as helpers for the project-centric workflow

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

* typo fix

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

* rename target as "<target>.Imported" and create "<target>" as the metatarget that is used for debugging and building in o3de

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
lumberyard-employee-dm 055df37482
Register show command fix (#2408)
* Updated print_registration functions to fix "register-show" command

Added unit test to validate the argparse options to the register show
command.

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

* Updated the register.py script to once again register an engine list

Previosly each engine were registered into a dictionary with multiple
keys, but once the engine.json started to self describe the registered
content that came with it, it was reduced to a single 'path' key.
Therefore it has been changed to a list to be consistent with other o3de
object paths

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

* Updated the SettingsRegistryMergeUtitls Code which parses the attempts to locate the engine path associated associated with the project.json engine key to check the 'engines_path' object within the o3de_manifest.json

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

* Updated print registration unit test to patch the get_project_path

This is to make sure that the existence of the placeholder project path
isn't validated when running the test

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

* Typo and formatting fixes for the print_registration script

Also corrected indentation in unit_test_print_registration script

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
chcurran 15d6ca3252 abandon attepts to enable script canvas tests on the farm
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran d300f4b033 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 5 years ago
Esteban Papp 433aec4f34
Disabling this since the fast checkup in VS doesnt solve what this was hoping to solve, we need to emit and add as dependencies all the includes involved in autogen (#2383)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Jakub Wlodek a7b613d388
Fixing typos in comments in AffineParts.h file (#2407)
Signed-off-by: jwlodek <jakub.wlodek@stonybrook.edu>
5 years ago
Ibtehaj Nadeem 16869d56f3 Use regular comment
The Doxygen comment would only apply to the first field in each group.

Signed-off-by: Ibtehaj Nadeem <81370835+ibtehajn@users.noreply.github.com>
5 years ago
ibtehajn fd07f907bc Implement axis locking options for rigid bodies
Linear and angular motion of rigid bodies can now be restricted along
specific world-space axes.

Signed-off-by: Ibtehaj Nadeem <81370835+ibtehajn@users.noreply.github.com>
5 years ago
chcurran 0cfac06c69 making azcore tests serialized as a sanity check only on non android
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran 2174f8415a making azcore tests serialized as a sanity check
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago