GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform f431c64c85690e9039d828d9a27724596ffd1368 Updated Product_SimulatorFSM (InitialFSM -> SC_InitialFSM) M simuzen_dev/Assets/AmplifyShaderEditor/CreatingTerrainsWithASE.txt.meta M simuzen_dev/Assets/UI M simuzen_dev/Assets/Wwise M simuzen_dev/Assets/configuration/Application.xml M simuzen_dev/Assets/content_common/art_common M simuzen_dev/Assets/simuzen M simuzen_dev/ProjectSettings/DynamicsManager.asset M simuzen_dev/ProjectSettings/ProjectSettings.asset GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\CityLand e0d1e37651451ee0f52baae478a0082ae2145f7f Fix red M BR M Common GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\CityLand\AR 6a4e8dbd12b701525d1e35b4ca1e2cb08b966a46 Merge branch 'feature/ST_Upgrade' into feature/ST GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\CityLand\BR a55e0e3193e426868308fec147aa88ad0046db1a bake M BR_Cityland.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\CityLand\CL 8c94c09192ce05150e051e3e77635e4b1e39eb63 Merge branch 'feature/ST_Upgrade' into feature/ST GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\CityLand\Common e592baf8f90a19cbde29ba55fdf801704507045d Fix red M Cityland_Dynamic.unity M Cityland_Props.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\CityLand\ES f3cf98cf9f80b92c5b39f8163713608cb5f25eae Merge branch 'feature/ST_Upgrade' into feature/ST GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\CityLand\FR 8272ebd3e27a13eddc321f8af008fcf2785e9493 Cityland lightmap bake GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\CityLand\IT bfcae7c8a5b32a940db9d1cf8aea4adeab89b3d6 https://simumak.atlassian.net/browse/ST-1320 señal de stop GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\CityLand\MX 39821925dd2d5188fd37bcbed7de9989c4b5a959 feature/ST_Upgrade GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\DirtTrack aad14081966015cdb6a1ee5a2aaf69c0e9c137f0 - Elevated 474 meters M DirtTrack_Buildings.unity M DirtTrack_Dynamic.unity M DirtTrack_Props.unity M DirtTrack_Streetlight.unity M Localization/AR/AR_DirtTrack.unity M Localization/BR/BR_DirtTrack.unity M Localization/CL/CL_DirtTrack.unity M Localization/ES/ES_DirtTrack.unity M Localization/IT/IT_DirtTrack.unity M Localization/MX/MX_DirtTrack.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\HighwayLand 897745a764c51b4155d0d58abc9789bbeed74344 actualizando common (normales de señales) M AR M BR M CL M Common M ES M IT M MX GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\HighwayLand\AR 25aab0830f2955bcb33deee6cfba1266ba222e6c apagado el tramo Road21, para que no se monte encima del del peaje M AR_Highwayland.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\HighwayLand\BR 31bfa71d9a28a2b68423d1c4835c43c8aadc30a4 shadows off horizontal toll M BR_Highwayland.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\HighwayLand\CL cc8eb7561315bb1937d8541e19ba78c45e0ae89b Merge branch 'feature/ST_Upgrade' into feature/ST M CL_Highwayland.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\HighwayLand\Common cfba20eaa80c789bc6eaaec6c4500dd807d9410f correccion en normales de las señales que se veian con el palo oscuro D BR/BR/Signals/Meshes.meta M Highwayland_Buildings.unity M Highwayland_Dynamic.unity M Highwayland_Props.unity M Highwayland_streetlight.unity M Terrain/MicroSplat/MicroSplatData/MicroSplatConfig.asset M Terrain/MicroSplat/MicroSplatData/MicroSplatConfig_diff_tarray.asset M Terrain/MicroSplat/MicroSplatData/MicroSplatConfig_normSAO_tarray.asset GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\HighwayLand\ES 8e347db72ac0500e7e8ad52ed4c80b01832d2174 Merge branch 'feature/ST_Upgrade' into feature/ST M ES_Highwayland.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\HighwayLand\FR 2690d9c4b12a2c0491238d52780ad301c1af2fcc - Removed traffic scene because it is in common GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\HighwayLand\IT 11ffe68e5bcaf86b74e6666082dc1647110607c5 peaje antiguo señales horizontales M IT_Highwayland.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\HighwayLand\MX fb8d97ac6a2bd6968c4687d3584d446cb8b38eb8 bake M MX_Highwayland.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\MountainPass 9c2b1067735c3ba64c0dc96506f14f5c6cacbe80 - Snow back again M Common/Scenes/MountainPass_Buildings.unity M Common/Scenes/MountainPass_Dynamic.unity M Common/Scenes/MountainPass_Props.unity M Common/Scenes/MountainPass_Streetlight.unity M Common/Terrain/MicroSplat/MicroSplatData/MicroSplatConfig 1.asset M Common/Terrain/MicroSplat/MicroSplatData/MicroSplatConfig 1_diff_tarray.asset M Common/Terrain/MicroSplat/MicroSplatData/MicroSplatConfig 1_normSAO_tarray.asset M Localization/AR/Scenes/AR_MountainPass.unity M Localization/BR/Scenes/BR_MountainPass.unity M Localization/CL/Scenes/CL_MountainPass.unity M Localization/ES/Scenes/ES_MountainPass.unity M Localization/IT/Scenes/IT_MountainPass.unity M Localization/MX/Scenes/MX_MountainPass.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\TestLand 4e04ca25ec4077a865245cf2d305747ed7f11450 - Snow back again! M Localization/AR/AR_Testland.unity M Localization/BR/BR_Testland.unity M Localization/CL/CL_Testland.unity M Localization/ES/ES_Testland.unity M Localization/IT/IT_Testland.unity M Localization/MX/MX_Testland.unity M MicroSplatData/MicroSplatConfig 4.asset M MicroSplatData/MicroSplatConfig 4_diff_tarray.asset M MicroSplatData/MicroSplatConfig 4_normSAO_tarray.asset M Testland_Buildings.unity M Testland_Dynamic.unity M Testland_ParkedVehicles.unity M Testland_Props.unity M Testland_streetlight.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\contents\Sceneries\WaterWorld 247393c34707e190201871ecd5725ebb63ce59a1 - Snow back again! M Common/Scenes/Waterworld_Base.unity M Common/Scenes/Waterworld_Buildings.unity M Common/Scenes/Waterworld_ParkedVehicles.unity M Common/Scenes/Waterworld_Props.unity M Common/Scenes/Waterworld_streetlight.unity M Localization/BR/Scenes/BR_Waterworld.unity M Localization/IT/Scenes/IT_Waterworld.unity GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common 0dec06dd4ac61ff6c4bc261700b82094e4922eba - Core 2018.3.1 M Legacy/Optimized_Props/Cone_LOD_PF.prefab GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common\Modules\Animals c1dc380f2df01844213e8d82fc69a2b7bb411918 - Horse textures to crossing entities bundle GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common\Modules\Animated 4cd665fa144c1a1436fd98d19f98aa6263339151 Moto driver pose fixed GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common\Modules\Cameras 6f54d3de34ed62bad062c6d17831d168517bf9df vehicle bundles removed GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common\Modules\Environment a239b81f991bb8e9a02a86890c1bdc815800fb87 BugFixed_BlackgroundMode black GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common\Modules\Pedestrians 4d7a2fabb3ac0c7c393033f68bfed420d22d995f - TM_Pedestrian to crossing entities bundle GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common\Modules\Props_small 1711ce3453bce1e78c2852d9a8f4599f40476737 - With new Culling Behaviour GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common\Modules\Shaders 85f9091702a7a960a3ad8bdc2ab05c17219e4299 legacy shaders added GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common\Modules\Terrain e9de81464947f95006a48c285439844bfe6e84c8 cts profile for MP GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common\Modules\TrainingManager 3c197362a79ec1f05d04f08610621b5dd9559091 Collider added GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\content_common\art_common\Modules\Vegetation 7ccfdb5af8fd1bb677c2078dce54d29c5b9d574c Merge branch '_integration/dev2int' into Integration GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\products\Simestruck e3fc16cfe93e6917d570b539068a7a50ec4adcbd - Added meta file GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\simuzen e64adab6485bf719bc306bd086373bfc16b578a1 Fixed bugs [passengers infractions and HTruckTelemetryPanel descriptor] M CommonTools M platform/DeformableMeshes M platform/VehicleDynamics/Core M platform/systems/base/services/hud/Atlas/SC_Atlas/Amarok/HUD_AmarokDashboardAtlas.spriteatlas M platform/systems/base/services/hud/Atlas/SC_Atlas/Chevrolet_Atlas/HUD_ChevroletDashboardAtlas.spriteatlas M platform/systems/base/services/hud/Atlas/SC_Atlas/Golf_Atlas/HUD_GolfDashboardAtlas.spriteatlas M platform/systems/base/services/network/Resources/NetworkManager.prefab M platform/systems/base/services/registry/Resources/RegistryService.prefab M tm GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\simuzen\CommonTools 09e442bbbcce75ce46bc2056fa14ad8f952b49d5 updated Amplify 1.5.8 M AmplifyShaderEditor/CreatingTerrainsWithASE.txt.meta D CTS/Profiles.meta D StompyRobot.meta M playmaker/PlayMaker/Editor/Resources/EditorStartupPrefs.asset GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\simuzen\platform\DeformableMeshes 06d8c3a4979e4a78842e8d02b432a0b1953f4644 no message GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\simuzen\platform\traffic e68fb9b5bd30eb0618fc29ced1bf8c6be57cafec Merge branch 'product/ST' into Integrations/ST_Integration GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\simuzen\platform\VehicleDynamics\Core f3832f4c604208d57312e55232cca89cbd471299 Common Tools core and Vehicle Physics Sample Assets updated for integration with ST M Core/Vehicle Templates GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\simuzen\tm 8b8abe04791719a11c925a2918e3a33f0c35e271 Fixed merge D Scripts/TMFramework/RuntimeEngine/Editor.meta GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\StreamingAssets\Audio a5594faa6435a4fec1cd5190ae41f6a6e0b096b9 Actualización Ale 25/11 M GeneratedSoundBanks/Windows/DecodedBanks/English(US).meta GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\UI dae25fc002c2ad0566c5285d2ca798e2b68c846e updated images in atlas M Simulator/Logsim/Atlas/LogSimAtlas.spriteatlas GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\vehicles\STUserVehicles ed24c3ec07e53fc0eeb41dffb7c227fa9d2c90ef art/Vehicles repository relocated GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\vehicles\TrafficVehicles a9e5cef97dfee2b748e760800c12c98d4b2adc38 art/Vehicles repository relocated GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\vehicles\UserVehicles 07e0df29f4ae61ea8090c926afc894476e70ef4a Deleted folders D FakeBundles.meta GIT C:\Users\Jenkins\.jenkins\projects\cian\simuplatform\simuzen_dev\Assets\Wwise f7685b8a52c4067399eb9c7080a81a513ccf508e - Project data for PSA