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

#8

#9

vertical-slice

Mono Color

• 786167115c Modified Speed of minigame and two small adjustments to prefabs. Damian 2025-10-22 11:03:15 +02:00
• c80089e5fc Pushed app icons to get Steve Jobs off my back AlexanderT 2025-10-22 10:58:51 +02:00
• 8591490cb2 Make the score display a UIPage as well Michal Adam Pikulski 2025-10-22 10:37:51 +02:00
• acf3ecec3f Added Highlights to the quarry button and the Bunfflers. Damian 2025-10-22 10:36:56 +02:00
• 68886aafd4 Roll the pause menu into the UI page system Michal Adam Pikulski 2025-10-22 09:35:34 +02:00
• 357f942e0d Moved UIPageController out of the card system and into a dedicated prefab Michal Adam Pikulski 2025-10-22 09:20:18 +02:00
• faed21edab Make the Backpack UI visible in the AppleHillsLevel as well Michal Adam Pikulski 2025-10-22 09:05:18 +02:00
• 5763aeb4b3 Un-fuck the booster opening page Michal Adam Pikulski 2025-10-22 07:32:45 +02:00
• 3aed47b183 Fix input issues Michal Adam Pikulski 2025-10-21 15:58:13 +02:00
• 00f6d2c6c6 Add a dirty booster pack opening sequence Michal Adam Pikulski 2025-10-21 15:40:47 +02:00
• c71836c029 Stash WIP of settings documentation Michal Adam Pikulski 2025-10-21 15:08:48 +02:00
• 2abcf5c76a Cleanup the editor assembly and provide a tool overview doc Michal Adam Pikulski 2025-10-21 14:54:58 +02:00
• 0a240da9a7 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction DamianCorazza 2025-10-21 14:54:08 +02:00
• 14d1b8316e Added New Textures for Cards And Configure basic Card Variations DamianCorazza 2025-10-21 14:53:59 +02:00
• 9b6dc0f616 Add a playbook for using the boostrap system Michal Adam Pikulski 2025-10-21 14:19:58 +02:00
• 8e90878a97 Updated diving controls and tutorial MacBuilder 2025-10-21 13:47:18 +02:00
• 1a04f2a3d2 FIxed annoying compiler error MacBuilder 2025-10-21 13:37:14 +02:00
• f8f9286ddf SLight modification to Quarry Level DamianCorazza 2025-10-21 12:55:23 +02:00
• bb43c552b0 Block input on first loop Michal Adam Pikulski 2025-10-21 12:51:24 +02:00
• f3788b8ebe Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction DamianCorazza 2025-10-21 12:42:40 +02:00
• fd88698bee Modified Quarry To make the Sound Area easier to understand. DamianCorazza 2025-10-21 12:42:28 +02:00
• 7096dffb54 Update readme docs for our systems Michal Adam Pikulski 2025-10-21 12:37:53 +02:00
• 2fb77e1040 Cleanup the card implementation, add some readme files and update namespaces Michal Adam Pikulski 2025-10-21 12:10:16 +02:00
• af77e07f99 Update the cards to pull in from addressables to wokr in build, remove erronous code preventing building Michal Adam Pikulski 2025-10-21 10:05:49 +02:00
• d1792014db Added feedback on photography in diving game journaliciouz 2025-10-20 23:18:31 +02:00
• 84dd8004d5 Monster Approach and react audio journaliciouz 2025-10-20 22:33:39 +02:00
• e94b692ae4 More gardener shenanigans journaliciouz 2025-10-20 21:32:10 +02:00
• cb3aa515d1 Cucumberattack sound and anne lise shush journaliciouz 2025-10-20 21:23:18 +02:00
• b7d7e5ae35 Scoffed picnic couple audio implementation journaliciouz 2025-10-20 21:01:10 +02:00
• 1b0a206be7 Wolter sound FX AlexanderT 2025-10-20 17:05:24 +02:00
• e3e9305f7c Merge pull request 'card_system' (#38) from card_system into main tschesky 2025-10-20 14:34:58 +00:00
• 3e833b8991 Working card system card_system Michal Adam Pikulski 2025-10-20 16:33:18 +02:00
• 83b5c8994d Kind of working booster packs Michal Adam Pikulski 2025-10-20 13:45:56 +02:00
• 32f726d229 Second draft of the consolidated card system Michal Adam Pikulski 2025-10-20 12:04:55 +02:00
• 542dd9a4b7 First draft of the consolidated card system Michal Adam Pikulski 2025-10-20 10:29:22 +02:00
• 07750dd5ba Add AlbumViewPage prefab Michal Adam Pikulski 2025-10-20 08:32:57 +02:00
• 80005e6b7d Setup more of the card system stuff Michal Pikulski 2025-10-17 16:17:50 +02:00
• b1df36d48c Add prefabs for main menu and album page Michal Pikulski 2025-10-17 11:35:28 +02:00
• 6c23d1bcfa Add implementation plan and main UI for the card system Michal Pikulski 2025-10-15 13:01:47 +02:00
• 44e1833aea Add backpack Michal Pikulski 2025-10-15 09:29:41 +02:00
• ed9f2d6c6d First go at the card UI Michal Pikulski 2025-10-15 09:22:13 +02:00
• 7f3dccf1ea Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction implementingFlash AlexanderT 2025-10-20 16:21:37 +02:00
• c07f64ea4f Spatial lawnmower audio implemented AlexanderT 2025-10-20 16:21:32 +02:00
• 51d886c757 Merge pull request 'Implementing the Flash when taking pictures' (#37) from implementingFlash into main damian 2025-10-20 14:19:32 +00:00
• 9df43b8f53 Implemented Flash Feedback to the Diving Minigame Damian 2025-10-20 16:19:08 +02:00
• 50c1144e83 Revert "Added a Screenshot save, but it's temporarily disabled." damianContentFreeze Damian 2025-10-20 15:11:12 +02:00
• 88d03773a7 Added a Screenshot save, but it's temporarily disabled. Damian 2025-10-20 14:50:39 +02:00
• b49bb43f79 AnneLise bird counter implemented AlexanderT 2025-10-20 13:57:38 +02:00
• 8d41356418 Removes Unnecessary new Material Damian 2025-10-20 13:23:33 +02:00
• e1f62a0fa1 Added a Flash when taking a picture. Damian 2025-10-20 13:21:57 +02:00
• 6e5a6c049f Underwater rushed audio job AlexanderT 2025-10-17 16:31:23 +02:00
• f465e50197 Merge branch 'audio' AlexanderT 2025-10-17 16:16:01 +02:00
• 9c1a0fdc4c Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-10-17 16:15:50 +02:00
• 594a9815cc AnneLise guidance AlexanderT 2025-10-17 16:15:43 +02:00
• 0557ddd3dc Add prompt when dialogue Michal Pikulski 2025-10-17 15:35:25 +02:00
• c3c9fd95a4 Add audio to dialogues Michal Pikulski 2025-10-17 15:20:29 +02:00
• 2fe872d8dc Merge pull request 'damianContentFreeze' (#35) from damianContentFreeze into main damian 2025-10-17 13:16:12 +00:00
• 1c721541db Merge branch 'main' into damianContentFreeze damian 2025-10-17 13:16:04 +00:00
• 6c0e1acdd6 Modified the Quarry Level Switcher in the Overworld and moved the area to move around. Damian 2025-10-17 15:14:41 +02:00
• 246e66a1f6 New Menus And Fixed the headband Glow Damian 2025-10-17 15:08:00 +02:00
• 99dc459aa0 Added lake ambience AlexanderT 2025-10-17 15:02:31 +02:00
• 09af055d18 Strip UI debug stuff from the game Michal Pikulski 2025-10-17 14:44:03 +02:00
• d8653762f4 Merge branch 'audio' AlexanderT 2025-10-17 14:38:53 +02:00
• 512e8cade5 IntroNarration AlexanderT 2025-10-17 14:38:42 +02:00
• 2a0dbe98a2 Game over screen return to levels menu Michal Pikulski 2025-10-17 14:28:13 +02:00
• 5851b5a12f Remove main menu from build and game flow Michal Pikulski 2025-10-17 14:03:27 +02:00
• bb6059a885 Merge branch 'audio' AlexanderT 2025-10-17 13:44:33 +02:00
• 7cdc8fab22 Fixed outrocinematic and added audio AlexanderT 2025-10-17 13:44:22 +02:00
• 74339d7c47 Fix pausing etc. issues in the minigame Michal Pikulski 2025-10-17 13:18:33 +02:00
• 78fad26ff5 Apple Hills Font AlexanderT 2025-10-17 13:04:15 +02:00
• 099a6093e0 Outro WIP AlexanderT 2025-10-17 13:03:01 +02:00
• 646e9711eb Updated intro voiceover AlexanderT 2025-10-17 12:55:14 +02:00
• bb6a595104 Merge branch 'main' into audio AlexanderT 2025-10-17 12:42:18 +02:00
• 3dcae9ba26 All the voices AlexanderT 2025-10-17 12:42:07 +02:00
• 648928d09b Merge pull request 'damianContentFreeze' (#34) from damianContentFreeze into main damian 2025-10-17 10:42:00 +00:00
• c34251048f Merge branch 'main' into damianContentFreeze damian 2025-10-17 10:41:43 +00:00
• 49c1f55ec0 Merge branch 'main' into audio AlexanderT 2025-10-17 12:40:19 +02:00
• 82fce5c135 Added aglow to the Pickable Items Damian 2025-10-17 12:36:09 +02:00
• 8274d70924 Remove superflous Update() methods and change the tile spawn buffer to 2 Michal Pikulski 2025-10-17 11:55:30 +02:00
• c1cbd651f2 Modified the size of the Step indicator Damian 2025-10-17 11:43:26 +02:00
• 7cbc80627b Merge pull request 'damianContentFreeze' (#33) from damianContentFreeze into main damian 2025-10-17 09:05:05 +00:00
• c94cd4f567 Merge branch 'main' into damianContentFreeze damian 2025-10-17 09:04:54 +00:00
• 15bc868cad Modified The size of the Images in dialogue Damian 2025-10-17 11:04:15 +02:00
• b1542e4a0b Eliminated Duplicated Puzzle Steps Damian 2025-10-17 10:45:52 +02:00
• dafccdc286 Add main menu prefab Michal Pikulski 2025-10-17 09:57:20 +02:00
• 933e29edf9 AnneLise voicedump journaliciouz 2025-10-17 01:04:30 +02:00
• d520f1c1c3 AudioPrep journaliciouz 2025-10-17 00:44:20 +02:00
• 7f31ec8e6a Added CameraSwitcher to the nests and Repositioned elements for a more compact view DamianCorazza 2025-10-17 00:26:22 +02:00
• 313ab7a365 Merge pull request 'diving-outrocinematic' (#32) from diving-outrocinematic into main tschesky 2025-10-16 21:59:51 +00:00
• 3fc43fa92d Hook up the score display Michal Pikulski 2025-10-16 23:59:25 +02:00
• b2384269e5 Update the Pause menu flow to be slightly less scoffed Michal Pikulski 2025-10-16 23:19:33 +02:00
• 09ae4b5ba7 WIP 2 journaliciouz 2025-10-16 22:45:13 +02:00
• 4fc005b082 WIP journaliciouz 2025-10-16 22:35:23 +02:00
• 6f6333c8c4 Merge branch 'main' into diving-outrocinematic journaliciouz 2025-10-16 22:26:04 +02:00
• dfb67a80c4 Merge pull request 'Redo puzzles authoring and registration' (#30) from revamp_puzzle_registration into main tschesky 2025-10-16 19:29:53 +00:00
• 50448c5bd3 Revamp the prompt system, the bootstrapper system, the starting cinematic revamp_puzzle_registration Michal Pikulski 2025-10-16 19:43:19 +02:00
• eab8899720 WIP game over diving AlexanderT 2025-10-16 16:23:48 +02:00
• 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