VoxelCG
							
						 | 
						
							
							
							
							
								
							
								df9c88851a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
							
							
							
							
							
							
							
							# Conflicts:
#	Japan_Raid/Content/MainMap.umap
#	Japan_Raid/Content/fireflies.uasset 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 VoxelCG
							
						 | 
						
							
							
							
							
								
							
								541dd82a42
								
							
								
							
						 | 
						
							
							
								
								sakura leaf brush fix
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								cd59d84e38
								
							
								
							
						 | 
						
							
							
								
								Japanese lamp twiks
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								1fac52e02b
								
							
								
							
						 | 
						
							
							
								
								New roof mats, clear content folder
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								9b084bc033
								
							
								
							
						 | 
						
							
							
								
								Shogi mats twiks
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								c9480c23ea
								
							
								
							
						 | 
						
							
							
								
								Shogi mats
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								705e0b9a62
								
							
								
							
						 | 
						
							
							
								
								Sm_Lamp anim
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								6263173570
								
							
								
							
						 | 
						
							
							
								
								SM_Pavilion with lamps
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								DEFIAT
							
						 | 
						
							
							
							
							
								
							
								ac687c5df8
								
							
								
							
						 | 
						
							
							
								
								add ligt anim
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								User_Milena
							
						 | 
						
							
							
							
							
								
							
								932047dd98
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/newMain' into newMain
							
							
							
							
							
							
							
							# Conflicts:
#	Japan_Raid/Content/MainMap.umap 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								User_Milena
							
						 | 
						
							
							
							
							
								
							
								0983fc4fd3
								
							
								
							
						 | 
						
							
							
								
								ShrineDecor KitsuneTextures update
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								9f29741d72
								
							
								
							
						 | 
						
							
							
								
								Sky lattern location twiks
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								a06555a0ba
								
							
								
							
						 | 
						
							
							
								
								New kodama's mats
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								5cc87b49bc
								
							
								
							
						 | 
						
							
							
								
								Kodams Part 2
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								fc693e68bb
								
							
								
							
						 | 
						
							
							
								
								Kodamas test
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 andrejka
							
						 | 
						
							
							
							
							
								
							
								f8bc2d23ae
								
							
								
							
						 | 
						
							
							
								
								upd camera level
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								User_Milena
							
						 | 
						
							
							
							
							
								
							
								feb2eef63c
								
							
								
							
						 | 
						
							
							
								
								ShirneDecor,Kitsune Statue 1-2 updated textures
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								3c15c5a481
								
							
								
							
						 | 
						
							
							
								
								Tent mat twiks
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 FRESHKA\79822
							
						 | 
						
							
							
							
							
								
							
								1c6d3b873c
								
							
								
							
						 | 
						
							
							
								
								twiks materials twiks
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 FRESHKA\79822
							
						 | 
						
							
							
							
							
								
							
								e6df19d1b1
								
							
								
							
						 | 
						
							
							
								
								materials twiks
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 VoxelCG
							
						 | 
						
							
							
							
							
								
							
								3ed931b035
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 VoxelCG
							
						 | 
						
							
							
							
							
								
							
								9e045e8ee1
								
							
								
							
						 | 
						
							
							
								
								Some edit
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 gera
							
						 | 
						
							
							
							
							
								
							
								14a9dc9428
								
							
								
							
						 | 
						
							
							
								
								fix sakura setka
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 VoxelCG
							
						 | 
						
							
							
							
							
								
							
								5a50090a6a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 VoxelCG
							
						 | 
						
							
							
							
							
								
							
								413f20ff96
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
							
							
							
							
							
							
							
							# Conflicts:
