birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,205 Commits 3 Branches 3 Tags
57499860e0244c9e49e55d086ce94de5e4fedf58
Commit Graph

2698 Commits

Author SHA1 Message Date
Esteban Papp cbfdf99a9e More github cleanup 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-03 17:59:09 -07:00
puvvadar 1e94bb8a76 Merge pull request #2754 from aws-lumberyard-dev/mp_connectionset_timeout 
Add connection interface timeout config and remove Ctrl+G timer
 2021-08-03 13:47:52 -07:00
kberg-amzn 976654e809 Merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-08-03 13:15:59 -07:00
kberg-amzn e0d0bbfdae Changes to desync debug output to make it less stressful on bandwidth and the server, as well as some fixes to corrections on the local client 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-08-03 13:12:37 -07:00
Esteban Papp 928c8ff16c add unit tests 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-03 10:50:58 -07:00
Esteban Papp 963cbcaf61 Remove A version of some fw declarations and macro defines since those are error prone to define, if someone were to include windows.h after that header, it would cause issues 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-03 10:31:43 -07:00
puvvadar 00470acc1c Add const to timeout enabled getter 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-08-03 09:36:39 -07:00
AMZN-stankowi 6520c347e4 Disabling a flaky test (#2749) ContainerFilterTest_ContainersWithAndWithoutFiltering_Success 
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
 2021-08-03 08:00:39 -07:00
puvvadar 6964e4f7e9 Missed one variable rename 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-08-02 20:35:44 -07:00
puvvadar 573fe425d7 Also rename some variables to match renamed timeout funcs 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-08-02 20:34:39 -07:00
puvvadar 115f669679 Rename timeout functions for readability 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-08-02 20:31:02 -07:00
Esteban Papp dd3f0b86e0 Merge branch 'development' into cmake/SPEC-7484 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ToolBox.cpp
 2021-08-02 18:45:25 -07:00
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-02 18:03:04 -07:00
puvvadar 07e2bea1fe Add connection interface timeout config and remove Ctrl+G timer 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-08-02 17:41:09 -07:00
Esteban Papp 061cb98f74 auto-search/replace 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-02 16:07:23 -07:00
Jeremy Ong 2491620826 Merge pull request #2681 from aws-lumberyard-dev/rgba16f/UnInlineAzCoreJob 
Move most AZ::Job function bodies out of the header
 2021-08-02 16:22:09 -06:00
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>
 2021-08-02 13:53:13 -07:00
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
 2021-08-02 15:46:45 -05:00
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>
 2021-08-02 11:28:04 -05:00
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>
 2021-08-02 11:15:49 -05:00
igarri a241eb8e1c Added Sensible default 
Signed-off-by: igarri <igarri@amazon.com>
 2021-08-02 11:18:24 +01:00
igarri 7f9c6df67b Merge branch 'develop' into LYN-4700 
Signed-off-by: igarri <igarri@amazon.com>
 2021-08-02 09:27:21 +01:00
rgba16f b5895bc09b Move most AZ::Job function bodies out of the header 
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-07-31 19:18:58 -05:00
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>
 2021-07-31 08:42:02 -07:00
Esteban Papp f665f572f3 Gems/Atom builds 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-30 18:53:50 -07:00
Esteban Papp 1b4c06d03d other Framework fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-30 17:38:46 -07:00
Esteban Papp 3f6335dc32 Fixes for AzQtComponents 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-30 17:34:14 -07:00
Esteban Papp 63445e107a fxies for AzFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-30 17:33:50 -07:00
Esteban Papp c5dcef180c fixes/improvements to AzCore 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-30 17:30:11 -07:00
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>
 2021-07-30 18:20:21 -05:00
Esteban Papp 0ea11294ab fixes for crcfix 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-30 12:29:06 -07:00
Esteban Papp 015424eb35 Conversion to unicode, everything except StreamerConfiguration 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-30 11:51:21 -07:00
Esteban Papp b86349c3bf Some fixes for AzCore 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-29 15:50:39 -07:00
Esteban Papp 56eda61828 remove of UNICODE/_UNICODE 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-29 15:49:44 -07:00
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>
 2021-07-29 12:04:04 -07:00
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>
 2021-07-29 12:07:50 +01:00
chcurran eefc448dce remove stack tracer change and attempt to restore SC tests 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-28 17:48:11 -07:00
chcurran 6dc750815b Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-07-28 17:09:08 -07:00
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>
 2021-07-28 16:21:37 -05:00
chcurran 15d6ca3252 abandon attepts to enable script canvas tests on the farm 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-28 11:51:21 -07:00
chcurran d300f4b033 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-07-28 11:49:43 -07:00
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>
 2021-07-28 09:25:31 -07:00
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>
 2021-07-28 14:09:26 +01:00
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>
 2021-07-28 13:39:32 +01:00
pappeste 909384bd34 Code/Framework compiling 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-27 19:29:02 -07:00
pappeste ceab4a794c CryEngine compiles 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-07-27 19:28:56 -07:00
chcurran 0cfac06c69 making azcore tests serialized as a sanity check only on non android 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-27 18:55:40 -07:00
chcurran 2174f8415a making azcore tests serialized as a sanity check 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-27 18:32:00 -07:00
chcurran 055915ec4f merge from latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-27 15:51:35 -07:00
AMZN-koppersr bbf537b34a Merge pull request #2225 from aws-lumberyard-dev/rapidjson-natvis 
Adding rapidjson.natvis file to the AzCore project to Visualizers to VS
 2021-07-27 15:48:51 -07:00