Compare commits

base: Kolbakilu/ScaryBogGame:feature-main-menu

Branches Tags

Kolbakilu/ScaryBogGame:master Kolbakilu/ScaryBogGame:feature-main-menu

..

compare: Kolbakilu/ScaryBogGame:96c8c6ecf2dc61f9b326ac5068fc49b90c5b010c

Branches Tags

Kolbakilu/ScaryBogGame:master Kolbakilu/ScaryBogGame:feature-main-menu

51 Commits

feature-main-menu .. 96c8c6ecf2

Author	SHA1	Message	Date
Kolbakilu	96c8c6ecf2	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame	2025-01-26 12:58:29 +02:00
Kolbakilu	1d0080239c	create game over screen.	2025-01-26 12:58:12 +02:00
HSellis	48c6995af8	kratt audio	2025-01-26 12:48:55 +02:00
HSellis	b89a47f8f9	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-26 12:48:21 +02:00
HSellis	102ae4cd6c	kratt components to main map + show text if failed to construct kratt	2025-01-26 12:48:11 +02:00
Kolbakilu	2f7c58bc9e	Improve main menu.	2025-01-26 12:11:09 +02:00
Kolbakilu	4299e49c6c	Fix nail material.	2025-01-26 11:04:04 +02:00
Kolbakilu	633bffc4e7	Modify materials.	2025-01-26 11:00:11 +02:00
HSellis	ffa91c49f5	kratt components	2025-01-26 10:54:02 +02:00
HSellis	0f16d5cc2e	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-26 10:53:07 +02:00
HSellis	5c4fcdb67e	more kratt components	2025-01-26 10:52:56 +02:00
Kolbakilu	76eb19976c	Add walkways to map.	2025-01-26 10:51:35 +02:00
HSellis	3088b19c7a	can construct kratt on crossroad	2025-01-26 10:30:44 +02:00
Kolbakilu	dd7e8c42b0	Walkway material.	2025-01-26 10:10:30 +02:00
Kolbakilu	7a1a7e0b55	Add walkway parts.	2025-01-26 10:00:15 +02:00
Kolbakilu	fed8ac6b11	Improve foliage collision.	2025-01-26 09:53:49 +02:00
Kolbakilu	d9b1d5c66b	Modify main menu.	2025-01-26 09:18:14 +02:00
HSellis	5d1be80da9	add back lost uassets	2025-01-26 09:06:35 +02:00
Kolbakilu	55c981c012	Fix merge problem.	2025-01-26 09:02:39 +02:00
Kolbakilu	b0d1a66857	Make roads.	2025-01-26 08:53:24 +02:00
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

174 changed files with 501 additions and 30 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

Content/Custom/Audio/BogFather/sosinblooper3.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/BogFather/sosintest.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Cue_atmoloop0.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Cue_titletrack.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Flute/flööt0.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Flute/flööt1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Flute/flööt1_5.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Flute/flööt2.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Flute/flööt2_5.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/atmoloop0.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/atmoloop1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/atmoloop2.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/failed_to_kratt.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/flööt0.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/flööt1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/flööt1_5.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/flööt2.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/flööt2_5.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/impulse.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/sulps.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/title_track.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/titletrack.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/tool0.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/tool1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/tool2.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/tool3.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_AudioManager.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_BackgroundAudio.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_BogFather.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_Collectable.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_CollectableSpawner.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_Crossroad.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_DeathPlane.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_RandomAmbientAudio.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_WaterPlane.uasset

LFS

BIN

Binary file not shown.

Content/Custom/IA_Interact.uasset

BIN

Binary file not shown.

Content/Custom/Maps/BogEnvTest.umap

LFS

BIN

Binary file not shown.

Content/Custom/Maps/GameMap.umap

LFS

BIN

Binary file not shown.

Content/Custom/Maps/GameMap_sharedassets/Dirt_LayerInfo.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Maps/GameMap_sharedassets/Grass_LayerInfo.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Maps/GameMap_sharedassets/Layer_2_LayerInfo.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Maps/GameMap_sharedassets/road_LayerInfo.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Maps/landscape.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Maps/landscape_Mat.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Materials/M_Collectible.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Materials/M_CollectibleEmissive.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Materials/M_Darkness.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Materials/M_GlowingEye.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Materials/M_Landscape.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Materials/M_Water_Depth.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Materials/M_Water_Depth_Inst.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Materials/M_Wooden_Board.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Menus/WBP_Game_Over_Menu.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Menus/WBP_UI.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Menus/WP_Main_Menu.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Meshes/SM_WaterPlane.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Artboard_1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Artboard_1_Mat.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Bush_dead.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cracked_Wooden_Planks_ui2leaxlw_2K_AO.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cracked_Wooden_Planks_ui2leaxlw_2K_BaseColor.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cracked_Wooden_Planks_ui2leaxlw_2K_Bump.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cracked_Wooden_Planks_ui2leaxlw_2K_Cavity.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cracked_Wooden_Planks_ui2leaxlw_2K_Displacement.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cracked_Wooden_Planks_ui2leaxlw_2K_Gloss.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cracked_Wooden_Planks_ui2leaxlw_2K_Normal.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cracked_Wooden_Planks_ui2leaxlw_2K_Roughness.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cracked_Wooden_Planks_ui2leaxlw_2K_Specular.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cranberry_NO_berry.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cranberry_YES_berry.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Cube.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Fabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_AO.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Fabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_AO_Mat.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Fabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_Displacement.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Fabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_Normal.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Fabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_Roughness.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Fern1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Grass.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Ground_Log.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Ground_Stump__1_.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/KRATT_ANTLERS.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/Material_001.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/Material_002.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/Material_003.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_LUUD.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_hark.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_ratas.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_redel.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_skull.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_vikat1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_vikat2.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/krattskull1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/krattskull1_Mat.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Latern/Material_008.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Latern/Material_009.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Latern/Material_012.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Latern/lantern.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Material.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Material_001.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Material_002.uasset

LFS

BIN

Binary file not shown.

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