Commit Graph

378 Commits (97722336f1e0fc20cdf062ba6bcd63d1bc14671b)
 

Author SHA1 Message Date
Julia Vlasenko 97722336f1 Kodamas on water fix
Julia Vlasenko 585ab7618b Kitsune mat fix, water level
VoxelCG 44aadcc252 Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
# Conflicts:
#	Japan_Raid/Content/MainMap.umap
VoxelCG 7a9a308737 Upload new meshes, fix bugs, refresh tex
gera 53442710d5 water water povernis k forest zadom a ko mne peredom
Julia Vlasenko 9dcbd345ec Faceless mat
oovissivoo 314b08c464 Plus segi players
Julia Vlasenko 317089be91 SM_ArrowBox
Julia Vlasenko 83e592d016 KitsuneStatues and Decor
Julia Vlasenko 7861571d8b Umbrella mats twiks
Wolfapredator fd0133c142 WATER!@@@@@@@
Julia Vlasenko dbcc63702c Kodamas twiks
Julia Vlasenko e74a927aa9 Umbrella
andrejka 92251907bb может быть сломается что-то
andrejka 7d637f7aca upd camera level x2
andrejka a79a366ca7 upd camera level
VoxelCG c454393847 Fix
VoxelCG 97fe2a7832 Revert "Revert "Foliage fix""
This reverts commit 185b74d497.
VoxelCG 185b74d497 Revert "Foliage fix"
This reverts commit e407acabeb.
VoxelCG e4ebdf4330 Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain
# Conflicts:
#	Japan_Raid/Content/Levels/Foliage_Main_Brush.umap
#	Japan_Raid/Content/Levels/Landscape.umap
VoxelCG e407acabeb Foliage fix
oovissivoo 238b21d6f1 Plus_segiplayerv2
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