Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								77aa00bd15
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
							
							
							# Conflicts:
#	Japan_Raid/Content/MainMap.umap 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								f3ef3e9d8a
								
							
								
							
						 | 
						
							
							
								
								fix main map
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								f6a3012b03
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								2703d9c545
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main' into HEAD
							
							
							
							
							
							
							
							# Conflicts:
#	Japan_Raid/Content/MainMap.umap 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								bf1f9a709e
								
							
								
							
						 | 
						
							
							
								
								AAA
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								627f66fc46
								
							
								
							
						 | 
						
							
							
								
								ADD Two maplw and 2 version nsfw brush
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Alena
							
						 | 
						
							
							
							
							
								
							
								99a4584a0b
								
							
								
							
						 | 
						
							
							
								
								fix ropefence
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Alena
							
						 | 
						
							
							
							
							
								
							
								cb0fcff547
								
							
								
							
						 | 
						
							
							
								
								upd bamboo fence, rope fence, shishiodoshi, add material
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Defiat11
							
						 | 
						
							
							
							
							
								
							
								7ecd0b5dd4
								
							
								
							
						 | 
						
							
							
								
								Light and ither fix
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								2e654a8271
								
							
								
							
						 | 
						
							
							
								
								stone lanterns
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								9653f9d7c4
								
							
								
							
						 | 
						
							
							
								
								Background foliage, Roden textures
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								87aa27a0b9
								
							
								
							
						 | 
						
							
							
								
								Training zone, new Rodens
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								eb3b35e23d
								
							
								
							
						 | 
						
							
							
								
								obnova maple
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Wolfapredator
							
						 | 
						
							
							
							
							
								
							
								49eee612f1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main' of http://wolfpredator.sknt.ru/Retry/Japan_Raid
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Wolfapredator
							
						 | 
						
							
							
							
							
								
							
								fb104ef1e2
								
							
								
							
						 | 
						
							
							
								
								Update .gitignore
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								e03cd9772a
								
							
								
							
						 | 
						
							
							
								
								fix commita. izmena water
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								cdf6588867
								
							
								
							
						 | 
						
							
							
								
								чистка папок пропсы-фулидж, текстуры-тайлы, текстуры-уникальные, материалы-фулидж
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								75ce21bc13
								
							
								
							
						 | 
						
							
							
								
								адд 2 версии 1ого клена
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								7beebb6629
								
							
								
							
						 | 
						
							
							
								
								SM_ArmoryStorage
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								c5740f4d0b
								
							
								
							
						 | 
						
							
							
								
								New Rodens
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								8b0437e7d2
								
							
								
							
						 | 
						
							
							
								
								Bamboo, bushes
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								748e91ec2b
								
							
								
							
						 | 
						
							
							
								
								адд 2 куста
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								User_Milena
							
						 | 
						
							
							
							
							
								
							
								b05935bb23
								
							
								
							
						 | 
						
							
							
								
								SM_SrineSign resized
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								087f43feaf
								
							
								
							
						 | 
						
							
							
								
								адд голый куст
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Defiat11
							
						 | 
						
							
							
							
							
								
							
								cebad1114e
								
							
								
							
						 | 
						
							
							
								
								add automaterial and mesh
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								71e63c5340
								
							
								
							
						 | 
						
							
							
								
								Bamboo foliage
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								718f5f37a5
								
							
								
							
						 | 
						
							
							
								
								SM_Shrine_New
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								c87689abbe
								
							
								
							
						 | 
						
							
							
								
								Footpaths, landscape
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								6d88a74f13
								
							
								
							
						 | 
						
							
							
								
								SM_MainHouse
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Alena
							
						 | 
						
							
							
							
							
								
							
								c6f5234c01
								
							
								
							
						 | 
						
							
							
								
								add content - meshes - props - footpath big v1 - v3, footpath small v1 - v4
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								d00723381d
								
							
								
							
						 | 
						
							
							
								
								foliage twiks
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								69bc120011
								
							
								
							
						 | 
						
							
							
								
								Delete old Roden
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								WeakFlesh
							
						 | 
						
							
							
							
							
								
							
								a8feff86a0
								
							
								
							
						 | 
						
							
							
								
								Добавлен ZOO_Level
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								5a7169e30f
								
							
								
							
						 | 
						
							
							
								
								Roden
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								db23bd778c
								
							
								
							
						 | 
						
							
							
								
								Fences
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Alena
							
						 | 
						
							
							
							
							
								
							
								21e1fd1a0a
								
							
								
							
						 | 
						
							
							
								
								fix rope fence
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Defiat11
							
						 | 
						
							
							
							
							
								
							
								46a7b6f30c
								
							
								
							
						 | 
						
							
							
								
								add tentacle
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								User_Milena
							
						 | 
						
							
							
							
							
								
							
								d74004cb5d
								
							
								
							
						 | 
						
							
							
								
								Reimport kitsune statue and wood sign
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								79d57ada18
								
							
								
							
						 | 
						
							
							
								
								New meshes, rest zone
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 oovissivoo
							
						 | 
						
							
							
							
							
								
							
								11b1c52c3a
								
							
								
							
						 | 
						
							
							
								
								sakura fix
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Alena
							
						 | 
						
							
							
							
							
								
							
								1d76fcca9d
								
							
								
							
						 | 
						
							
							
								
								fix bamboo material (add height,normal), fix content - bamboo fence, add content shishiodoshi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Alena
							
						 | 
						
							
							
							
							
								
							
								51be36e457
								
							
								
							
						 | 
						
							
							
								
								Add SM_BambooFence_v1, RopeFence_v1-4, SM_Shishiodoshi_v1, SM_Shishiodoshi_v2
							
							
							
							
							
							
							
							Add texture bamboo basecolor 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								User_Milena
							
						 | 
						
							
							
							
							
								
							
								502173fcf4
								
							
								
							
						 | 
						
							
							
								
								Added shrine sign and kitsune statuev2
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								bad47b44ae
								
							
								
							
						 | 
						
							
							
								
								New SM_Lamp
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								1a8b084d81
								
							
								
							
						 | 
						
							
							
								
								New Bridges
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								d1e03c3d30
								
							
								
							
						 | 
						
							
							
								
								Foliage
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								69e1c58481
								
							
								
							
						 | 
						
							
							
								
								Main Landscape, some props from quixel
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								ce7e1ca756
								
							
								
							
						 | 
						
							
							
								
								twiks
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								26f981ad70
								
							
								
							
						 | 
						
							
							
								
								Stones Garden
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Nik3dm
							
						 | 
						
							
							
							
							
								
							
								80aa478b48
								
							
								
							
						 | 
						
							
							
								
								Bridge_large_D
							
							
							
							
							
						 | 
						
							2 years ago |