64e06c3010
more updates to camera code
2021-04-27 19:40:45 +01:00
03e681ca5f
Merge from main
2021-04-27 11:26:02 -07:00
5f33337fec
Merge main
2021-04-27 11:05:22 -07:00
a00d47365e
Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585
...
[ATOM-14585] Enlarged thumbnails on hover
2021-04-27 10:53:18 -07:00
0f8e6cbda1
Fixed a Linux build error.
2021-04-27 10:36:43 -07:00
b113f09a71
first pass of changing transform to use float for scale internally rather than Vector3
2021-04-27 18:12:46 +01:00
1b946818a2
more tidy-up to CameraInput.cpp
2021-04-27 13:58:17 +01:00
80108fd848
Merge branch 'main' into hultonha_LYN-2315_camera-phase-2
2021-04-27 13:13:53 +01:00
0acaac14d8
Merge branch 'main' into hultonha_PR-37_follow-up
2021-04-27 11:39:28 +01:00
0952b7bd87
update Cluster file name to ButtonGroup
2021-04-27 11:32:53 +01:00
fbb8727407
Merge branch 'main' into physx_ragdoll_create
2021-04-27 11:04:04 +01:00
0da9a05d87
Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher
2021-04-27 11:02:20 +01:00
56477b7cc7
merge from main and resolve conflicts
2021-04-27 10:58:35 +01:00
c898318377
updated camera changes
2021-04-27 10:30:07 +01:00
fdcb19f45a
Reverting some unused code
2021-04-26 17:48:49 -07:00
91f027a05c
PR feedback
2021-04-26 17:42:49 -07:00
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.
2021-04-26 15:26:18 -07:00
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
2021-04-26 13:20:35 -07:00
c4e3c39ee2
PR feedback
2021-04-26 12:44:51 -07:00
15afcc341d
fixes and updates to CameraInput
2021-04-26 19:46:57 +01:00
5d2db78f74
[LYN-3272] Added missing call in unit test.
2021-04-26 13:25:55 -05:00
9d57095e1c
[LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API.
2021-04-26 11:49:48 -05:00
c85fbe86ba
Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher
2021-04-26 17:30:51 +01:00
9cf8070c9e
Styling and Review Feedback Changes
2021-04-26 16:25:44 +01:00
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::
2021-04-26 15:25:34 +01:00
051cc0bce2
Merge branch 'main' into LYN-1932
2021-04-26 15:17:15 +01:00
fbaa59f28f
updates following review feedback
2021-04-26 15:03:29 +01:00
fc591e292e
tidy-up to some naming for types
2021-04-26 11:44:13 +01:00
a4b8db2f94
Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher
2021-04-26 11:01:48 +01:00
b27daeead5
updates to viewport ui switcher id and usage
2021-04-24 18:35:24 +01:00
0bcc85e4d8
scope pointer
2021-04-23 21:55:14 -07:00
30458bc1be
PR feedback
2021-04-23 21:40:27 -07:00
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.
2021-04-23 20:14:17 -07:00
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
2021-04-23 17:39:27 -05:00
9f4606c17a
Removing test code
2021-04-23 15:01:11 -07:00
b215d1c098
Enlarged thumbnails on hover
2021-04-23 14:56:28 -07:00
61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
...
Add newlines to the end of all files
2021-04-23 12:11:40 -07:00
16ca036ea8
Merge pull request #256 from aws-lumberyard-dev/amzn-mike/lyn-2249-disable-cancel
...
Disable Asset Load Cancellation
2021-04-23 13:10:56 -05:00
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
2021-04-23 13:07:20 -05:00
28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
e772afa06e
Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
...
KEYSTONE USE CASE | Instantiate Prefab
2021-04-23 09:23:31 -07:00
d25179303d
Add jira ticket for disabled tests
2021-04-23 10:50:58 -05:00
c61b244416
Use a const to toggle asset cancellation on and off
2021-04-23 09:56:59 -05:00
540f0dcd98
Merge branch 'main' into non-uniform-scale-trackview
2021-04-23 12:11:21 +01:00
40655eba03
removing element-wise scale setters from transform bus
2021-04-23 11:30:17 +01:00
099f43237d
removing long deprecated transform scale functions
2021-04-23 10:13:24 +01:00
eae9d60c15
Pass position Vector3 as const reference in InstantiatePrefab.
2021-04-22 23:36:29 -07:00
a9af90be5a
Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments
2021-04-22 17:01:29 -07:00
09a0676b9c
Adding custom title to PropertyAssetCtrl
2021-04-22 16:56:56 -07:00
8f79379bc8
Fixes as per Ram's review
2021-04-22 16:45:20 -07:00
hultonha
mnaumov
AMZN-mnaumov
AMZN-koppersr
greerdv
amzn-sean
AMZN-daimini
Chris Galvan
hasareej
AMZN-AlexOteiza
jjjoness
daimini
Guthrie Adams
Chris Burel
amzn-mike
guthadam
srikappa