HelarJ cd1633af54 Merge remote-tracking branch 'origin/joonasp_Milestone3' into staging2 ... # Conflicts: # Assets/SkyProfile-457889269655148736.asset # Assets/_TerrainData/TerrainData_521113671563848736.asset # Assets/_TerrainData/TerrainData_699485723238748736.asset # Assets/_TerrainData/TerrainData_869121471408748736.asset # Assets/_TerrainData/TerrainMaterial_521113671563848736.mat # Assets/_TerrainData/TerrainMaterial_699485723238748736.mat # Assets/_TerrainData/TerrainMaterial_869121471408748736.mat		2022-04-11 18:53:05 +03:00
Assets	Merge remote-tracking branch 'origin/joonasp_Milestone3' into staging2	2022-04-11 18:53:05 +03:00
Packages	Merge branch 'Shumpei' into portals-and-body	2022-03-25 10:46:05 +02:00
ProjectSettings	portal vfx rework - shield spell art added - logs made stackable - some portal script interference fixed	2022-04-10 18:06:16 +03:00
debugtest_BurstDebugInformation_DoNotShip/tempburstlibs/arm64-v8a	portal vfx rework - shield spell art added - logs made stackable - some portal script interference fixed	2022-04-10 18:06:16 +03:00
.gitignore	vsconfig added to gitign	2022-03-07 18:29:50 +02:00
InitCodeMarker	clean project	2022-03-07 17:52:41 +02:00