birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,122 Commits 3 Branches 3 Tags
development
Commit Graph

4529 Commits

Author SHA1 Message Date
John Jones-Steele 9e7d5fe52b Test the Terrain World configuration changes when parameters are chan… (#6063) 
* Test the Terrain World configuration changes when parameters are changed in the component

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Before merge

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Before merge 2

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Change from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Change before merge

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Change before merge 2

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Change before merge 3

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Change after merge to fix conflicts

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fix merge conflict

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fix merge conflict

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* CHanges from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-12-08 14:09:56 +00:00
nggieber c7893e0386 Remove unecessary change to CMakeLists.txt 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-08 05:54:41 -08:00
nggieber 28e5e8b217 Fix Project Built Tests 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-08 05:43:10 -08:00
Andre Mitchell 8b1e14cc7e Prevent some slice-related commands from being enabled when the slice editor is not. 
Fixes o3de/o3de#6198

Fixes an additional menu option that was visible (Resave all slices)

Signed-off-by: Andre Mitchell <andre.mitchell@bytesofpi.com>
 2021-12-08 08:29:41 -05:00
Tom Hulton-Harrop b54215552c Prevent the camera from easily being set to an invalid orientation (#6203) 
* add temporary debug logging

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* improvement for box select sometimes getting stuck on

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add temporary debug logging

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* improvement for box select sometimes getting stuck on

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove temporary logging

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fixes for camera pitch issues

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* missed file with camera pitch fixes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove debug logs

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add some tests for new pitch constraint updates

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-08 09:42:40 +00:00
Tobias Alexander Franke 363007363a In the entity outliner search box, the matching results are not expanded and displayed 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-08 09:02:05 +00:00
Esteban Papp 3dd8a60034 Merge branch 'development' into memory/benchmarks 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-07 18:44:03 -08:00
Esteban Papp f96a466212 WIP trying to use SystemAllocator instead of raw reads 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-07 17:58:49 -08:00
Chris Galvan a8ef23e4ae Merge pull request #6232 from aws-lumberyard-dev/cgalvan/ReadOnlyPrefabWorkflowChanges 
Some read-only prefab workflow updates.
 2021-12-07 19:38:54 -06:00
Danilo Aimini 3a7d9f9b3a LYN-8633 | Read-Only Entities - Entity Outliner behavior changes (#6230) 
* Add invalid entityId check to IsReadOnly

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Ensure read-only entities editing is limited (no renaming, limited drag/drop, no asset drop on them)

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Removing redundant class definition in wrong namespace.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-07 16:58:29 -08:00
Gene Walters f97707a28a Removing hand-written /n from all AZLOG_ now that we properly add \n automatically 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-12-07 16:14:08 -08:00
Esteban Papp da5ec1f478 Merge branch 'development' into memory/benchmarks 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-07 15:47:29 -08:00
lsemp3d 72bfd8bdf8 Script Canvas node translation system and naming consistency 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-12-07 15:40:04 -08:00
Chris Galvan 6532c50c27 Some read-only prefab workflow updates. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-07 17:22:10 -06:00
Gene Walters b123379380 Properly adding newlines when using LogInternalV; removing the need of hand-placed newlines to AZ_LOG 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-12-07 14:53:59 -08:00
Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/azcore_files.cmake
#	Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif
 2021-12-07 13:31:55 -08:00
Esteban Papp cd5306febf Merging from development 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-07 12:35:41 -08:00
Nicholas Van Sickle 3d8664ee92 Merge pull request #5511 from aws-lumberyard-dev/nvsickle/GenericDomJson 
Generic DOM: Add DomBackend abstraction and JSON support
 2021-12-07 11:20:53 -08:00
amzn-mike 7c96bc4f1f Fix loaded procprefabs not going through the asset hint fixup process… (#6077) 
* Fix loaded procprefabs not going through the asset hint fixup process for all versions of LoadInstanceFromPrefabDom.

Fixes procprefab asset references not working when pressing Ctrl+G in the editor

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add unit test

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-07 13:00:47 -06:00
Alex Peterson 3405cee2ef GUI for engine force registration and renaming (#6184) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-07 10:46:30 -08:00
carlitosan 4b97f7bac2 Merge pull request #5296 from aws-lumberyard-dev/sc-editor-asset-redux 
Sc editor asset redux
 2021-12-07 09:15:52 -08:00
Tobias Alexander Franke a2fec5c367 keyword bug fixed 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-07 10:32:11 +00:00
Esteban Papp 4b07665496 Removes Heap allocator from being possible to use as a SystemAllocator since it doesnt allow dynamic allocating (only works with pre-allocated blocks) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-06 18:35:39 -08:00
Esteban Papp cf9aab9911 Adds recording functionality (disabled) and a benchmark that can run recordings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-06 18:34:52 -08:00
Nicholas Van Sickle 6cf805256b Make backend write API string-based 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-06 15:55:35 -08:00
Danilo Aimini 6e0ac97f13 Merge pull request #6178 from aws-lumberyard-dev/daimini/gitflow_211206_o3de 
Merged `stabilization/2111RTE` to `development`
 2021-12-06 15:51:01 -08:00
Allen Jackson dae25beef5 {lyn2264} Adding Python API for Actor Group (#6064) 
* {lyn2264} Adding Python API for Actor Group

* updating the IBoneData with behavior attributes
* adding actor_group.py for making actor group JSON data
* adding physics_data.py for making physics JSON data

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* fixing dictionary issues

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* updated comment style to numpydoc

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* updated to numpydoc style

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* example of actor group rules

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* Updated based on feedback

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2021-12-06 17:11:30 -06:00
Danilo Aimini efe63f3e95 Merge commit 'c5615f812ccc9d235747a1c5ba396ac2e9a23690' into daimini/gitflow_211206_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
#	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
#	Code/Framework/AzToolsFramework/Tests/UI/EntityOutlinerTests.cpp
 2021-12-06 13:14:14 -08:00
Chris Galvan d04f4d238c Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/ReadOnlyViewportChanges 2021-12-06 14:24:19 -06:00
carlitosan 15e26b7515 merge development 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 12:21:45 -08:00
Chris Galvan 10e95cd863 Updated logic to use AZStd::erase_if 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-06 14:21:00 -06:00
Danilo Aimini 476e66d902 LYN-8631 + LYN-8632 | Display appropriate read-only icons and procedural prefabs ui in the Outliner (#6160) 
* First step of procedural prefab styling and read-only registration.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* WIP - Introduce read-only handler for procedural prefabs (not hooked up)

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce read-only entity interface, handler and unit tests.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce temp read-only icon, use new icon hierarchy in Outliner.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Switch from a push paradigm to a pull paradigm - handlers get to implement logic to determine if an entity should be read-only. This allows multiple systems to weigh into whether an entity is read-only.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fixed to missing call in test

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Post-rebase fixes to class name changes

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Display a lock icon on top of the entity icon in the Entity Outliner. This icon is added programmatically, which prevents having to alter all Outliner icons and future-proofs this functionality.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor style changes to procedural prefabs in the Outliner (use white icon)

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Ensure cache is refreshed when the handler is created, and also whenever the focus changes.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove Procedural Prefab setreg that was added in the wrong place

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove redundant function

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix spacing issue caused by rebase

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Change tooltip so that it accurately says "inspect" instead of "edit" for procedural prefabs.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Address minor styling issues mentioned in PR.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-06 12:16:16 -08:00
Gene Walters 9ae3da7acd Merge branch 'upstream/development' into LYN-8514_AutomatedReviewServerLogChecks 2021-12-06 11:30:12 -08:00
Nicholas Van Sickle ea9d7c9d82 Add optional size parameter to ReadFromBufferInPlace 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-06 10:45:45 -08:00
Chris Galvan e24323660b Fixed typo. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-06 12:44:52 -06:00
Nicholas Van Sickle 1c42cd98cc Address a bit more review feedback 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-06 10:31:35 -08:00
Chris Galvan 1f279ca713 Updated viewport to hide the transform maniuplators for entities marked as read only. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-06 12:19:02 -06:00
Chris Galvan d583256b17 Merge pull request #6144 from aws-lumberyard-dev/cgalvan/ReadOnlyEntityInspectorChanges 
Updated Entity Inspector to changed behavior when an Entity has been marked as read-only.
 2021-12-06 12:01:39 -06:00
nggieber 1348b6e825 Removed q file 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-06 09:52:52 -08:00
nggieber 2c1f0220ec Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-06 09:42:33 -08:00
nggieber 15237af23c Refactored ProjectManagerSettings, added tests, changed project built successful to be tracked by project path, added project ids, changed project settings path to use project id and name 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-06 09:22:03 -08:00
Guthrie Adams aa5563803f Merge pull request #6110 from aws-lumberyard-dev/Atom/guthadam/update_trace_logger_to_clear_log 
Changing trace logger to clear log file when opened
 2021-12-06 11:17:46 -06:00
Chris Galvan e9c09f6359 Merge pull request #6159 from gusmccallum/development 
Updated android launcher to remove confusing branding
 2021-12-06 11:14:53 -06:00
Steve Pham be252d797d Remove disabled failed asset load tests trait from linux (#6100) 
* Remove trait AZ_TRAIT_DISABLE_FAILED_ASSET_LOAD_TESTS for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-12-06 09:11:56 -08:00
Chris Galvan a7989df051 Fixed status combo box style in Entity Inspector. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-06 10:39:49 -06:00
Tom Hulton-Harrop 969dbf407a Add tests for planar manipulator draw when dealing with scaling (#6164) 
* add support to add a custom debug display request interface for manipulator test framework

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* wip changes to support tests for manipulator view drawing

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add test for planar manipulator draw when dealing with scaling

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* additional comments for added context

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* small updates/fixes after PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for missing NullDebugDisplayRequests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-06 14:53:45 +00:00
Mikhail Naumov c5615f812c Fixing pivot offset when performing undo on Transform component (#6150) 
* Fixing undo offest on transform component

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Fixining possible issue with firing an unnecessary OnTransformChanged event when entity is manually disabled/enabled

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Adding better comments

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Unit tests

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Cherrupicking changes

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-12-06 14:46:47 +00:00
gusmccallum fc8fd89ff9 Updated android launcher to remove confusing branding 
Signed-off-by: gusmccallum <gusmccallum@hotmail.com>
 2021-12-03 21:46:16 -05:00
Danilo Aimini 87fb6be964 Fixes to Procedural Prefab instantiation - ensure the container of the procprefab has the correct editor components, and remove limitation to instantiating at the root. (#6147) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-03 15:38:29 -08:00
Esteban Papp b1eeebb6b6 Removes some leftover log 
More Linux fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-03 15:21:58 -08:00