Compare commits

base: Philip:v0.1.0

Branches Tags

Philip:main

Philip:dev

Philip:v1.0.5

Philip:v1.0.0

Philip:v0.1.0

...

compare: Philip:main

Branches Tags

Philip:dev

Philip:main

Philip:v1.0.5

Philip:v1.0.0

Philip:v0.1.0

48 Commits

v0.1.0 ... main

Author	SHA1	Message	Date
PHILIP WHITE	347d41d1a9	Add Background Noise and Seagull SFX	2024-02-07 17:06:50 +00:00
PHILIP WHITE	ab47e2d2ff	Update Quak SFX to Remove Delay	2024-02-07 16:34:12 +00:00
PHILIP WHITE	9b971d1ae9	Bugfix Crash on Second Play Through	2024-02-07 16:32:06 +00:00
PHILIP WHITE	f239743e7f	Add Quack SFX to Asset Folder	2024-02-01 14:28:04 +00:00
PHILIP WHITE	a6f397fff3	Add All Assets for Props and Images	2024-01-29 17:26:01 +00:00
PHILIP WHITE	d1888cb342	Update Project for Lighting Build & Icon	2024-01-29 13:04:01 +00:00
KAJA MARYNIEWSKA	2e4a3ee5c0	Merge branch 'Kaja' into dev	2024-01-28 16:21:08 +00:00
KAJA MARYNIEWSKA	fb93213d6d	Update map	2024-01-28 16:20:03 +00:00
PHILIP WHITE	ea19f1306d	Update for License	2024-01-28 16:04:03 +00:00
PHILIP WHITE	7f025df828	Update Project to Update Team Name	2024-01-28 15:55:07 +00:00
PHILIP WHITE	605b54c746	Update Project Settings to Set Name	2024-01-28 15:21:07 +00:00
PHILIP WHITE	e4542cda4a	Update Start Menu	2024-01-28 15:15:57 +00:00
PHILIP WHITE	0f5b04ddd0	Merge branch 'dev' into Kaja	2024-01-28 14:49:47 +00:00
PHILIP WHITE	4726c17da6	Update Actors to Original Size	2024-01-28 14:49:17 +00:00
KAJA MARYNIEWSKA	856fe3dabf	Update for lvl	2024-01-28 14:48:26 +00:00
PHILIP WHITE	e0d763d035	Update Map for AI and Out of Bounds	2024-01-28 14:27:50 +00:00
KAJA MARYNIEWSKA	d6a7bbb90f	Merge branch 'Kaja' into dev ... # Conflicts: # SeagullGame/Content/Props/game_jam_veg_rack_export_1.uasset	2024-01-28 14:18:12 +00:00
KAJA MARYNIEWSKA	c2050e2b56	Update level	2024-01-28 14:17:12 +00:00
PHILIP WHITE	dbba90074a	Update Clerk AI for Animations	2024-01-28 14:12:52 +00:00
PHILIP WHITE	f1d673aeb7	Add Clerk with Animation	2024-01-28 13:39:39 +00:00
PHILIP WHITE	a06b5dad88	Add Veg Rack Prop for Mart	2024-01-28 13:15:47 +00:00
PHILIP WHITE	6faadc107d	Add Rest of Props to Actors for Pickup	2024-01-28 13:11:58 +00:00
PHILIP WHITE	6937f3c0a6	Merge remote-tracking branch 'origin/Ossie' into dev	2024-01-28 12:12:39 +00:00
PHILIP WHITE	5446a8afc7	Add More Props to Actors for Pickup	2024-01-28 12:12:15 +00:00
OSSIE NEJAT	cd5795f41d	World Aligned Floor ... floor is now world aligned	2024-01-28 12:10:49 +00:00
PHILIP WHITE	bc8002cbde	Add More Shelves Props for Mart	2024-01-28 12:01:44 +00:00
OSSIE NEJAT	4b5ee4adf7	Tesco Floor Tiles Texture and Mat ... babe wake up, its time to lick the floor.	2024-01-28 11:59:39 +00:00
PHILIP WHITE	71136ed37a	Add Modular Buildings	2024-01-28 11:36:26 +00:00
PHILIP WHITE	c24681e781	Add UI to Show Held & Craving	2024-01-28 11:24:13 +00:00
Kaja Maryniewska	607a070ca3	Merge branch 'Kaja' into dev	2024-01-28 11:17:48 +00:00
Kaja Maryniewska	5802837afd	Add files for modular pieces for a building	2024-01-28 11:17:05 +00:00
PHILIP WHITE	cc16db67bf	Update Seagull AI for Attacking & Dropping of Item	2024-01-28 10:23:08 +00:00
PHILIP WHITE	100b503285	Update Street Texture for Tiling	2024-01-28 10:22:39 +00:00
PHILIP WHITE	8e197d7c64	Update John to Have Cravings Displayed on Head	2024-01-28 10:22:18 +00:00
PHILIP WHITE	19cc9057c2	Merge remote-tracking branch 'origin/Ossie' into dev	2024-01-28 09:29:43 +00:00
Kaja Maryniewska	0657e009ed	Merge branch 'Kaja' into dev	2024-01-28 09:28:44 +00:00
Kaja Maryniewska	e2e04a4ed2	Update maps for street	2024-01-28 09:26:54 +00:00
OSSIE NEJAT	9782848640	Cleaning DLC ... babe, wake up. cleaning dlc just dropped	2024-01-27 21:38:06 +00:00
PHILIP WHITE	f538f127fc	Merge branch 'dev' of github.falmouth.ac.uk:Games-Academy-Student-Work-23-24/SeagullGame into dev	2024-01-27 21:31:17 +00:00
Kaja Maryniewska	102f871f04	Merge branch 'Kaja' into dev	2024-01-27 21:30:43 +00:00
Kaja Maryniewska	c34556f54f	Add files for bench and john	2024-01-27 21:30:18 +00:00
PHILIP WHITE	a506e89bea	Add 50% of Pickupable Props to Actors for Functionality	2024-01-27 21:30:12 +00:00
PHILIP WHITE	47451a9d6a	Import More Groceries Props into Engine	2024-01-27 19:24:28 +00:00
PHILIP WHITE	6d14939dce	Merge remote-tracking branch 'origin/dev' into dev	2024-01-27 18:52:54 +00:00
PHILIP WHITE	618ad5ddee	Merge remote-tracking branch 'origin/Ossie' into dev	2024-01-27 18:52:42 +00:00
Kaja Maryniewska	a127ed8988	Merge branch 'Kaja' into dev	2024-01-27 18:41:34 +00:00
Kaja Maryniewska	9dd81131ab	Add files for bin	2024-01-27 18:38:25 +00:00
OSSIE NEJAT	84adc18d60	Car ... Car	2024-01-27 18:05:29 +00:00

