Compare commits

merge into: Retry:newMain

Branches Tags

Retry:newMain

Retry:mainFix

Retry:oldmain

...

pull from: Retry:oldmain

Branches Tags

Retry:newMain

Retry:mainFix

Retry:oldmain

7 Commits

newMain ... oldmain

Author	SHA1	Message	Date
MORITA\imoro	c594c358e5	Merge branch 'main' of http://wolfpredator.sknt.ru/Retry/Japan_Raid	2 years ago
MORITA\imoro	e9992fc87c	no message	2 years ago
oovissivoo	89565aab56	Merge branch 'main' of http://wolfpredator.sknt.ru/Retry/Japan_Raid	2 years ago
oovissivoo	0c35c2ea03	Revert "reverse to dragon" ... This reverts commit 707074d2c1.	2 years ago
oovissivoo	707074d2c1	reverse to dragon	2 years ago
MORITA\imoro	f5aa057bc9	Merge branch 'main' of http://wolfpredator.sknt.ru/Retry/Japan_Raid ... # Conflicts: # Japan_Raid/Content/Levels/Creatures.umap # Japan_Raid/Content/Levels/Foliage_Background.umap # Japan_Raid/Content/Levels/Foliage_Main.umap # Japan_Raid/Content/Levels/Geometry.umap # Japan_Raid/Content/Levels/LV_blocking_mesh.umap # Japan_Raid/Content/Levels/Landscape.umap # Japan_Raid/Content/Levels/Light_day.umap # Japan_Raid/Content/Levels/Light_day_HDRI.umap # Japan_Raid/Content/Levels/Light_night.umap # Japan_Raid/Content/Levels/ZOO_Level.umap # Japan_Raid/Content/MainMap.umap # Japan_Raid/Content/StarterContent/Architecture/Floor_400x400.uasset	2 years ago
MORITA\imoro	d292669f86	no message	2 years ago

23 changed files with 44 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats

BIN

Japan_Raid/Content/Levels/Creatures.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Levels/Foliage_Background.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Levels/Foliage_Main.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Levels/Geometry.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Levels/LV_blocking_mesh.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Levels/Landscape.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Levels/Light_day.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Levels/Light_day_HDRI.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Levels/Light_night.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/MainMap.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/StarterContent/Textures/T_Wood_Walnut_D.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/StarterContent/Textures/T_Wood_Walnut_N.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/VFX/Sakura/NewNiagaraSystem.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/VFX/Sakura/T_SakuraLeaf.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 MiB

BIN

Japan_Raid/Content/VFX/Sakura/T_SakuraLeaf.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/VFX/Sakura/T_SakuraLeaf1.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 MiB

BIN

Japan_Raid/Content/VFX/Sakura/T_SakuraLeaf1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/VFX/Sakura/T_SakuraLeaf2.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 MiB

BIN

Japan_Raid/Content/VFX/Sakura/T_SakuraLeaf2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/VFX/Sakura/T_SakuraLeaf3.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 MiB

BIN

Japan_Raid/Content/VFX/Sakura/T_SakuraLeaf3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/VFX/Sakura/T_SakuraLeaf_Mat.uasset (Stored with Git LFS)

View File

Binary file not shown.

Write Preview

Loading…

Cancel

Save