Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame

eestikeelseks tekst
Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame
2025-01-26 15:20:03 +02:00 · 2025-01-26 15:19:02 +02:00 · 2025-01-26 15:07:49 +02:00 · 2025-01-26 15:07:42 +02:00 · 2025-01-26 15:06:53 +02:00 · 2025-01-26 15:06:50 +02:00
213 changed files with 615 additions and 35 deletions
@@ -4,14 +4,14 @@
 +EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore)))

 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap
+EditorStartupMap=/Game/Custom/Maps/GameMap.GameMap
 LocalMapOptions=
 TransitionMap=
 bUseSplitscreen=True
 TwoPlayerSplitscreenLayout=Horizontal
 ThreePlayerSplitscreenLayout=FavorTop
 GameInstanceClass=/Script/Engine.GameInstance
-GameDefaultMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap
+GameDefaultMap=/Game/Custom/Maps/GameMap.GameMap
 ServerDefaultMap=/Engine/Maps/Entry
 GlobalDefaultGameMode=/Game/FirstPerson/Blueprints/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C
 GlobalDefaultServerGameMode=None
@@ -1,6 +1,6 @@
 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=6893833248F0DE513602D3A82B0AE27A
-ProjectName=First Person BP Game Template
+ProjectName=Scary Bog Game

 [StartupActions]
 bAddPacks=True
@@ -8,3 +8,4 @@ InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent")

 [SectionsToSave]
 +Section=StartupActions
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
HSellis	9e2176324a	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-26 15:20:03 +02:00
HSellis	295880733a	eestikeelseks tekst	2025-01-26 15:19:02 +02:00
Kolbakilu	67d415e5d9	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame	2025-01-26 15:07:49 +02:00
Kolbakilu	e7da3cc79c	Create victory screen.	2025-01-26 15:07:42 +02:00
HSellis	c733a874aa	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-26 15:06:53 +02:00
HSellis	227a6c71e1	titletrack looping	2025-01-26 15:06:50 +02:00
HSellis	791ecd9d19	small fixes	2025-01-26 15:06:18 +02:00
Kolbakilu	740773def7	Improvements.	2025-01-26 15:00:19 +02:00
Kolbakilu	c174a20c4d	Material edit.	2025-01-26 14:53:42 +02:00
Kolbakilu	b714c02847	Make eyes glow.	2025-01-26 14:52:55 +02:00
Kolbakilu	b47f0b3a46	Improve menu and fix crossroad.	2025-01-26 14:46:01 +02:00
Kolbakilu	c7513d4941	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame	2025-01-26 14:12:15 +02:00
Kolbakilu	b8654488b3	Make bog father ai better.	2025-01-26 14:12:07 +02:00
HSellis	85aff46081	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-26 14:04:44 +02:00
HSellis	8474fdfaa3	vanapagan textures	2025-01-26 14:03:29 +02:00
HSellis	5b8ad041d4	spawn vanapagan	2025-01-26 14:02:49 +02:00
Kolbakilu	389a961d4e	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame	2025-01-26 13:52:07 +02:00
Kolbakilu	bc39c318fe	UI changes.	2025-01-26 13:52:04 +02:00
HSellis	09669e7f68	also play success sound when consturcyt	2025-01-26 13:21:05 +02:00
Kolbakilu	08caea6094	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame	2025-01-26 13:12:01 +02:00
Kolbakilu	96c32871a5	Fix restart functionality.	2025-01-26 13:11:53 +02:00
HSellis	89f1171680	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-26 13:07:58 +02:00
HSellis	e16f6fe506	spawn kratt if successful	2025-01-26 13:07:38 +02:00
Kolbakilu	6f6f608a2d	Make game map the default map.	2025-01-26 13:03:18 +02:00
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