Commit Graph

356 Commits (7fdd9aca38ce8cb5eb5a9a5061572df60952feab)
 

Author SHA1 Message Date
oovissivoo 7fdd9aca38 Plus zont
DEFIAT 28dfdd5151 Revert "Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain"
This reverts commit 8c9652ca62, reversing
changes made to 11c3e08a36.
DEFIAT 8c9652ca62 Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
DEFIAT 11c3e08a36 fix lump
User_Milena 5a01b2f6c3 KitsuneStatue empty materials remove
User_Milena 7700532bc3 KitsuneStatue material fix
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
VoxelCG 541dd82a42 sakura leaf brush fix
Julia Vlasenko cd59d84e38 Japanese lamp twiks
Julia Vlasenko 1fac52e02b New roof mats, clear content folder
Julia Vlasenko 9b084bc033 Shogi mats twiks
Julia Vlasenko c9480c23ea Shogi mats
Julia Vlasenko 705e0b9a62 Sm_Lamp anim
Julia Vlasenko 6263173570 SM_Pavilion with lamps
DEFIAT ac687c5df8 add ligt anim
User_Milena 932047dd98 Merge remote-tracking branch 'origin/newMain' into newMain
# Conflicts:
#	Japan_Raid/Content/MainMap.umap
User_Milena 0983fc4fd3 ShrineDecor KitsuneTextures update
Julia Vlasenko 9f29741d72 Sky lattern location twiks
Julia Vlasenko a06555a0ba New kodama's mats
Julia Vlasenko 5cc87b49bc Kodams Part 2
Julia Vlasenko fc693e68bb Kodamas test
andrejka f8bc2d23ae upd camera level
User_Milena feb2eef63c ShirneDecor,Kitsune Statue 1-2 updated textures
Julia Vlasenko 3c15c5a481 Tent mat twiks
FRESHKA\79822 1c6d3b873c twiks materials twiks
FRESHKA\79822 e6df19d1b1 materials twiks
VoxelCG 3ed931b035 Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
VoxelCG 9e045e8ee1 Some edit
gera 14a9dc9428 fix sakura setka
VoxelCG 5a50090a6a Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
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
oovissivoo 4073c06087 Plus Kodamas
VoxelCG 2da526cecb Add magnolia_foliage_brush > Add sakuraleaf_solo > Add fx_fireflies_draft > Add Lily_brush
FRESHKA\79822 ba93c410a5 materials twiks ksksks
MORITA\imoro 27f706761f no message
MORITA\imoro 4bc82eb26f Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
MORITA\imoro 7e652148a4 Magnolia is cuming back
FRESHKA\79822 b670e67076 small detail
FRESHKA\79822 40c1e3795b VePa
oovissivoo 9b81e02c19 Bamboo sss fix
DEFIAT a3e6881dcf fix
DEFIAT 1098160254 light
DEFIAT d1a825edf3 revert
DEFIAT 0b3d948dae Revert "Revert "New SM)Shrine, Kitsune tex""
This reverts commit 32c19c13fe.
DEFIAT 32c19c13fe Revert "New SM)Shrine, Kitsune tex"
This reverts commit 73e5eb7e40.
DEFIAT a6e5274c9b shpere
DEFIAT fb391fe1a5 light update
Julia Vlasenko 73e5eb7e40 New SM)Shrine, Kitsune tex
Julia Vlasenko 3bbbd10346 Training zone twiks
Julia Vlasenko 4f824cc945 SM_TrainingFence_v1, clear creatures blocking