Commit Graph

Select branches

Hide Pull Requests

DamianBranch

add_debug_settings_and_readme

animation-pipeline-overhaul

audio-overhaul

backupingMyQuarry

camera_framing

card-juice

card_album

card_system

cards_rewrite

cement_statue

clean_up_logging

cleanup

commit_tiles_only

continue_with_minigame

damianContentFreeze

dialogue_graph

dialogue_images

diving_obstacles

fort_fight

hud_unification

implementingFlash

input_modes

integration_test

kill-json-player

lifecycle_docs_and_updates

load_save_puzzles

main

michal_dumb

minigame_end_wip

minigame_switch_improvements

pause_minigame

photo_input_switch

pooper_minigame

puzzlestep_indicators

revamp_puzzle_registration

rewrite_interactables

screen_orientation_fun

settings_revamp

sort_minigame

trash_maze

ui-animation

ui-overhaul

unity_timeline_on_interact

update_tooling_and_docs

valentines

work_on_interactions

work_on_interactions_rebased

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#9

vertical-slice

Mono Color

• df604fbc03 Removed interactions with the birds after they where spawned and randomized the pitch of the honks. DamianCorazza 2025-10-16 16:09:16 +02:00
• 47f342b9ae Small fix to the puzzle indicators DamianCorazza 2025-10-16 15:57:01 +02:00
• 8c4f821865 Merge branch 'main' into diving-outrocinematic AlexanderT 2025-10-16 15:40:08 +02:00
• 5e790a2438 Added Decorations for the Soundbird Area, Added colliders to annalise bush, added grass decorations DamianCorazza 2025-10-16 15:39:06 +02:00
• 3b1c977a2e Merge pull request 'DamianBranch' (#31) from DamianBranch into main damian 2025-10-16 12:10:54 +00:00
• 5dd9986faa Merge branch 'main' into DamianBranch damian 2025-10-16 12:10:45 +00:00
• cc6e89c003 Fix issue with event triggering multiple times at the end of the minigame Michal Pikulski 2025-10-15 23:20:38 +02:00
• 10aef4d083 Added a van that transports horns DamianCorazza 2025-10-15 18:14:37 +02:00
• b425d2b4f4 Stuck cinematics AlexanderT 2025-10-15 17:35:34 +02:00
• 3cae365b52 Update Quarry.unity DamianCorazza 2025-10-15 16:27:39 +02:00
• 2b2ac9a3dd Update PulverCucumberSmack1.playable DamianCorazza 2025-10-15 16:27:25 +02:00
• dcd8dc63d0 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-10-15 15:58:24 +02:00
• 5f46c963b5 Implemented Diving tutorial AlexanderT 2025-10-15 15:58:19 +02:00
• c0f141f5ac Fix issues with the indicator null checks Michal Pikulski 2025-10-15 14:02:12 +02:00
• 33af26fd73 Added the puzzle indicators to the FootballBird Puzzle DamianCorazza 2025-10-15 13:59:51 +02:00
• 19a1a2da51 Merge pull request 'DamianBranch' (#29) from DamianBranch into main damian 2025-10-15 10:54:59 +00:00
• 6b599ca2f9 Merge branch 'main' into DamianBranch damian 2025-10-15 10:54:52 +00:00
• 14bcfe51c9 Added audio mixers ahead of VO work AlexanderT 2025-10-15 12:54:03 +02:00
• d80b29a7a7 Remove puzzle step indicators after puzzle step successfuly completed Michal Pikulski 2025-10-15 08:28:07 +02:00
• dd85200e9c Fixed the puzzle step gating, and some changes in the minigame DamianCorazza 2025-10-14 21:15:02 +02:00
• 782e068575 Monster Animations and monster flipping according to which wall it's coming from DamianCorazza 2025-10-14 21:00:03 +02:00
• 1237f41265 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction DamianCorazza 2025-10-14 17:08:56 +02:00
• d0b0094092 Fixed the locked puzzle steps, it should be working now DamianCorazza 2025-10-14 17:08:37 +02:00
• 34fcaa9c71 Combination animation implemented AlexanderT 2025-10-14 16:40:47 +02:00
• 67b8aea93a Pulver can carry shit AlexanderT 2025-10-14 16:20:57 +02:00
• e8180b21bf Strip debug logging from the game, fix screen weirdness Michal Pikulski 2025-10-14 15:53:58 +02:00
• 18be597424 Add card inventory classes and helpers Michal Pikulski 2025-10-14 14:57:50 +02:00
• e8bf6fbded Fixed tiles not spawning and reduced the speed of the descent. DamianCorazza 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 damian 2025-10-14 11:29:36 +00:00
• 2b58e9d670 Merge branch 'main' into DamianBranch damian 2025-10-14 11:29:29 +00:00
• 9780991a76 Update the orientation enforcer to periodically check the orientation in diving minigamw Michal Pikulski 2025-10-14 12:49:22 +02:00
• 21bec076a9 [Bug] Fix the issue with input being blocked after missed camera sequence Michal Pikulski 2025-10-14 11:48:19 +02:00
• 9c44a0c91f photo_input_switch (#27) tschesky 2025-10-14 07:09:16 +00:00
• 20b3ce7136 Fix issue with level switching and update the settings to remove reduntant ones photo_input_switch Michal Pikulski 2025-10-14 09:05:51 +02:00
• 05f63b28a0 Add an input switch to the minigame settings and fix monster spawn issues Michal Pikulski 2025-10-14 09:04:05 +02:00
• 2573e7f80e Add a system for setting up "real" camera framing to work between devices (#26) tschesky 2025-10-14 04:56:00 +00:00
• ddbeb0fca3 Added alerts and modified the rocks in the environment. Damian 2025-10-13 17:10:25 +02:00
• 0b966e9976 Working screen anchoring camera_framing Michal Pikulski 2025-10-13 16:31:52 +02:00
• a55ba5e29c First steps with camera framing Michal Pikulski 2025-10-13 15:34:07 +02:00
• aefff3d050 Semi-working intro cinematic with loading screen Michal Pikulski 2025-10-13 14:25:11 +02:00
• 65e14c07d2 Fix bug where input was blocked from levels other than main menu Michal Pikulski 2025-10-13 12:41:04 +02:00
• 13ef0a60da Merge pull request 'DamianBranch' (#25) from DamianBranch into main damian 2025-10-13 10:21:37 +00:00
• af4bddf1e3 Merge branch 'main' into DamianBranch damian 2025-10-13 10:17:54 +00:00
• 447d33fe55 Add a loading screen between scenes Michal Pikulski 2025-10-13 10:41:58 +02:00
• ab84c97675 Add skip functionality to Cinematics Manager Michal Pikulski 2025-10-13 09:22:18 +02:00
• f150ad0ce4 Fix bug with Pulver not returning to his usual movement after item pickup Michal Pikulski 2025-10-12 01:17:21 +02:00
• d5b30bdd99 Bandaid fix for input manager issues. Remove ass from applehills overworld. Michal Pikulski 2025-10-12 00:51:56 +02:00
• 75826f2dc9 Final addition of the cinematic managers Damian 2025-10-10 17:26:55 +02:00
• 57652b87f6 Merge branch 'main' into DamianBranch Damian 2025-10-10 16:40:37 +02:00
• 9359c47499 Added Decorations Damian 2025-10-10 16:25:03 +02:00
• 64bafa9ff8 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction Michal Pikulski 2025-10-10 16:19:10 +02:00
• 5b3f77c67b Simple QuickAccess setting to more easily retrieve common data Michal Pikulski 2025-10-10 16:19:05 +02:00
• 9475a70d09 Re-added maps AlexanderT 2025-10-10 16:03:48 +02:00
• 7288228b99 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-10-10 15:56:07 +02:00
• 9f630e832d Intro cinematic plays when playing from mainmenu AlexanderT 2025-10-10 15:51:49 +02:00
• 353c8f2f36 Merge pull request 'Implement Debug settings and provide an overview of the settings madness' (#24) from add_debug_settings_and_readme into main tschesky 2025-10-10 13:49:56 +00:00
• 81a6becd44 Implement Debug settings and provide an overview of the settings madness add_debug_settings_and_readme Michal Pikulski 2025-10-10 15:47:38 +02:00
• 73b4ea919b Merge pull request 'Add backbone for card creation and implement Camera minigame mechanics' (#23) from card_album into main tschesky 2025-10-10 12:56:09 +00:00
• 5058e96b48 Integrate the changes into Minigame Level card_album Michal Pikulski 2025-10-10 14:53:49 +02:00
• 0c5546efd2 Add backbone for card creation and implement Camera minigame mechanics Michal Pikulski 2025-10-10 14:31:51 +02:00
• d9039ce655 Merge pull request 'Commit tile prefabs' (#22) from commit_tiles_only into main tschesky 2025-10-10 12:49:32 +00:00
• 1fe48c995b Commmit minigame and tile logic Damian 2025-10-10 14:45:23 +02:00
• 6b1eb45490 Commit tile prefabs commit_tiles_only Damian 2025-10-10 14:45:07 +02:00
• 9d8dd28efd Added sound and cinematics managers to boot settings AlexanderT 2025-10-10 10:07:08 +02:00
• b777450bd1 Anne Lise bush behavior update journaliciouz 2025-10-09 16:38:27 +02:00
• 4ea8e7d16b Merge pull request 'DamianBranch' (#21) from DamianBranch into main damian 2025-10-09 11:50:47 +00:00
• 9781653430 Modified The Tiles Damian 2025-10-09 13:49:25 +02:00
• 3bd43a4d6d Added New Diving Tiles to the Minigame Damian 2025-10-08 17:15:20 +02:00
• 92f935f272 Refactored Anne Lise bush into state machine AlexanderT 2025-10-08 15:47:36 +02:00
• a5fab5ba86 Tweaked some Pulver transitions so he is not sliding in idle AlexanderT 2025-10-08 13:03:56 +02:00
• a8a6f7d33f Merge pull request 'Add a pausable interface and make minigameobjecs pausable' (#20) from pause_minigame into main tschesky 2025-10-08 10:37:46 +00:00
• 0e17516df7 Add a pausable interface and make minigameobjecs pausable pause_minigame Michal Pikulski 2025-10-08 12:36:08 +02:00
• 3807ac652c Add support for images in dialogue windows (#19) tschesky 2025-10-08 09:34:58 +00:00
• 1224d1ba03 Add text field support for wrap dialogue_images Michal Pikulski 2025-10-08 11:31:40 +02:00
• 5ad3ae8815 Working dialogue images mixed with text Michal Pikulski 2025-10-08 11:27:27 +02:00
• 1a05f89226 First pass on the image drawing Michal Pikulski 2025-10-08 10:51:14 +02:00
• 7b949c5cb8 Merge pull request 'DamianBranch' (#18) from DamianBranch into main damian 2025-10-08 08:14:27 +00:00
• 005cf510d5 Changes to some Lurespots DamianCorazza 2025-10-07 23:15:19 +02:00
• a91b776c20 WIP Ended the BallTree Damian 2025-10-07 16:56:52 +02:00
• d6ed35969d Fix quarry level Michal Pikulski 2025-10-07 14:26:33 +02:00
• a826256d1f Update Quarry.unity backupingMyQuarry Damian 2025-10-07 13:16:08 +02:00
• 0a553162a6 Pull from Michal Stuff Damian 2025-10-07 13:14:45 +02:00
• dea470f93f Replaced almost all placeholders with final art Damian 2025-10-07 13:04:14 +02:00
• d0d785d605 te-he, compile error Michal Pikulski 2025-10-07 13:00:58 +02:00
• eb938f9adb Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction Michal Pikulski 2025-10-07 12:57:23 +02:00
• 10992b43cc Unity Timeline Interaction System Integration (#17) tschesky 2025-10-07 10:57:11 +00:00
• 092e2a6b32 Final docs update unity_timeline_on_interact Michal Pikulski 2025-10-07 12:52:18 +02:00
• e1ab0ea937 Add playable timelines and jazz up the documentation Michal Pikulski 2025-10-07 12:32:50 +02:00
• bdec77d36f Update to the timeline triggering logic Michal Pikulski 2025-10-06 16:16:41 +02:00
• fd611ac27f Semi-working timelines integration Michal Pikulski 2025-10-06 15:30:41 +02:00
• f845673eca Remove dependencies on legacy variables in GameManager.Instance Michal Pikulski 2025-10-07 10:44:26 +02:00
• c46036dce6 Fix speed mismatch between direct and tap movement modes Michal Pikulski 2025-10-07 10:11:47 +02:00
• ca27cf519b Merge pull request 'DamianBranch' (#16) from DamianBranch into main damian 2025-10-07 07:57:20 +00:00
• 328e8dea0a Finalize normalized movement settings Michal Pikulski 2025-10-07 09:42:59 +02:00
• 348e982930 Use normalized movement settings Michal Pikulski 2025-10-07 09:28:41 +02:00
• 413576701e Fix input switching bug, where input would not be registered to GameMode, if game was booted in correct orientation Michal Pikulski 2025-10-07 08:32:32 +02:00
• c9eae8d2c0 Added More final Sprites DamianCorazza 2025-10-06 21:11:05 +02:00
• 7ed258f87a Added Sprites and Changed Placeholders for final art Damian 2025-10-06 17:41:12 +02:00
• f20eae0f6e Randomize window for some property based fun Michal Pikulski 2025-10-06 16:57:47 +02:00
• 0627a2aeb7 Replacing with Final Art Damian 2025-10-06 15:13:26 +02:00