#	Japan_Raid/Content/Levels/Foliage_Main.umap
#	Japan_Raid/Content/MainMap.umap 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 oovissivoo
							
						 | 
						
							
							
							
							
								
							
								4073c06087
								
							
								
							
						 | 
						
							
							
								
								Plus Kodamas
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 VoxelCG
							
						 | 
						
							
							
							
							
								
							
								2da526cecb
								
							
								
							
						 | 
						
							
							
								
								Add magnolia_foliage_brush > Add sakuraleaf_solo > Add fx_fireflies_draft > Add Lily_brush
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 FRESHKA\79822
							
						 | 
						
							
							
							
							
								
							
								ba93c410a5
								
							
								
							
						 | 
						
							
							
								
								materials twiks ksksks
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 MORITA\imoro
							
						 | 
						
							
							
							
							
								
							
								27f706761f
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 MORITA\imoro
							
						 | 
						
							
							
							
							
								
							
								4bc82eb26f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 MORITA\imoro
							
						 | 
						
							
							
							
							
								
							
								7e652148a4
								
							
								
							
						 | 
						
							
							
								
								Magnolia is cuming back
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 FRESHKA\79822
							
						 | 
						
							
							
							
							
								
							
								b670e67076
								
							
								
							
						 | 
						
							
							
								
								small detail
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 FRESHKA\79822
							
						 | 
						
							
							
							
							
								
							
								40c1e3795b
								
							
								
							
						 | 
						
							
							
								
								VePa
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 oovissivoo
							
						 | 
						
							
							
							
							
								
							
								9b81e02c19
								
							
								
							
						 | 
						
							
							
								
								Bamboo sss fix
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								DEFIAT
							
						 | 
						
							
							
							
							
								
							
								a3e6881dcf
								
							
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								DEFIAT
							
						 | 
						
							
							
							
							
								
							
								1098160254
								
							
								
							
						 | 
						
							
							
								
								light
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								DEFIAT
							
						 | 
						
							
							
							
							
								
							
								d1a825edf3
								
							
								
							
						 | 
						
							
							
								
								revert
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								DEFIAT
							
						 | 
						
							
							
							
							
								
							
								0b3d948dae
								
							
								
							
						 | 
						
							
							
								
								Revert "Revert "New SM)Shrine, Kitsune tex""
							
							
							
							
							
							
							
							This reverts commit 32c19c13fe. 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								DEFIAT
							
						 | 
						
							
							
							
							
								
							
								32c19c13fe
								
							
								
							
						 | 
						
							
							
								
								Revert "New SM)Shrine, Kitsune tex"
							
							
							
							
							
							
							
							This reverts commit 73e5eb7e40. 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								DEFIAT
							
						 | 
						
							
							
							
							
								
							
								a6e5274c9b
								
							
								
							
						 | 
						
							
							
								
								shpere
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								DEFIAT
							
						 | 
						
							
							
							
							
								
							
								fb391fe1a5
								
							
								
							
						 | 
						
							
							
								
								light update
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								73e5eb7e40
								
							
								
							
						 | 
						
							
							
								
								New SM)Shrine, Kitsune tex
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								3bbbd10346
								
							
								
							
						 | 
						
							
							
								
								Training zone twiks
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								4f824cc945
								
							
								
							
						 | 
						
							
							
								
								SM_TrainingFence_v1, clear creatures blocking
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								c8d8aa2660
								
							
								
							
						 | 
						
							
							
								
								New SM_Shrine_New
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Julia Vlasenko
							
						 | 
						
							
							
							
							
								
							
								406cf11433
								
							
								
							
						 | 
						
							
							
								
								Creature mats apply
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								DEFIAT
							
						 | 
						
							
							
							
							
								
							
								885e6652ad
								
							
								
							
						 | 
						
							
							
								
								fix light
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 andrejka
							
						 | 
						
							
							
							
							
								
							
								d60207b44f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 andrejka
							
						 | 
						
							
							
							
							
								
							
								ee1a6f7fad
								
							
								
							
						 | 
						
							
							
								
								new cameras + animated
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								DEFIAT
							
						 | 
						
							
							
							
							
								
							
								95e8f00272
								
							
								
							
						 | 
						
							
							
								
								FIx ?
							
							
							
							
							
						 | 
						
							2 years ago |