448 changed files with 1417 additions and 121 deletions

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

Show Stats Expand all files Collapse all files

BIN

Assets/3d_models/Kaja/objs/BIN.fbx (Stored with Git LFS) Normal file

Binary file not shown.

0

SeagullGame/3d_models/Kaja/objs/John_standing.fbx → Assets/3d_models/Kaja/objs/John_standing.fbx

BIN

Assets/3d_models/Kaja/objs/John_standing_geared_uo.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/objs/biblically_correct_bench.fbx (Stored with Git LFS) Normal file

Binary file not shown.

0

SeagullGame/3d_models/Kaja/objs/edwin_loaf.fbx → Assets/3d_models/Kaja/objs/edwin_loaf.fbx

BIN

Assets/3d_models/Kaja/objs/gay_building.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/objs/outside_modular/door.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/objs/outside_modular/modular_building.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/objs/outside_modular/window_thin.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/objs/outside_modular/window_wide].fbx (Stored with Git LFS) Normal file

Binary file not shown.

0

SeagullGame/3d_models/Kaja/objs/seagull_standing.fbx → Assets/3d_models/Kaja/objs/seagull_standing.fbx

0

SeagullGame/3d_models/Kaja/objs/seagull_standing_2.fbx → Assets/3d_models/Kaja/objs/seagull_standing_2.fbx

0

SeagullGame/3d_models/Kaja/objs/street.fbx → Assets/3d_models/Kaja/objs/street.fbx

0

SeagullGame/3d_models/Kaja/textures/Edwin/seagull_standing_standardSurface1_BaseColor.png → Assets/3d_models/Kaja/textures/Edwin/seagull_standing_standardSurface1_BaseColor.png

0

SeagullGame/3d_models/Kaja/textures/Edwin/seagull_standing_standardSurface1_Normal.png → Assets/3d_models/Kaja/textures/Edwin/seagull_standing_standardSurface1_Normal.png

0

SeagullGame/3d_models/Kaja/textures/Edwin/seagull_standing_standardSurface1_OcclusionRoughnessMetallic.png → Assets/3d_models/Kaja/textures/Edwin/seagull_standing_standardSurface1_OcclusionRoughnessMetallic.png

0

SeagullGame/3d_models/Kaja/textures/Edwin_loaf/edwin_loaf_standardSurface1_BaseColor.png → Assets/3d_models/Kaja/textures/Edwin_loaf/edwin_loaf_standardSurface1_BaseColor.png

0

SeagullGame/3d_models/Kaja/textures/Edwin_loaf/edwin_loaf_standardSurface1_Normal.png → Assets/3d_models/Kaja/textures/Edwin_loaf/edwin_loaf_standardSurface1_Normal.png

0

SeagullGame/3d_models/Kaja/textures/Edwin_loaf/edwin_loaf_standardSurface1_OcclusionRoughnessMetallic.png → Assets/3d_models/Kaja/textures/Edwin_loaf/edwin_loaf_standardSurface1_OcclusionRoughnessMetallic.png

0

SeagullGame/3d_models/Kaja/textures/John/John_standing_standardSurface1_BaseColor.png → Assets/3d_models/Kaja/textures/John/John_standing_standardSurface1_BaseColor.png

0

