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

• c741651b6a Added Ball Tree Animations Damian 2025-10-06 14:42:20 +02:00
• b6b2605efb Merge pull request 'DamianBranch' (#15) from DamianBranch into main damian 2025-10-06 10:45:26 +00:00
• 01189acef1 Added Anne-Lise Hiding Spot plus Kids Hidding spots Damian 2025-10-06 12:38:16 +02:00
• 027ff5144e Dialogue test DamianCorazza 2025-10-03 08:30:50 +02:00
• e713a580a9 puzzlestep_indicators (#14) tschesky 2025-10-02 05:42:17 +00:00
• 9c67f503d2 Somewhat working indicators puzzlestep_indicators Michal Pikulski 2025-10-02 07:41:27 +02:00
• dac119fd7b First steps Michal Pikulski 2025-10-01 14:35:17 +02:00
• a6c63af911 Fix puzzle unlock issues Michal Pikulski 2025-10-02 07:16:39 +02:00
• eabc1de569 Merge pull request 'DamianBranch' (#13) from DamianBranch into main damian 2025-10-01 12:23:54 +00:00
• b1f213c921 Added ToughtBubbles and some organization Folders DamianCorazza 2025-10-01 14:21:42 +02:00
• fb24537daf Implemented Picnic Logic DamianCorazza 2025-09-30 15:52:37 +02:00
• f1f4234c2a Wait for correct screen orientation Michal Pikulski 2025-09-30 13:13:37 +02:00
• 79fac9db10 Commit to have everything at home Damian 2025-09-30 12:21:51 +02:00
• 0b0ffa48dd Modified Pulver sprite's pivots Damian 2025-09-30 10:39:14 +02:00
• 7a75d77c06 Merge branch 'DamianBranch' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction into DamianBranch Damian 2025-09-29 16:18:40 +02:00
• c640be7d9c Merge pull request 'Changed trafalgar's pivot and fixed the couple's animation.' (#12) from DamianBranch into main damian 2025-09-29 14:12:01 +00:00
• c98aa3e436 Changed trafalgar's pivot and fixed the couple's animation. Damian 2025-09-29 15:57:52 +02:00
• 1e1757f2a1 Changed trafalgar's pivot and fixed the couple's animation. Damian 2025-09-29 15:57:52 +02:00
• 5789dca302 Working directional movement animations Michal Pikulski 2025-09-29 15:55:25 +02:00
• 532c532a1d Merge pull request 'WIP DamianBranch' (#11) from DamianBranch into main damian 2025-09-29 12:11:33 +00:00
• 9b020f2c6f Merge branch 'main' into DamianBranch damian 2025-09-29 12:10:55 +00:00
• f78c031cd3 Animations for Wolter Damian 2025-09-29 14:10:14 +02:00
• 8e93d40033 All working with the build - update initialization order for the ItemManager Michal Pikulski 2025-09-29 13:25:22 +02:00
• 1f614009fc Update the Addressables build info and structure to accomodate for new settings assets. Application builds and works on a phone now Michal Pikulski 2025-09-29 11:59:52 +02:00
• b188f7adb3 Added more Anims to the birds Damian 2025-09-29 11:38:57 +02:00
• f686f28cb8 Create a simple dialogue authoring system, tied into our items (#10) tschesky 2025-09-29 09:34:15 +00:00
• 9f2230c8b1 Add a brief README explaining the dialogue system dialogue_graph Michal Pikulski 2025-09-29 11:31:50 +02:00
• cee5d575b1 Working slotting items Michal Pikulski 2025-09-29 11:15:37 +02:00
• e6cb55975c Mostly working, double invocation of dialogue progression Michal Pikulski 2025-09-29 00:15:58 +02:00
• 02031335e3 Working Dialogue Michal Pikulski 2025-09-28 11:56:13 +02:00
• 665cfa89c6 Working regular dialogue and speech bubble. Item conditions need work Michal Pikulski 2025-09-27 14:08:27 +02:00
• 4c1be82cf2 Final touchups to the dialogue component AlexanderT 2025-09-26 16:16:33 +02:00
• b07eea6aae DialogueComponent doodles AlexanderT 2025-09-26 15:47:26 +02:00
• c8cbc45f04 Small updates to dispatchers in items and puzzles AlexanderT 2025-09-26 14:06:03 +02:00
• 0bb3ad10a0 Introduced dialogue graph magic, created assest and importers. Added events for broadcasting puzzle steps AlexanderT 2025-09-26 13:32:14 +02:00
• b3bf4717d6 Added animations for Hammerbird and footballbird Damian 2025-09-26 18:02:33 +02:00
• 5e5ce4a5d4 Changed The picnic SpriteSheets one more time Damian 2025-09-26 16:15:45 +02:00
• 52139cbe64 Flying Bird Puzzle section Complete. Damian 2025-09-26 15:12:18 +02:00
• 88e630cbe7 Added some Anims for the picnic PPL plus replacing placeholders. Damian 2025-09-26 11:59:03 +02:00
• 2cd791f69d Merge pull request 'DamianBranch' (#9) from DamianBranch into main damian 2025-09-26 08:33:30 +00:00
• 3e6867ff51 Merge branch 'main' into DamianBranch Damian 2025-09-26 10:30:12 +02:00
• a10fb31ada Making the Picnic Couple Work WIP Damian 2025-09-26 10:29:39 +02:00
• 47d942d176 Switched Unity version to 6.2, updated some packages + installed GraphToolkit AlexanderT 2025-09-26 08:48:33 +02:00
• c05f54efa7 Added some of the picnic Sprites DamianCorazza 2025-09-26 02:02:55 +02:00
• 27b38ca9b1 Added new animas for Pulver DamianCorazza 2025-09-26 00:23:27 +02:00
• e878a32263 Introduce input modes and Pause Menu (#8) tschesky 2025-09-25 10:06:51 +00:00
• 05753cc214 Add a pause menu, auto load via bootstrap and correctly show depending on the current scene input_modes Michal Pikulski 2025-09-25 12:02:18 +02:00
• 74e65fdf42 InputModeSwitching in InputManager and no more player input during UI pop ups Michal Pikulski 2025-09-25 10:40:17 +02:00
• e69542879b Redid the SoundBird Logic of flight Damian 2025-09-24 17:24:51 +02:00
• bc22fd013e Add input maps for player input mode and UI" AlexanderT 2025-09-24 16:36:31 +02:00
• 63cb3f1a8c Revamp the settings system (#7) tschesky 2025-09-24 13:33:43 +00:00
• 0ea7e7ca84 All settings migrated, stuff should work settings_revamp AlexanderT 2025-09-24 15:28:13 +02:00
• aeaa977294 The feel is fine AlexanderT 2025-09-24 15:16:31 +02:00
• f5a6eff85a Created art for the luring spot D Damian 2025-09-24 13:51:39 +02:00
• 783541a776 Working Developer Settings AlexanderT 2025-09-24 13:31:15 +02:00
• 7f862d4ead Added Sprites and anims for trafalgar back and front walk cycle. Damian 2025-09-24 12:31:18 +02:00
• 8b96a5d0c3 IMplement basic Developer Settings AlexanderT 2025-09-24 12:21:21 +02:00
• f07ce88331 Refactor the settings to remove the old class Michal Pikulski 2025-09-24 08:05:37 +02:00
• ceca90e058 Sound Bird First iteration Complete Damian 2025-09-23 15:51:25 +02:00
• 404f6f4e5c Working synchronous Addressables settings loading Michal Pikulski 2025-09-23 15:30:21 +02:00
• 197aedddb0 Migrate settings to a more manageable structure and implement Service Locator pattern for runtime Addressables retrieval Michal Pikulski 2025-09-23 14:43:02 +02:00
• 4b206b9b2e Little Trafalgar dust trail fun Michal Pikulski 2025-09-23 11:05:35 +02:00
• 2ae2bc3ac5 Updates to make sure the build goes through AlexanderT 2025-09-22 15:40:41 +02:00
• 1a9c82f5d7 Touch up touch input AlexanderT 2025-09-22 15:01:53 +02:00
• da07f778c3 Move around scripts to cleanup the Minigame structure AlexanderT 2025-09-22 14:50:48 +02:00
• 96aad806a9 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction Damian 2025-09-22 14:49:36 +02:00
• f589b53234 Changes to the Diving For Pictures Minigame Damian 2025-09-22 14:49:17 +02:00
• 28c342235c Merge pull request 'damianNonsense' (#4) from damianNonsense into main damian 2025-09-22 12:46:50 +00:00
• 322bd5377d SoundGenerator Puzzle Section WIP Damian 2025-09-22 14:28:01 +02:00
• 2923ba0851 Lawnmowwer is working! Damian 2025-09-22 11:31:02 +02:00
• 8ed40e137c Update Quarry.unity Damian 2025-09-22 10:01:21 +02:00
• aa16f36eac Lawnmower Chase Work Damian 2025-09-19 16:06:15 +02:00
• 6abf25b2ad Working gardener chase without flipping Damian 2025-09-19 15:51:50 +02:00
• e1ee73bfb4 Trying to make the lawnmower flip Damian 2025-09-18 17:13:45 +02:00
• 074b052abe Populate minigame with obstacles and monster spawns (#5) tschesky 2025-09-21 07:32:56 +00:00
• 5305c20b00 Create a diving minigame MVP (#6) tschesky 2025-09-22 12:16:32 +00:00
• ec1a0e70aa Final touches minigame_end_wip AlexanderT 2025-09-22 14:15:16 +02:00
• 46950aa877 Surfacing sequence 80% done AlexanderT 2025-09-22 13:56:42 +02:00
• ae6b995f45 Working surfacing speedup AlexanderT 2025-09-22 12:33:46 +02:00
• b0e44f156e Surfacing functions in all manager components AlexanderT 2025-09-22 11:40:01 +02:00
• bb3c91ec94 Working surfacing function AlexanderT 2025-09-22 10:55:45 +02:00
• 8326f03086 Improvements to tile spawning and refactors in the tile management AlexanderT 2025-09-22 09:27:01 +02:00
• 2942b22c62 Add background Michal Pikulski 2025-09-22 00:01:28 +02:00
• 38f578c56a Rope breaking works now Michal Pikulski 2025-09-21 23:37:02 +02:00
• ef3b50b99f Somewhat working breaking rope Michal Pikulski 2025-09-21 23:25:51 +02:00
• af5dfbb7a2 Ropes breaking and shit Michal Pikulski 2025-09-21 22:36:05 +02:00
• 46755fecb3 Populate minigame with obstacles and monster spawns (#5) tschesky 2025-09-21 07:32:56 +00:00
• fbc1083adb Successfull obstacle and monster spawning with object pooling and fake collision detection diving_obstacles Michal Pikulski 2025-09-21 09:22:51 +02:00
• 9be8d1619b Resolved the obstacle spawning issue Michal Pikulski 2025-09-18 15:51:18 +02:00
• c5ce2ae1af Coroutine updates WIP Michal Pikulski 2025-09-18 14:29:10 +02:00
• 3f52de9e1e Improvements and touchups to a more event-driven flow and fake physics Michal Pikulski 2025-09-18 14:14:01 +02:00
• 44c1e48b82 Working collisions on event-based triggers Michal Pikulski 2025-09-18 12:42:05 +02:00
• 50070651c5 Working state for minigameobstacles AlexanderT 2025-09-17 16:10:18 +02:00
• 2ec5c3d855 Working monster spawns AlexanderT 2025-09-19 13:46:24 +02:00
• 40c3867d29 Add a sprite variant generator and create monster prefabs for heads AlexanderT 2025-09-19 13:14:47 +02:00
• d110616907 Add Monster Spawn points, monster head placeholders. Add utility for prefab variation by sprite selection. AlexanderT 2025-09-19 12:51:25 +02:00
• 31f2ce338d Component move/copy utility AlexanderT 2025-09-19 10:08:58 +02:00
• 24f5228003 Started to deal with the Gardener Damian 2025-09-17 15:30:59 +02:00
• 8b3c9a09cb Anna Lise is working! Damian 2025-09-17 13:59:21 +02:00
• 6a24330ea0 Trying to make Anna Lise face the Bird before taking the picture to no avail DamianCorazza 2025-09-16 23:52:28 +02:00