Commit Graph

72 Commits

Author SHA1 Message Date
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
dbba90074a Update Clerk AI for Animations 2024-01-28 14:12:52 +00:00
f1d673aeb7 Add Clerk with Animation 2024-01-28 13:39:39 +00:00
a06b5dad88 Add Veg Rack Prop for Mart 2024-01-28 13:15:47 +00:00
6faadc107d Add Rest of Props to Actors for Pickup 2024-01-28 13:11:58 +00:00
6937f3c0a6 Merge remote-tracking branch 'origin/Ossie' into dev 2024-01-28 12:12:39 +00:00
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
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
71136ed37a Add Modular Buildings 2024-01-28 11:36:26 +00:00
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
cc16db67bf Update Seagull AI for Attacking & Dropping of Item 2024-01-28 10:23:08 +00:00
100b503285 Update Street Texture for Tiling 2024-01-28 10:22:39 +00:00
8e197d7c64 Update John to Have Cravings Displayed on Head 2024-01-28 10:22:18 +00:00
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
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
a506e89bea Add 50% of Pickupable Props to Actors for Functionality 2024-01-27 21:30:12 +00:00
47451a9d6a Import More Groceries Props into Engine 2024-01-27 19:24:28 +00:00
6d14939dce Merge remote-tracking branch 'origin/dev' into dev 2024-01-27 18:52:54 +00:00
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
33540ec21f Add Test Production Map for Interview 2024-01-27 18:01:34 +00:00
b3d3c30528 Merge branch 'Ossie' into dev 2024-01-27 16:41:59 +00:00
a465e4e1a6 Merge branch 'dev' of github.falmouth.ac.uk:Games-Academy-Student-Work-23-24/SeagullGame into dev 2024-01-27 16:41:16 +00:00
695c1dee6d Add Scene Props into Engine 2024-01-27 16:41:02 +00:00
3ecda8f44e Update UI for Updated Bars 2024-01-27 16:40:17 +00:00
Kaja Maryniewska
9e1e88e460 Merge branch 'Kaja' into dev 2024-01-27 16:36:04 +00:00
Kaja Maryniewska
fcac0951f0 Add files for street 2024-01-27 16:35:27 +00:00
OSSIE NEJAT
14a02812e8 Sexy Props Drop 1
Machines, cups, trolley, basket
2024-01-27 16:19:17 +00:00
9e986eb2b2 Bugfix Enemy Seagull Not Chasing 2024-01-27 15:41:14 +00:00
c8b3fb37c0 Update Character for Zooming In and Out via Scroll 2024-01-27 15:10:34 +00:00
e8edfaf51d Add Seagull Enemy AI for Random Patrol 2024-01-27 14:42:42 +00:00
7df42f305b Add John Static Mesh & Texture 2024-01-27 14:42:03 +00:00
c2043dd1ad Texture in Engine Seagulls 2024-01-27 14:28:33 +00:00
Kaja Maryniewska
dfa3a8e9b8 Merge branch 'Kaja' into dev 2024-01-27 14:22:24 +00:00
Kaja Maryniewska
d4f096c66e Add files for Edwin loaf and John 2024-01-27 14:21:48 +00:00
9fc962cd77 Update Character for Loaf Crouch 2024-01-27 14:20:46 +00:00
Kaja Maryniewska
d1b19e6f71 Merge branch 'Kaja' into dev 2024-01-27 13:42:34 +00:00
Kaja Maryniewska
63e9ab9956 Add texture for loaf pose 2024-01-27 13:42:05 +00:00