Commit Graph

668 Commits

Author SHA1 Message Date
7cbc80627b Merge pull request 'damianContentFreeze' (#33) from damianContentFreeze into main
Reviewed-on: #33
2025-10-17 09:05:05 +00:00
c94cd4f567 Merge branch 'main' into damianContentFreeze 2025-10-17 09:04:54 +00:00
15bc868cad Modified The size of the Images in dialogue 2025-10-17 11:04:15 +02:00
b1542e4a0b Eliminated Duplicated Puzzle Steps 2025-10-17 10:45:52 +02:00
Michal Pikulski
dafccdc286 Add main menu prefab 2025-10-17 09:57:20 +02:00
journaliciouz
933e29edf9 AnneLise voicedump 2025-10-17 01:04:30 +02:00
journaliciouz
d520f1c1c3 AudioPrep 2025-10-17 00:44:20 +02:00
DamianCorazza
7f31ec8e6a Added CameraSwitcher to the nests and Repositioned elements for a more compact view 2025-10-17 00:26:22 +02:00
313ab7a365 Merge pull request 'diving-outrocinematic' (#32) from diving-outrocinematic into main
Reviewed-on: #32
2025-10-16 21:59:51 +00:00
Michal Pikulski
3fc43fa92d Hook up the score display 2025-10-16 23:59:25 +02:00
Michal Pikulski
b2384269e5 Update the Pause menu flow to be slightly less scoffed 2025-10-16 23:19:33 +02:00
journaliciouz
09ae4b5ba7 WIP 2 2025-10-16 22:45:13 +02:00
journaliciouz
4fc005b082 WIP 2025-10-16 22:35:23 +02:00
journaliciouz
6f6333c8c4 Merge branch 'main' into diving-outrocinematic 2025-10-16 22:26:04 +02:00
dfb67a80c4 Merge pull request 'Redo puzzles authoring and registration' (#30) from revamp_puzzle_registration into main
Reviewed-on: #30
2025-10-16 19:29:53 +00:00
Michal Pikulski
50448c5bd3 Revamp the prompt system, the bootstrapper system, the starting cinematic 2025-10-16 19:43:24 +02:00
eab8899720 WIP game over diving 2025-10-16 16:23:48 +02:00
DamianCorazza
df604fbc03 Removed interactions with the birds after they where spawned and randomized the pitch of the honks. 2025-10-16 16:09:16 +02:00
DamianCorazza
47f342b9ae Small fix to the puzzle indicators
Left a blocked step slot empty, filled it and everything works.
2025-10-16 15:57:01 +02:00
8c4f821865 Merge branch 'main' into diving-outrocinematic 2025-10-16 15:40:08 +02:00
DamianCorazza
5e790a2438 Added Decorations for the Soundbird Area, Added colliders to annalise bush, added grass decorations 2025-10-16 15:39:06 +02:00
3b1c977a2e Merge pull request 'DamianBranch' (#31) from DamianBranch into main
Reviewed-on: #31
2025-10-16 12:10:54 +00:00
5dd9986faa Merge branch 'main' into DamianBranch 2025-10-16 12:10:45 +00:00
Michal Pikulski
cc6e89c003 Fix issue with event triggering multiple times at the end of the minigame 2025-10-15 23:20:38 +02:00
DamianCorazza
10aef4d083 Added a van that transports horns 2025-10-15 18:14:37 +02:00
b425d2b4f4 Stuck cinematics 2025-10-15 17:35:34 +02:00
DamianCorazza
3cae365b52 Update Quarry.unity 2025-10-15 16:27:39 +02:00
DamianCorazza
2b2ac9a3dd Update PulverCucumberSmack1.playable 2025-10-15 16:27:25 +02:00
dcd8dc63d0 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction 2025-10-15 15:58:24 +02:00
5f46c963b5 Implemented Diving tutorial 2025-10-15 15:58:19 +02:00
Michal Pikulski
c0f141f5ac Fix issues with the indicator null checks 2025-10-15 14:02:12 +02:00
DamianCorazza
33af26fd73 Added the puzzle indicators to the FootballBird Puzzle 2025-10-15 13:59:51 +02:00
19a1a2da51 Merge pull request 'DamianBranch' (#29) from DamianBranch into main
Reviewed-on: #29
2025-10-15 10:54:59 +00:00
6b599ca2f9 Merge branch 'main' into DamianBranch 2025-10-15 10:54:52 +00:00
14bcfe51c9 Added audio mixers ahead of VO work 2025-10-15 12:54:03 +02:00
Michal Pikulski
d80b29a7a7 Remove puzzle step indicators after puzzle step successfuly completed 2025-10-15 08:28:07 +02:00
DamianCorazza
dd85200e9c Fixed the puzzle step gating, and some changes in the minigame 2025-10-14 21:15:02 +02:00
DamianCorazza
782e068575 Monster Animations and monster flipping according to which wall it's coming from 2025-10-14 21:00:03 +02:00
DamianCorazza
1237f41265 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction 2025-10-14 17:08:56 +02:00
DamianCorazza
d0b0094092 Fixed the locked puzzle steps, it should be working now 2025-10-14 17:08:37 +02:00
34fcaa9c71 Combination animation implemented 2025-10-14 16:40:47 +02:00
67b8aea93a Pulver can carry shit 2025-10-14 16:20:57 +02:00
Michal Pikulski
e8180b21bf Strip debug logging from the game, fix screen weirdness 2025-10-14 15:54:11 +02:00
Michal Pikulski
18be597424 Add card inventory classes and helpers 2025-10-14 15:54:11 +02:00
DamianCorazza
e8bf6fbded Fixed tiles not spawning and reduced the speed of the descent. 2025-10-14 14:13:10 +02:00
d2d6228383 Merge pull request 'Added alerts and modified the rocks in the environment.' (#28) from DamianBranch into main
Reviewed-on: #28
2025-10-14 11:29:36 +00:00
2b58e9d670 Merge branch 'main' into DamianBranch 2025-10-14 11:29:29 +00:00
Michal Pikulski
9780991a76 Update the orientation enforcer to periodically check the orientation in diving minigamw 2025-10-14 12:49:22 +02:00
Michal Pikulski
21bec076a9 [Bug] Fix the issue with input being blocked after missed camera sequence 2025-10-14 11:48:19 +02:00
9c44a0c91f photo_input_switch (#27)
Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com>
Reviewed-on: #27
2025-10-14 07:09:16 +00:00