birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
226 Commits 3 Branches 3 Tags
41eadd60e49b4d8a88bf1050d5ea68f35d0e9525
Commit Graph

226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
moudgils 41eadd60e4 Merge pull request #83 from aws-lumberyard-dev/Atom/moudgils/BumpResourcePoolBuilder 
Bump ResourcePoolBuilder as the BufferBindFlags were updated. Also pulled in networking compile fixes to fix profile_nounity from Karl.
 2021-04-16 00:35:59 -07:00
moudgils 51720e269b Merge branch 'MultiplayerCompileFix' into Atom/moudgils/BumpResourcePoolBuilder 2021-04-15 22:11:39 -07:00
moudgils ca86068d83 Minor update 2021-04-15 20:55:54 -07:00
moudgils d0435b4489 Minor update 2021-04-15 20:46:48 -07:00
moudgils 05359187c4 Test update 2021-04-15 20:45:53 -07:00
moudgils 89a935cd29 Minor update 2021-04-15 20:44:01 -07:00
karlberg ee3f157fb8 Fix memory leak in multiplayer unit test 2021-04-15 20:41:08 -07:00
moudgils 62b38bdf9e Merge branch 'main' into Atom/moudgils/BumpResourcePoolbuilder 2021-04-15 20:24:00 -07:00
Jonny Galloway 82ca4bf221 Merge pull request #80 from aws-lumberyard-dev/AtomTest-Sponza 
AtomTest Sponza Content
 2021-04-15 21:45:02 -05:00
moudgils 3c631e4a85 Merge branch 'main' into Atom/moudgils/BumpResourcePoolbuilder 2021-04-15 19:16:29 -07:00
Esteban Papp 4edbf7890b Bringing fix that has not been migrated to github yet (fixes Windows release builds) 2021-04-15 19:01:15 -07:00
karlberg 8074e0fb18 Remove formal template parameter name to resolve shadowed variable warning on clang 2021-04-15 17:56:08 -07:00
kberg-amzn c2f9019f7c Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents 
Multiplayer components
 2021-04-15 16:30:36 -07:00
Vicky 8743155b73 Merge pull request #76 from aws-lumberyard-dev/Atom/qingtao/ATOM-13791 
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
LYN-2908 Pressing Home button crashes the Editor
 2021-04-15 15:19:25 -07:00
moudgils abf26eede1 Bump REsourcePoolBuilder as the bufferBindFlags were updated 2021-04-15 14:00:40 -07:00
qingtao ef30f49bf9 Fixed a linux compile issue. 2021-04-15 13:29:29 -07:00
srikappa-amzn 76af009190 Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs 
Make creation of new prefabs use a relative path to the project
 2021-04-15 13:20:18 -07:00
gallowj a9516c6498 updated the ref to dccsi env that changed 2021-04-15 15:04:36 -05:00
Terry Michaels 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
 2021-04-15 14:28:57 -05:00
dmcdiarmid-ly 8a589ff3e1 Merge pull request #68 from aws-lumberyard-dev/Atom/dmcdiar/LYN-2772 
[LYN-2772] Adding White Box Component to an Entity silently crashes the Editor
 2021-04-15 12:26:37 -07:00
Nicholas Van Sickle 2f698626cf Merge pull request #64 from aws-lumberyard-dev/nvsickle/CherryPickContextMenuFix 
Cherry-pick: Fix context menu popping up in EditorViewportWidget when it shouldn't
 2021-04-15 11:33:57 -07:00
gallowj a9345646f8 fixing a hardcoded path typo that someone submitted on accident. 2021-04-15 13:08:13 -05:00
gallowj cc7b4fc251 Updated all materials, did some mesh cleaning adding source file as well. 2021-04-15 13:06:27 -05:00
srikappa 4da29a09d2 Merge branch 'main' into Prefab/RelativePathForNewPrefabs 2021-04-15 11:01:15 -07:00
greerdv 14f7883425 Merge pull request #15 from aws-lumberyard-dev/limit_max_scale 
setting max value for scale
 2021-04-15 17:27:07 +01:00
Ken Pruiksma 01dc097fa6 Merge pull request #66 from aws-lumberyard-dev/pruiksma/ATOM-15240 
ATOM-15240 Fixing thumbnails attempting to use a feature processor that no longer exists.
 2021-04-15 11:20:19 -05:00
