b4976ff9cb
Merge pull request #327 from aws-lumberyard-dev/JsonSerializationTypeIdBug
...
Typeid bug fix in Json Serialization.
5 years ago
518c6cb760
Merge pull request #385 from aws-lumberyard-dev/Atom/guthadam/ATOM-14003
...
ATOM-14003 adding image thumbnails to material inspector properties
5 years ago
f24e3b2891
Merge branch 'main' into hultonha_LYN-2315_camera-phase-2
5 years ago
5d53590434
Merge pull request #310 from aws-lumberyard-dev/hultonha_PR-37_follow-up
...
Updates following review feedback to PR-37
5 years ago
2dfe9942f2
Merge branch 'main' into JsonSerializationTypeIdBug
5 years ago
167b7f36a6
Merge pull request #373 from aws-lumberyard-dev/Atom/guthadam/ATOM-15370
...
ATOM-15370 Fix thumbnail scaling and sizing issues
5 years ago
cdce28115e
Merge pull request #387 from aws-lumberyard-dev/LYN-1932
...
Lyn 1932
5 years ago
11d39892d5
Fixing QString to QIcon conversion.
5 years ago
a30c952fa2
Deleting the EditorTransformComponentSelection switcher.
5 years ago
e05ab8bfb7
Merge branch 'main' into hultonha_LYN-2315_camera-phase-2
5 years ago
2aafdab5af
Added the new focus color.
5 years ago
bf95c706d8
Merge branch 'main' into LYN-1932
5 years ago
b7c2495911
Working base
5 years ago
d36a9470a3
Merge branch 'main' into hultonha_PR-37_follow-up
5 years ago
5cac07b4c1
ATOM-14003 adding image thumbnails to material inspector properties
...
https://jira.agscollab.com/browse/ATOM-14003
5 years ago
b758a1553f
GetTemplateIdFromFilePath now asserts if it's passed an absolute path. This is helpful for debugging, since the function would silently fail even if the file was actually loaded.
5 years ago
c07a7c3766
Detect and block instantiations that would generate circular dependencies in the instance hierarchy.
5 years ago
793d60f150
Merge main
5 years ago
1d093f9c29
Merge branch 'main' into Atom/guthadam/ATOM-15370
5 years ago
26604fd66c
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
06803040ac
Fixed an assert during loading a level with prefabs
5 years ago
eeafb5eaa3
ATOM-15370 Fix thumbnail scaling and sizing issues
...
TLDR
Thumbnails size will be removed from the system.
Each thumbnail class is responsible for determining its stored size.
Images and other thumbnail types can be scaled up or down within reason without blurring.
The thumbnail system uses the concept of context and size organize thumbnails by size based on their intended use. However, most of the thumbnail classes do not respect or use the specified size, which is 16 by 16 pixels and really only usable for small icons.
The thumbnails are currently being used in the asset browser tree control, the larger asset browser previews, the material component property asset controls, the material component inspector for the large preview, and other places. Each of these places use completely different sizes, some of which are large and change dynamically. Whenever the thumbnails are painted they are scaled to the desired size.
Material and mesh thumbnails were always being captured at 512x512 regardless of what the rest of the thumbnail system said. Source, product, and folder thumbnails would be stored at the original asset size. The loading movie thumbnail was always drawn at 16 by 16 and scale up so it was always blurry. Image thumbnails were always scaled down to 16 by 16 and scale up for larger previews.
Rather than worrying about the size of each context, each thumbnail class will store the image at whenever it deems to be a large enough size that can be scaled down when used.
This may eliminate the need for multiple thumbnail contexts which are not being used anyway.
https://jira.agscollab.com/browse/ATOM-15370
5 years ago
caa982372f
Remove include for removed interface in EditorPrefabComponent.cpp
5 years ago
797ee26f87
Remove EntityOutlinerWidgetInterface, and replace it with PrefabPublicNotificationBus. Introduce events to notify handlers of when instance propagation begins and ends so that widgets can refresh correctly.
5 years ago
64e06c3010
more updates to camera code
5 years ago
03e681ca5f
Merge from main
5 years ago
5f33337fec
Merge main
5 years ago
a00d47365e
Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585
...
[ATOM-14585] Enlarged thumbnails on hover
5 years ago
0f8e6cbda1
Fixed a Linux build error.
5 years ago
b113f09a71
first pass of changing transform to use float for scale internally rather than Vector3
5 years ago
1b946818a2
more tidy-up to CameraInput.cpp
5 years ago
80108fd848
Merge branch 'main' into hultonha_LYN-2315_camera-phase-2
5 years ago
d6ed9d100e
Merge branch 'main' into LYN-1767-AB
5 years ago
0acaac14d8
Merge branch 'main' into hultonha_PR-37_follow-up
5 years ago
0952b7bd87
update Cluster file name to ButtonGroup
5 years ago
fbb8727407
Merge branch 'main' into physx_ragdoll_create
5 years ago
0da9a05d87
Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher
5 years ago
56477b7cc7
merge from main and resolve conflicts
5 years ago
c898318377
updated camera changes
5 years ago
fdcb19f45a
Reverting some unused code
5 years ago
91f027a05c
PR feedback
5 years ago
6dfa33816b
Fixed a bug with type ids for inherited classes with a custom serializer.
...
The code that adds a $type field for pointers where needed was still assuming that custom serializer were always for primitives, which isn't the case anymore. This changes updates the behavior to allow $type to be added to those as well as long as they use an object. This does now however rely more heavily on earlier checks that the data needs a $type because it otherwise can't tell the difference between a primitive getting a default value (an empty object). In the original code this situation would have resulted in failed serialization though, so it's unlikely to be a problem.
5 years ago
44f1a627e7
Merge pull request #300 from aws-lumberyard-dev/Prefab/LYN-3100
...
KEYSTONE USE CASE | Save changes to non-root container entities in the link to the parent instance
5 years ago
c4e3c39ee2
PR feedback
5 years ago
15afcc341d
fixes and updates to CameraInput
5 years ago
5d2db78f74
[LYN-3272] Added missing call in unit test.
5 years ago
9d57095e1c
[LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API.
5 years ago
c85fbe86ba
Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher
5 years ago
9cf8070c9e
Styling and Review Feedback Changes
5 years ago
3f32cc929c
Fixed All Physics automated tests ( #129 )
...
* Fixed all Tests.
* Fixed tests stdout redirection
* Changed return code for failed tests to be 0xF
* Small improvements on automated testing code
* Created Periodic test suite and moved tests
* Made physics main to only have one test for now
* Renamed all tests to have leading AutomatedTesting::
5 years ago
051cc0bce2
Merge branch 'main' into LYN-1932
5 years ago
fbaa59f28f
updates following review feedback
5 years ago
f24ae99b3e
Merge branch 'main' into LYN-1767-AB
5 years ago
fc591e292e
tidy-up to some naming for types
5 years ago
a4b8db2f94
Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher
5 years ago
b27daeead5
updates to viewport ui switcher id and usage
5 years ago
0bcc85e4d8
scope pointer
5 years ago
30458bc1be
PR feedback
5 years ago
833ca2767d
Fix a bug with level save erasing link information on Instances. All changes to non-root container entities are now saved as patches in the link to the parent instance.
5 years ago
fb26308a26
Merge pull request #291 from aws-lumberyard-dev/Atom/guthadam/ATOM-15326
...
ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
5 years ago
9f4606c17a
Removing test code
5 years ago
b215d1c098
Enlarged thumbnails on hover
5 years ago
61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
...
Add newlines to the end of all files
5 years ago
16ca036ea8
Merge pull request #256 from aws-lumberyard-dev/amzn-mike/lyn-2249-disable-cancel
...
Disable Asset Load Cancellation
5 years ago
923f234d71
ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
...
This change adds support for streaming image thumbnails in the asset browser tree and thumbnail widget.
This is a prerequisite for displaying image previews inside of the material inspector.
https://jira.agscollab.com/browse/ATOM-15326
https://jira.agscollab.com/browse/ATOM-14003
5 years ago
28170ffe41
Add newlines to the end of all files
5 years ago
e772afa06e
Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
...
KEYSTONE USE CASE | Instantiate Prefab
5 years ago
d25179303d
Add jira ticket for disabled tests
5 years ago
c61b244416
Use a const to toggle asset cancellation on and off
5 years ago
540f0dcd98
Merge branch 'main' into non-uniform-scale-trackview
5 years ago
40655eba03
removing element-wise scale setters from transform bus
5 years ago
099f43237d
removing long deprecated transform scale functions
5 years ago
eae9d60c15
Pass position Vector3 as const reference in InstantiatePrefab.
5 years ago
a9af90be5a
Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments
5 years ago
09a0676b9c
Adding custom title to PropertyAssetCtrl
5 years ago
8f79379bc8
Fixes as per Ram's review
5 years ago
76739de282
Fix spacing
5 years ago
ea43eb3ac9
Set position of instantiated prefab
5 years ago
3b3b4305c1
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
c9a4b6f50b
Better handle the default case for Instantiate
5 years ago
17dbe55189
Added undo and redo support for nested prefab creation
5 years ago
9e2836613f
Merge branch 'main' into amzn-mike/lyn-2249-disable-cancel
5 years ago
58e8233c2c
Remove debug message
5 years ago
0428189bed
Increase test difficulty
5 years ago
39789c30d8
Remove container OnAssetCanceled event
5 years ago
35a47932eb
Disable weak references and unit tests for them.
5 years ago
38f0203546
Merge pull request #239 from aws-lumberyard-dev/ly-sdk/phistere/LaunchApFromSDK
...
Launch AssetProcessor from prebuilt SDK
- Look for AssetProcessor in a known SDK layout location if one in executable directory is not found.
- Adds more files to the CMake install to help fix some errors launching AP from SDK.
5 years ago
d680995074
Renamed several non-inclusive terms ( #236 )
5 years ago
1fa5728655
Merge pull request #69 from aws-lumberyard-dev/non-uniform-scale-mesh
...
support for non-uniform scale component with atom mesh component
5 years ago
3907ffc173
Add unit test
5 years ago
bd23944531
Fix issues with rapid asset cancellation / reload:
...
* Asset<T>::QueueLoad didn't trigger any loads in the case where an asset was in a Queued state, it simply returned the reference. This caused problems in the case where an asset was in the process of being cancelled and garbage collected, as it could be in a queued state with nothing actively loading it. The method now detects this case and calls GetAsset(), which triggers a new load.
* AssetContainer::IsValid() was returning true for canceled containers that no longer had a root asset. Now it returns false, to help ensure the container doesn't try to get reused.
* AssetContainer would add entries to the preloadList even if any potential preloads were filtered out from the load. They are no longer added, since they shouldn't be waiting for any dependent assets to load. (This could cause incorrect warnings to print in some situations)
* AssetContainer was erroneously warning about removing assets from a missing waiting list. The warning was removed, as the condition could occur when the same asset was being loading by two different containers - once with dependencies and once without.
* AssetDataStream::RequestCancel has been added, as it was missing, but nothing currently needs to use it.
* AssetManager::GetAssetContainer() now verifies that the container is valid before attempting to reuse it. This prevents asset containers that are in the middle of cancellation from getting reused.
5 years ago
cc4d69f279
Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher
5 years ago
cf4bbe569b
Remove Prefab cache undo node generation for container entities - will move that work to a separate PR.
5 years ago
dbcb2f9916
Added sys_assert level 3 which will make asserts to crash the application( #208 )
...
Co-authored-by: aljanru <aljanru@amazon.com>
5 years ago
93ba2ea251
LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace.
5 years ago
0e803713bf
Ragdoll now uses Add/Remove SimulatedBody
...
Addressed Minor Character PR feedback
5 years ago
ace7a64b24
Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK
5 years ago
0ebe6c6079
Setup Table model and Table view
5 years ago
5f0e7f2cbc
merge from main
5 years ago
67fa4a332b
Change CreateLink to return the LinkId
5 years ago
ca8d6f8818
Instantiate Prefab
5 years ago
8996976efb
Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
...
Fixed Lua IDE startup
5 years ago
49322b040b
Fixed Lua IDE startup
5 years ago
7a6b0c16b7
Merge pull request #206 from aws-lumberyard-dev/cgalvan/RemoveLegacyEditTools
...
[LYN-3105] Removed legacy CEditTool class and all sub-classes.
5 years ago
5061f39406
Merge branch 'main' into cgalvan/RemoveLegacyEditTools
5 years ago
5f8ffdfdc1
[LYN-3137] Fixed EMFX floating dock widgets not responding to docking events.
5 years ago
0efa1e7817
[LYN-3105] Removed legacy CEditTool class and all sub-classes.
5 years ago
70b4938cff
LYN-2524: Launch AP from SDK when not found in the executable directory
5 years ago
743d6a511a
Merge pull request #192 from aws-lumberyard-dev/physx_character_create
...
Character controller now uses Add/Remove Simulated Body API
5 years ago
0a09ab7c8e
Merge pull request #173 from aws-lumberyard-dev/MultiplayerPipeline
...
Merging current state of multiplayer pipeline to main
5 years ago
7ac246bab5
Character controller now uses Add/Remove Simulated Body
5 years ago
b0cb5a381b
Merge pull request #104 from aws-lumberyard-dev/fixed_LYN-2998_main
...
LYN-2998
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
fixed entities not being deselected when entering game mode in editor.
5 years ago
62a3b7635b
Merge branch 'main' into non-uniform-scale-mesh
5 years ago
bfa964a23e
Moved TabWidget grab animation to mouse press to match fancy docking behavior, fixed missed mouse up cursor restore
5 years ago
5f4275336c
Fixing deadlock related to thumbnails
...
Adding smoothing to thumbnails in AssetBrowser
5 years ago
e8cd122b86
Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
...
Cherry-pick viewport fixes to main
5 years ago
62bc7a66bb
Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. ( #149 )
...
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector
* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.
* Separate setting the prefab's template path and the container entity name.
* Disable reparenting to root level
* Disable the ability to rename the level entity.
* Fixes as per Ram's review
5 years ago
f8c5048b56
Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
...
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
5 years ago
4f9d7e3782
Simplify ResetInputChannels
5 years ago
5ea2240787
Fix editor controls working in game mode
...
-Implements ResetInputChannels for ViewportController API and SetEnabled for ViewportControllerList
-Disables all viewport controllers while in game mode
5 years ago
78892c8d7e
Improved a couple of comments
5 years ago
465546a6e4
Merge branch 'main' into MultiplayerPipeline
5 years ago
3df1ffe3b7
3rd Party static libraries need to be public dependencies to work from installed engine.
...
Merge pull request #168 from aws-lumberyard-dev/LYN-2588
5 years ago
6c65d5f666
Merge pull request #156 from aws-lumberyard-dev/mbalfour/behaviorcontext
...
Expose some helpful methods to BehaviorContext
5 years ago
f53c1e8084
3rd Party static libraries need to be public dependencies to work from installed engine.
5 years ago
f4a57663fa
Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
...
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
5 years ago
d9fe89ba56
Addressed feedback - made string& into a string_view.
5 years ago
3994d80c7e
Merge pull request #148 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15271
...
[ATOM-15271] Fixing thumbnail pixelation
5 years ago
12cbba5fad
adding test for Aabb::MultiplyByScale
5 years ago
b1d8330870
Review fixes.
5 years ago
e8459898a7
Exposed Quaternion::CreateFromEulerAnglesDegrees and Transform::Transform(Vector3, Quaternion, Vector3) to the behavior context to improve usability of these classes from scripts.
...
(cherry picked from commit 8156beb21181f9ff20972c8ea8be5e3dc61f1700)
5 years ago
33e61ad35b
Added SetEntityName and exposed Get/SetEntityName to the behavior context for use from scripts.
...
(cherry picked from commit 4f2e0b74727cfe99c74ed588769a540f24d7aa46)
5 years ago
cc937e0809
feedback from PR
5 years ago
fd8b42c45e
Merge branch 'main' into non-uniform-scale-mesh
5 years ago
f0ae8056c8
feedback from PR
5 years ago
7901fe8625
Reset the whole Qt model when an entry in the EditorEntityModel is removed. ( #48 ) ( #82 )
...
An optimization introduced in Prefab mode currently changes the relative ordering of children, causing stale QModelIndex variables to still be referenced and crash the Editor sporadically. This change is theoretically a bit slower, but still much faster than the pre-optimization times.
Co-authored-by: Shirang Jia <shiranj@amazon.com>
Co-authored-by: Shirang Jia <shiranj@amazon.com>
5 years ago
7e48bee48f
Fixing thumbnail pixelation
5 years ago
967d182ccc
Fixed a couple of typos
5 years ago
8d94f45b19
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
6abf17439a
Adding "Create New Material" context menu option to folder in Material Editor
...
Improving MaterialBrowser filter to show empty folders
5 years ago
707f7cb6ce
Added some comments
5 years ago
8bc2998d82
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
65b2d9de1b
Added couple of helper functions
5 years ago
7f169855f3
Merge branch 'main' into cgalvan/EntityHelperRefactor
5 years ago
f3ff5ec886
Add helper method for adding link in CreatePrefab
5 years ago
06d6ab9715
[LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback.
5 years ago
889158e3a9
A couple of minor fixes
5 years ago
9412078992
Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
...
"/Amazon/AzCore/Bootstrap/assets" key is set, then it would append that
value to the default asset platform value for the OS
5 years ago
2dbd9e4a05
Changed to use direct line drawing rather than adding svg.
5 years ago
1c151e6a75
Merge branch 'main' into LYN-1932
5 years ago
e497b7ac33
Merge branch 'main' into non-uniform-scale-mesh
5 years ago
7e85cdd045
Part 1 of changing colors to O3DE.
5 years ago
6d3b9e4f51
Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot
5 years ago
603ee5bf83
Updated the MergeSettingsToRegistry_AddRuntimeFilePaths to use the default asset platform associated with the OS, if the /Amazon/AzCore/Bootstrap/assets key isn't found in the settings registry
5 years ago
96ef349931
Update the AzFramework and AzCore cmake files to point at the new location of the PlatformDefaults.h and PlatformDefaults.cpp file
...
Added an inline namespace for the PlatformDefaults code to ease with aliasing it into the AzFramework namespace
5 years ago
bf2732a26d
Moved the PlatformDefaults files from AzFramework to AzCore
5 years ago
373f60f29c
Added a call to update the runtime file paths again after merging all Engine, Gem and Project Settings Registry in case they modified the asset platform key which is used for setting the project cache root
5 years ago
22d6e1ec0d
Modularized undo instannce update undo operation and enabled setting container entity to be selected
5 years ago
a6c7815685
SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile
5 years ago
6dadc84581
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot
5 years ago
10faddb113
Integrating github/staging through commit ef88e6e
5 years ago
beafc80939
Fixed entities not being deselected when entering game mode in editor.
...
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
jira: LYN-2998
5 years ago
405276a7ae
Merge pull request #37 from aws-lumberyard-dev/hultonha_LYN-2528_whitebox_prefab
...
Add Json serialization support for ByteStream
Fixes serialization issue with the White Box component when Prefabs are enabled.
5 years ago
a59e212134
Merge branch 'main' into MultiplayerPipeline
5 years ago
f6fc8f95a9
Fixed random button highlights & toolbar order.
5 years ago
2a339edc4e
[LY-105687]
...
Jira: LY-105687
https://jira.agscollab.com/browse/LY-105687
Renamed svg
5 years ago
2a53f018fa
Merge pull request #70 from aws-lumberyard-dev/physx_system_comp
...
SystemComponent is now only built once in the PhysX.Static target
5 years ago
102a0e5dc8
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
5 years ago
969f94ffb5
Initial pass of ViewportUiSwitcher.
5 years ago
fece27b1b0
Merge branch 'main' into LY-113714
5 years ago
a757d327a0
Merge branch 'main' into non-uniform-scale-visibility
5 years ago
bff55bd688
LYN-2726 Updated the Settings Registry Merge Utils logic to determine
...
the project root and engine root to fix issues with running the Editor
or AssetProcessor from within the project folder overriding the
project_path with the engine root bootstrap.cfg project_path entry
The order in which the project path is overridden as follows
1. The <engine-root>/bootstrap.cfg is first merged into the Settings
Registry. Any '/Amazon/AzCore/Bootstrap/project_path' would be used
if the following steps don't override that key.
2. Followed by general *.setreg/*.setregpatch files being merged into
the Settings Registry which can override the
'/Amazon/AzCore/Bootstrap/project_path' key
3. Next a project.json file searched upwards from the current executable
directory to determine the project path
4. Finally if a command line parameter that overrides the project path
is supplied it is used instead
5 years ago
1cf2e11cd3
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
0b29e4ffea
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
778d60bd0c
Replaced unique instance queue with checks in template to instance mapper
5 years ago
8074e0fb18
Remove formal template parameter name to resolve shadowed variable warning on clang
5 years ago
0ce18593d2
Merging latest main
5 years ago
c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components
5 years ago
4962218d29
Refactored root spawnable instantiation, added selective instantiation of root spawnable entities
5 years ago
76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs
...
Make creation of new prefabs use a relative path to the project
5 years ago
020d7801bb
Make sure Recent Files list is correctly enabled/disabled when the list changes ( #73 )
...
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
5 years ago
a5fdbddeda
Merged MultiplayerPipeline from CodeCommit
5 years ago
c63f09adce
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
4da29a09d2
Merge branch 'main' into Prefab/RelativePathForNewPrefabs
5 years ago
9d84fdcb23
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
5 years ago
3bbef11d15
Merge branch 'main' into non-uniform-scale-visibility
5 years ago
10ab7666db
Merge branch 'main' into limit_max_scale
5 years ago
23cf2d5d68
SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects.
5 years ago
7c5f7181eb
updates following review feedback - remove explicit resize and update concrete type to alias
5 years ago
4c582a2b0a
Merge branch 'main' into non-uniform-scale-mesh
5 years ago
d8169e08fb
merging from main
5 years ago
b6492121ca
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
2410d299c1
Make creation of new prefabs use a relative path to the project
5 years ago
88120999f9
Merge remote-tracking branch 'origin' into MultiplayerComponents
5 years ago
a371edd07f
Initial commit of CreatePrefab work
5 years ago
7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport
...
Switch on the Atom-native viewport by default
5 years ago
828bedf7a9
Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline
...
Fixed dangling pointer in InitializeCatalog
5 years ago
0f13a71bd2
[LYN-2255] Refactored some EditorEntityHelpers so they can be re-used.
5 years ago
90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD
5 years ago
bf0db7a3c6
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
5 years ago
217009de2b
adding tests for transforming Aabb with Matrix3x4 and fixing bug in implementation
5 years ago
efe5715e68
Merge branch 'main' into mbalfour/spec-6178
5 years ago
a947007861
Darken line
5 years ago
a7a22bfcc0
Merge branch 'main' into sceneapi_script_autotest
5 years ago
2fb2813b48
updating atom mesh component to support non-uniform scale component
5 years ago
59252235d5
Fixed dangling pointer in InitializeCatalog
5 years ago
9c8fd1f9e4
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
5 years ago
e1e746066d
add some preliminary tests for ByteStreamSerializer
5 years ago
2655aaa633
update ByteStreamSerializer to use Base64 encoding
5 years ago
ca3df5d6c8
Various bug fixes to get entity replication working
5 years ago
8469c9ca0a
Integrating github/staging through commit 5f214be
5 years ago
d7f10e9d60
[LYN-2878] Attempt to fix deadlocks that occur when the Editor loads surface tag assets.
...
I wasn't able to reproduce the deadlock, but from the reported callstack, the following lock inversion happens:
* EditorSurfaceDataSystemComponent::OnCatalogLoaded locked the AssetCatalogRequestBus mutex by calling EnumerateAssets, and then locked m_assetMutex inside GetAsset->FindOrCreateAsset inside the enumerate callback.
* Loading threads would lock m_assetMutex in AssetManager::ValidateAndRegisterAssetLoading, then lock the AssetCatalogRequestBus inside the Asset<T> copy constructor when calling UpdateDebugStatus when the constructor calls SetData->UpgradeAssetInfo->UpdateAssetInfo->AssetCatalogRequestBus::GetAssetInfoById
This should solve the lock inversion on both sides of the problem:
* UpdateDebugStatus now takes in a const ref instead of a copy, so the copy constructor isn't called.
* EditorSurfaceDataSystemComponent::OnCatalogLoaded is rewritten to call GetAsset outside of the enumeration call.
As a bonus, this also removes the blocking load call. The rest of the code already supports asynchronous refreshes as the list assets are added / modified / removed, so this code was changed to leverage the asynchronous refreshes as well.
5 years ago
f6e98d5014
Fix viewport context menu hiding cursor and sometimes popping up repeatedly
5 years ago
a71a5746cc
[LY-113714]
...
Jira: LY-113714
https://jira.agscollab.com/browse/LY-113714
5 years ago
063b8a6d54
update some reinterpret_cast calls to static_cast
5 years ago
8846e159e0
Add new ByteStream serializer to support storing binary data in json (for now)
5 years ago
90e52d69bc
fixing bug with subdivision level for runtime asset colliders and adding caching for collider aabbs
5 years ago
63c97d6d3c
Merge branch 'main' into sceneapi_script_autotest
5 years ago
77d06ecef7
ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty
...
* removed the script rule from the Editor, now will only be supported via a script or JSON manual edits
* Mesh Serialization - scriptProcessorRule doesn't save with field empty, but produces no error
* added a test to make sure Script Processor Rule operates with an empty filename
Jira: https://jira.agscollab.com/browse/ATOM-14889
Tests: Launched the Editor to removed the script rule from the Editor
5 years ago
cd12226849
Merge branch 'main' into github/staging
5 years ago
8ee92978f4
setting max value for scale
5 years ago
51f1183ff4
making scale gizmo apply uniform scale to transform
5 years ago
c5b955d281
Integrating github/staging through commit b0dd7ed
5 years ago
1044dc3da1
Integrating github/staging through commit ab87ed9
5 years ago
c2cbd430fe
Integrating up through commit 90f050496
5 years ago
39f53338bf
Merge branch 'main' into LoadPipelineFromGitHub
5 years ago
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
5 years ago
e8bbb5a0d5
Set scripts to be executable
...
This is required to build on linux/mac
5 years ago
75dc720198
Integrating latest 47acbe8
5 years ago
a10351f38d
Initial commit
5 years ago
AMZN-koppersr
Guthrie Adams
hultonha
Tom Hulton-Harrop
jjjoness
hasareej
igarri
guthadam
daimini
mnaumov
srikappa
AMZN-mnaumov
greerdv
amzn-sean
AMZN-daimini
Chris Galvan
AMZN-AlexOteiza
Chris Burel
amzn-mike
Eric Phister
Terry Michaels
greerdv
amzn-mike
mbalfour
phistere
Luis Sempé
luissemp
cgalvan
SergeyAMZN
sphrose
Nicholas Van Sickle
srikappa-amzn
pereslav
SJ
Mike Balfour
mcgarrah
Esteban Papp
alexpete
karlberg
kberg-amzn
jackalbe
jackalbe
Alex Peterson
Brian Herrera