Compare commits

base: Kolbakilu:feature-main-menu

Branches Tags

Kolbakilu:master Kolbakilu:feature-main-menu

...

compare: Kolbakilu:51fce7d3b5a39c1f33fe9a6a8a5f3ab5e1c7eca8

Branches Tags

Kolbakilu:master Kolbakilu:feature-main-menu

31 Commits

feature-ma ... 51fce7d3b5

Author	SHA1	Message	Date
HSellis	51fce7d3b5	merge ?	2025-01-26 08:51:01 +02:00
HSellis	fe7cfcda13	Soovana model + sosin	2025-01-26 08:43:59 +02:00
kolbakilu	1693401f95	Make game map more interesting.	2025-01-26 08:13:42 +02:00
kolbakilu	c98a9d0fb3	Improve main menu.	2025-01-25 22:36:50 +02:00
kolbakilu	d20befd11a	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame	2025-01-25 22:11:21 +02:00
kolbakilu	2d40b0982b	Improve main menu and start audio.	2025-01-25 22:11:12 +02:00
HSellis	5673fe36d8	BogFather always looks at you	2025-01-25 21:52:31 +02:00
HSellis	f91afe3895	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-25 21:34:35 +02:00
HSellis	bba3bf66f0	epic darkness aura	2025-01-25 21:34:18 +02:00
kolbakilu	e5bd280f8f	Fix env test map.	2025-01-25 21:29:17 +02:00
kolbakilu	85217c2bba	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame	2025-01-25 21:21:37 +02:00
kolbakilu	42930c4bc6	Water change.	2025-01-25 21:21:34 +02:00
kolbakilu	750da2d799	Texture the ground.	2025-01-25 21:19:06 +02:00
HSellis	bf41703eb5	add hand to lantern	2025-01-25 20:57:24 +02:00
HSellis	86a5553b23	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-25 20:39:04 +02:00
HSellis	9feb5d5bad	give models to collectable items	2025-01-25 20:38:56 +02:00
kolbakilu	6cfa1c8ef4	Add lethal water.	2025-01-25 20:17:41 +02:00
kolbakilu	fad86984d3	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame	2025-01-25 19:22:20 +02:00
kolbakilu	34ccbbcb6d	Sculpt initial game map.	2025-01-25 19:21:55 +02:00
HSellis	e70a95ccee	physics accurate lantern	2025-01-25 19:18:36 +02:00
HSellis	6b92b2eda1	import lantern model	2025-01-25 18:57:08 +02:00
HSellis	0e14d4e4da	improved ambient spooky audio	2025-01-25 18:47:32 +02:00
HSellis	174cf7cb36	add back audio BPs	2025-01-25 18:18:54 +02:00
HSellis	37c6f8b573	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-25 18:15:48 +02:00
HSellis	401f58021e	random ambient audio	2025-01-25 18:15:41 +02:00
kolbakilu	9a84b061f1	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame	2025-01-25 17:51:35 +02:00
kolbakilu	51d469a77c	Fix main menu closing.	2025-01-25 17:51:27 +02:00
HSellis	8a67c9f0a0	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-25 17:35:48 +02:00
HSellis	ac8f090ffa	audio	2025-01-25 17:35:28 +02:00
kolbakilu	35a197306d	Fix first person character bp.	2025-01-25 17:33:51 +02:00
Kolbakilu	7abc403a08	Merge pull request 'Add main menu.' (#2) from feature-main-menu into master ... Reviewed-on: #2	2025-01-25 15:30:51 +00:00

131 changed files with 374 additions and 26 deletions

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

Expand all files Collapse all files

BIN

Content/Custom/Audio/BogFather/sosinblooper3.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/BogFather/sosintest.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/Cue_atmoloop0.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/Cue_titletrack.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/Flute/flööt0.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/Flute/flööt1.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/Flute/flööt1_5.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/Flute/flööt2.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/Flute/flööt2_5.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/atmoloop0.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/atmoloop1.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/atmoloop2.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/flööt0.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/flööt1.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/flööt1_5.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/flööt2.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/flööt2_5.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/impulse.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/title_track.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/titletrack.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/tool0.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/tool1.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/tool2.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Audio/tool3.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Blueprints/BP_AudioManager.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Blueprints/BP_BackgroundAudio.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Blueprints/BP_BogFather.uasset LFS

Binary file not shown.

BIN

Content/Custom/Blueprints/BP_Collectable.uasset LFS

Binary file not shown.

BIN

Content/Custom/Blueprints/BP_CollectableSpawner.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Blueprints/BP_DeathPlane.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Blueprints/BP_RandomAmbientAudio.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Blueprints/BP_WaterPlane.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Maps/BogEnvTest.umap LFS

Binary file not shown.

BIN

Content/Custom/Maps/GameMap_sharedassets/Dirt_LayerInfo.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Maps/GameMap_sharedassets/Grass_LayerInfo.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Maps/GameMap_sharedassets/Layer_2_LayerInfo.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Maps/landscape.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Maps/landscape_Mat.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Materials/M_Collectible.uasset LFS

Binary file not shown.

BIN

Content/Custom/Materials/M_CollectibleEmissive.uasset LFS

Binary file not shown.

BIN

Content/Custom/Materials/M_Darkness.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Materials/M_GlowingEye.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Materials/M_Water_Depth.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Materials/M_Water_Depth_Inst.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Menus/WP_Main_Menu.uasset LFS

Binary file not shown.

BIN

Content/Custom/Meshes/SM_WaterPlane.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Artboard_1.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Artboard_1_Mat.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Bush_dead.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Cranberry_NO_berry.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Cranberry_YES_berry.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Fabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_AO.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Fabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_AO_Mat.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Fabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_Displacement.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Fabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_Normal.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Fabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_Roughness.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Fern1.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Grass.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Ground_Log.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Ground_Stump__1_.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Kratt/Material_001.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Kratt/Material_002.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Kratt/Material_003.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Kratt/kratt_hark.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Kratt/kratt_ratas.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Kratt/kratt_vikat1.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Kratt/kratt_vikat2.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Latern/Material_008.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Latern/Material_009.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Latern/Material_012.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Latern/lantern.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Material.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Material_001.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Material_002.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Material_003.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Material_008.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Material_009.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Material_012.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Moss_green.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Mushroom_brown.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Mushroom_red.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Cube.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Cube_001.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Cube_002.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Cube_003.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Cube_004.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_001.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_002.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_003.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_004.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_005.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_006.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_007.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_008.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_009.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Plane.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Plane_001.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Plane_003.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Plane_021.uasset LFS Normal file

Binary file not shown.

BIN

Content/Custom/Models/Texture_Assets1_trimsheet_DisplacementMap.uasset LFS Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More