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
Esteban Papp 8cef306efb Code/Editor 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:26 -07:00
Esteban Papp b255334535 Code/Tools fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:24 -07:00
Esteban Papp 14990012f8 Code/Legacy 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:22 -07:00
Esteban Papp 3eb658534b More Code/Framework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:19 -07:00
Esteban Papp 06e6f83907 Cleanup and fixing of Code/Framework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:17 -07:00
Esteban Papp 0cb66584eb small fix, everything compiling with VS2022 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:13 -07:00
Esteban Papp 0eacd54b14 removing unnecessary bigobj flags from files (its applied globally) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:11 -07:00
Esteban Papp 14e7754334 More fixes for warnings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:09 -07:00
Esteban Papp 1f5dddcca6 Code compiles 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:07 -07:00
Esteban Papp 5f7b534afd More fixes for Code/Editor 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:05 -07:00
Esteban Papp e7f07147cb More fixes for Code/Framework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:01 -07:00
pappeste 9c5b2768e2 Editor 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:41:57 -07:00
pappeste 3172a82937 Code/Framework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:39:20 -07:00
pappeste 75dc3e5836 CryEngine 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:39:13 -07:00
pappeste 58f8b563d0 fix them all 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:38:33 -07:00
pappeste f6679cc05f Sandbox 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:26:59 -07:00
Guthrie Adams ff4d65dc2d added functions to remove and clear trace logger filters 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-16 18:22:37 -05:00
pereslav f76d09e215 Fixed assert about memory override when logged string is longer than the buffer size 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-08-17 00:19:57 +01:00
Esteban Papp e9b4f48f71 more fixes, will merge fixes for w4245 and w4389 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:06:22 -07:00
Esteban Papp 3522f622f3 more castings 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:06:20 -07:00
Esteban Papp 8b3ab8eb0b fixing warning issued in Jenkins 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:06:18 -07:00
Esteban Papp 52068911bb More fixes that are failing on Jenkins but not locally 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:45 -07:00
Esteban Papp 75c388b746 change conversions to static_cast 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:43 -07:00
Esteban Papp 27c0ed9878 warning fixes for new code 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:41 -07:00
Esteban Papp 37663910c1 Others 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:39 -07:00
Esteban Papp 8ba0807cfc Code/Framework/AzCore 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:29 -07:00
pappeste 52cba32bed TestImpactFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:27 -07:00
pappeste b0456691c7 FbxSceneBuilder 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:25 -07:00
pappeste 63f36dfe70 LauncherUnified 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:23 -07:00
pappeste f6cdcddc52 fixes for Code/CryEngine 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:03:28 -07:00
pappeste 81d26d322d Code/Framework fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:02:53 -07:00
mnaumov 0884f96997 PR feedback 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-16 16:02:09 -07:00
mnaumov d5b92fa93a Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372 2021-08-16 15:23:34 -07:00
kberg-amzn 109ce65c7d Merge pull request #2993 from aws-lumberyard-dev/MultiplayerDesyncsAndCorrectionFixes 
Multiplayer desyncs and correction fixes
 2021-08-16 14:53:55 -07:00
Guthrie Adams fe7d953568 Merge pull request #3124 from aws-lumberyard-dev/Atom/guthadam/ATOM-16242_fix_python_terminal_help_crash 
AtomTools: Fix python terminal help crash ATOM-16242
 2021-08-16 15:15:57 -05:00
Chris Galvan aff3b93297 Merge pull request #3023 from aws-lumberyard-dev/daimini/settings-registry-origin-tracking 
Add Pre and Post merge handlers to Settings Registry
 2021-08-16 12:53:49 -05:00
amzn-phist d6b268e84e Remove ResourceSelectorHost and clean up/refactor related bits (#3050) 
* Sever dependency on legacy resource selector host

Audio resource selectors (browse dialogs) no longer need to be
registered with the legacy IResourceSelectorHost system.  Set up a new
EBus specifically to handle browse button presses and directly invokes
the dialog.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Hook up legacy audio control selector to new EBus

Remaining use of legacy audio selectors (trackview) need to be able to
bypass ResourceSelectorHost now.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removes ResourceSelectorHost and legacy selectors

This removes various Variable types that were tied to resource
selectors, such as GeomCache, Model, Animation, File.  Removes the
ResourceSelectorHost completely.  The two things that still appeared to
have selectors in TrackView are Audio Controls and Texture.  Fixed the
audio control selector to work via EBus and the Texture selector didn't
seem to work at all, but left it in as it was.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Make the default audio selector return old value

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix some signed/unsigned comparison warnings

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Remove deleted function from Editor Mock

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Change audio selector api to use string_view

Per feedback.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 2021-08-16 12:41:24 -05:00
mnaumov e42c5c03ab Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679 2021-08-16 10:36:30 -07:00
AMZN-stankowi b88a7faf64 Fixed issues with blend shape animations (#3080) 
Duplicate blend shape animations are now handled correctly.
Invalid animation targets are now an error instead of a crash in the builder.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
 2021-08-16 10:18:45 -07:00
Danilo Aimini 577c75d68d Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 2021-08-16 09:43:10 -07:00
Esteban Papp 4f2d4d00ec Auto-completing the inserted text by pressing TAB within Editor's Console results in a silent crash 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 08:40:27 -07:00
jonawals 5925bd22f6 Further subdivide TIAF data by suite. (#3128) 
* Further subdivide TIAF data by suite.
* Key fix typo.

Signed-off-by: John <jonawals@amazon.com>
 2021-08-16 14:15:02 +01:00
sphrose f7e536bfb1 compile fix - signed/unsigned mismatch (#3139) 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-08-16 12:37:12 +01:00
sphrose 181698b950 LY-91616 Dyn Veg: Push (up) and Pop (down) Items in Descriptor List (#3013) 
* LY-91616 Dyn Veg: Push (up) and Pop (down) Items in Descriptor List

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Changes as per reviews.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Additional review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review change

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-08-16 10:54:15 +01:00
Guthrie Adams 885357a6b5 AtomTools: restoring log message filter to ignore source control spam 
Added message filter support to TraceLogger

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-14 16:58:31 -05:00
Guthrie Adams d6c5f1444b fixing hidden variable warning 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-14 14:30:54 -05:00
Guthrie Adams fe3b30e42c AtomTools: Fix python terminal help crash ATOM-16242 
Checking EditorWindowRequests::GetAppMainWindow before searching for main window

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-14 14:07:36 -05:00
chcurran 5044204839 Move JsonUtils.h for support of SC serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-13 21:53:20 -07:00
mnaumov 9aa391bf74 Fixing Level Save As 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-13 19:51:55 -07:00
mnaumov e633b5bdc7 Addressing Ronald's feedback 
Signed-off-by: mnaumov <mnaumov@amazon.com>
 2021-08-13 19:50:35 -07:00