SeagullGame/3d_models/Kaja/textures/John/John_standing_standardSurface1_Normal.png → Assets/3d_models/Kaja/textures/John/John_standing_standardSurface1_Normal.png

0

SeagullGame/3d_models/Kaja/textures/John/John_standing_standardSurface1_OcclusionRoughnessMetallic.png → Assets/3d_models/Kaja/textures/John/John_standing_standardSurface1_OcclusionRoughnessMetallic.png

BIN

Assets/3d_models/Kaja/textures/John_geared_up/John_standing_geared_uo_standardSurface1_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/John_geared_up/John_standing_geared_uo_standardSurface1_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/John_geared_up/John_standing_geared_uo_standardSurface1_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/Street/street_standardSurface1_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/Street/street_standardSurface1_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/Street/street_standardSurface1_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/bench/biblically_correct_bench_standardSurface1_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/bench/biblically_correct_bench_standardSurface1_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/bench/biblically_correct_bench_standardSurface1_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/bin/BIN_standardSurface1_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/bin/BIN_standardSurface1_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/bin/BIN_standardSurface1_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/building/modular_building_standardSurface1_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/building/modular_building_standardSurface1_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/building/modular_building_standardSurface1_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/door/door_standardSurface1_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/door/door_standardSurface1_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/door/door_standardSurface1_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/window_thin/window_thin_standardSurface1_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/window_thin/window_thin_standardSurface1_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/window_thin/window_thin_standardSurface1_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/window_wide/window_wide]_standardSurface1_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/window_wide/window_wide]_standardSurface1_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/3d_models/Kaja/textures/modular_pieces/window_wide/window_wide]_standardSurface1_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

0

SeagullGame/3d_models/Ossie/Basket.fbx → Assets/3d_models/Ossie/Basket.fbx

0

SeagullGame/3d_models/Ossie/Coffee/CofeeMachine.fbx → Assets/3d_models/Ossie/Coffee/CofeeMachine.fbx

0

SeagullGame/3d_models/Ossie/Coffee/CoffeeCup.fbx → Assets/3d_models/Ossie/Coffee/CoffeeCup.fbx

0

SeagullGame/3d_models/Ossie/Coffee/Costa Money_M_Cofee_BaseColor.png → Assets/3d_models/Ossie/Coffee/Costa Money_M_Cofee_BaseColor.png

0

SeagullGame/3d_models/Ossie/Coffee/Costa Money_M_Coffee_Emissive.png → Assets/3d_models/Ossie/Coffee/Costa Money_M_Coffee_Emissive.png

0

SeagullGame/3d_models/Ossie/Coffee/Costa Money_M_Coffee_OcclusionRoughnessMetallic.png → Assets/3d_models/Ossie/Coffee/Costa Money_M_Coffee_OcclusionRoughnessMetallic.png

0

SeagullGame/3d_models/Ossie/Slushie/Slushie Bird_M_Slushie_BaseColor.png → Assets/3d_models/Ossie/Slushie/Slushie Bird_M_Slushie_BaseColor.png

0

SeagullGame/3d_models/Ossie/Slushie/Slushie Bird_M_Slushie_Emissive.png → Assets/3d_models/Ossie/Slushie/Slushie Bird_M_Slushie_Emissive.png

0

SeagullGame/3d_models/Ossie/Slushie/Slushie Bird_M_Slushie_OcclusionRoughnessMetallic.png → Assets/3d_models/Ossie/Slushie/Slushie Bird_M_Slushie_OcclusionRoughnessMetallic.png

0

SeagullGame/3d_models/Ossie/Slushie/Slushie Cup.fbx → Assets/3d_models/Ossie/Slushie/Slushie Cup.fbx

0

SeagullGame/3d_models/Ossie/Slushie/Slushie Machine.fbx → Assets/3d_models/Ossie/Slushie/Slushie Machine.fbx

0

SeagullGame/3d_models/Ossie/Troley.fbx → Assets/3d_models/Ossie/Troley.fbx

BIN

Assets/Misc/Crisp_pack_blue.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Crisp_pack_green.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Crisp_pack_red.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Crisp_pack_yellow.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/FatJohnCover-min.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/FatJohnCover.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/FreddySeagull.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Goofy_Running.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Idle.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/One_Hand_Club_Combo.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/PhilQuak.mp3 (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/PhilQuak.wav (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Pringles_blue.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Pringles_green.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Pringles_red.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Running.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Standing_Melee_Attack_Downward.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Walking.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/Walking_1.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/chocolate_bar_vegimite.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/chocolate_caramel.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/chocolate_milk.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/chocolate_pink.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/clearly.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/coke_2L.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/coke_bottle.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/coke_can.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/coke_can_L.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/diet_coke_can.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/diet_coke_can_L.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/domestos.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/fairy_liquid.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/fanta_2L.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/fanta_bottle.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/fanta_can.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/fanta_can_L.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/fatjognbaricon.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/fatjohn.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/free_standing_shelf_export.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/game_jam_bottle_assets_Till_black_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/game_jam_bottle_assets_Till_black_Emissive.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Misc/game_jam_bottle_assets_Till_black_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

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