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
..
Jupiter - Procedural Sky	Merge and material conversion	2022-03-14 18:08:13 +02:00
Low Poly Tools Bundle	portals and dash. Also a bit of terrain building and level design	2022-03-13 00:26:35 +02:00
Polaris - Low Poly Terrain Engine	branch from homebase, icebolt collision issues	2022-04-11 13:58:13 +03:00
Polaris Extension - URP Support	merge commit	2022-04-11 18:46:10 +03:00
Poseidon - Low Poly Water System	unified scene working - small but with inventory and portals. has simple fix coming - overlaps in script use buttons still here, need flags to fix - simple torso for player character	2022-04-05 10:21:55 +03:00
TextureGraph	Merge and material conversion	2022-03-14 18:08:13 +02:00
Jupiter - Procedural Sky.meta	portals and dash. Also a bit of terrain building and level design	2022-03-13 00:26:35 +02:00
Low Poly Tools Bundle.meta	portals and dash. Also a bit of terrain building and level design	2022-03-13 00:26:35 +02:00
Polaris - Low Poly Terrain Engine.meta	portals and dash. Also a bit of terrain building and level design	2022-03-13 00:26:35 +02:00
Polaris Extension - URP Support.meta	portals and dash. Also a bit of terrain building and level design	2022-03-13 00:26:35 +02:00
Poseidon - Low Poly Water System.meta	portals and dash. Also a bit of terrain building and level design	2022-03-13 00:26:35 +02:00
TextureGraph.meta	portals and dash. Also a bit of terrain building and level design	2022-03-13 00:26:35 +02:00