Ulugbek Adilbekov ebebc05cd1 Reenable Blast Automated tests (#42) 
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
 2021-04-15 16:16:31 +01:00
greerdv e989a2e697 Merge branch 'limit_max_scale' of https://github.com/aws-lumberyard-dev/o3de into limit_max_scale 2021-04-15 14:00:44 +01:00
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 2021-04-15 13:44:53 +01:00
dmcdiar 20c1454e4b Added the ShaderRead buffer bind flag to the static and dynamic input assembly pools, and one creation of a static input assembly buffer. 2021-04-15 03:41:20 -07:00
qingtao fa7f61cf0d ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines 
- Added pause/resume button to ImGui Profiler to pause/resume profiling
- Added showing pass execution timeline
- Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult.
- Update some functions names in Pass.
- Stop showing accumulated time for ParentPass.
- Fixed a crash issue with ImGuiManager which doesn't have default font.
 2021-04-14 22:48:46 -07:00
pruiksma 243af5f697 ATOM-15240 Fixing thumbnails attempting to use a feature processor that no longer exists. Adding simple point and simple spot feature processors to the thumbnail scene descriptor. 2021-04-14 23:13:31 -05:00
moudgils 3d3f43b0b9 Merge pull request #36 from aws-lumberyard-dev/Atom/moudgils/MacRuntimeFixes 
Atom/moudgils/mac runtime fixes
 2021-04-14 20:57:40 -07:00
lumberyard-employee-dm 8019312b35 Merge pull request #28 from aws-lumberyard-dev/LYN-2883 
Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter
 2021-04-14 20:55:27 -05:00
AMZN-mnaumov c97dae47b7 Merge pull request #22 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14904_2 
[ATOM-14904] Fixing ShaderVariantAsyncLoader shutdown not releasing it's assets
 2021-04-14 18:53:23 -07:00
srikappa 2410d299c1 Make creation of new prefabs use a relative path to the project 2021-04-14 17:51:15 -07:00
karlberg 45faa26ffd Some initial updates for eventual support of locally predicted input processing 2021-04-14 17:50:04 -07:00
karlberg 88120999f9 Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-04-14 17:47:58 -07:00
Esteban Papp 8b265d2e8d Initial version that I need to test out (#60) 
LYN-2585 Add cmake/install job to Jenkins
 2021-04-14 17:38:57 -07:00
Brian Herrera be85d2ea58 Merge pull request #57 from aws-lumberyard-dev/build/SPEC-5588 
Prevent skipping build if it's from a pull request
 2021-04-14 17:30:13 -07:00
nvsickle f7aabebb37 Fix context menu popping up when it shouldn't 2021-04-14 17:03:21 -07:00
SJ 03aaf33b6e Merge pull request #62 from aws-lumberyard-dev/SPEC-6295 
[iOS] Fix build issues
 2021-04-14 16:47:12 -07:00
dmcdiarmid-ly b5386fd53b Merge pull request #54 from aws-lumberyard-dev/Atom/dmcdiar/LYN-2735 
[LYN-2735] The Editor crashes upon creating a level when the Prefab system has been disabled in a new project
 2021-04-14 15:51:04 -07:00
Nicholas Van Sickle 7484a983b8 Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport 
Switch on the Atom-native viewport by default
 2021-04-14 15:47:56 -07:00
mcgarrah d29fe24396 Merge remote-tracking branch 'upstream/main' into LYN-2883 2021-04-14 17:43:20 -05:00
amzn-sj 7609248c49 Fix build errors 2021-04-14 15:42:24 -07:00
SergeyAMZN 828bedf7a9 Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline 
Fixed dangling pointer in InitializeCatalog
 2021-04-14 22:59:39 +01:00
Brian Herrera a1f0baeeff Prevent skipping build if it's from a pull request 
Also add safe navigation operator on parameters. This avoids encoutering NullPointerException when accessing build parameters on the first build since these values will be set to null.
 2021-04-14 14:58:22 -07:00
Esteban Papp 4a3d24f189 SPEC-6276 Move ci_build and ci_build_metrics to scripts\build 2021-04-14 14:40:42 -07:00
amzn-sj fff97cda3b Cache runtime dependencies for targets to speed up iOS configuration. 2021-04-14 13:09:21 -07:00