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

• a05baeb957 Merge branch 'main' into DamianBranch Damian-Fools 2025-11-23 22:35:06 +01:00
• a40c73a90d Placeholders for the cement factory Damian-Fools 2025-11-23 22:34:51 +01:00
• 3f847508be Working mulit-slot items Michal Pikulski 2025-11-21 15:50:06 +01:00
• e9320c6d03 Poop obstacle pipeline working Michal Pikulski 2025-11-21 11:33:49 +01:00
• b4b17c18ed Some b ase obstacle and poop spawning Michal Pikulski 2025-11-21 09:22:06 +01:00
• 8b283774e6 Fixup booster pack pickup Michal Pikulski 2025-11-21 08:38:26 +01:00
• fba484d686 Removed booster pack again AlexanderT 2025-11-20 17:45:44 +01:00
• c0e5ec14bd Moved boosterpack AlexanderT 2025-11-20 17:32:02 +01:00
• 311d6066be Added new boostie bois icon AlexanderT 2025-11-20 17:06:05 +01:00
• 6b92462e7b Stashed work on booster explosion card-juice AlexanderT 2025-11-20 17:00:26 +01:00
• 2d3168d86b Merge branch 'main' into card-juice AlexanderT 2025-11-20 16:20:54 +01:00
• 609f4cde57 Added card VO AlexanderT 2025-11-20 16:20:10 +01:00
• 058af331e0 pooper_minigame (#62) tschesky 2025-11-20 15:16:57 +00:00
• 67cfc813b3 Add booster pack item pooper_minigame Michal Pikulski 2025-11-20 16:16:14 +01:00
• 0a145a87b3 Added voices to card config, fixed marmor background AlexanderT 2025-11-20 15:58:34 +01:00
• 6ebf46fe8b re-added butterfly audio AlexanderT 2025-11-20 15:37:42 +01:00
• af8cee1226 Working player + obstacle mvp Michal Pikulski 2025-11-20 12:24:56 +01:00
• 8b9f847ef8 Added audio resource to card definition and editor AlexanderT 2025-11-20 11:48:41 +01:00
• 282f77e764 Added crash sound to butterfly glass AlexanderT 2025-11-20 11:10:41 +01:00
• 24ea8d0903 Added highlight effect to the butterfly jar AlexanderT 2025-11-20 11:01:58 +01:00
• 28e6205bdd Yay, it flaps! Michal Pikulski 2025-11-20 02:47:12 +01:00
• 635b74db0a First go at bird pooper controller Michal Pikulski 2025-11-20 01:29:30 +01:00
• 97921c3727 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction journaliciouz 2025-11-20 00:02:02 +01:00
• 28ba819731 Overworld ambience journaliciouz 2025-11-20 00:01:57 +01:00
• 43fc6c327a Fix initialization bug Michal Pikulski 2025-11-19 23:57:32 +01:00
• e76fb0a62e Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction journaliciouz 2025-11-19 23:51:15 +01:00
• dcb082bc4a Book open/close audio journaliciouz 2025-11-19 23:51:03 +01:00
• 47e4668592 Rename this piece of shit font from the unhinged naming convention Michal Pikulski 2025-11-19 23:49:42 +01:00
• 6b8420c8c7 Update card sorting MVP Michal Pikulski 2025-11-19 23:47:43 +01:00
• b2c61125ef P L O P journaliciouz 2025-11-19 23:46:12 +01:00
• 38466381a5 Added feedback to pages turning journaliciouz 2025-11-19 23:06:04 +01:00
• 21308c339d Every card was KUNG FU FIGHTING journaliciouz 2025-11-19 22:56:24 +01:00
• b75dd15614 Merge branch 'main' into card-juice journaliciouz 2025-11-19 21:45:11 +01:00
• afbc0f15a2 Merge pull request 'Modified the overworld scene and also the cement factory prefab.' (#61) from DamianBranch into main damian 2025-11-19 20:10:27 +00:00
• ce110d23ae Modified the overworld scene and also the cement factory prefab. Damian-Fools 2025-11-19 21:07:48 +01:00
• a432fd45bd Initial card audio AlexanderT 2025-11-19 15:51:54 +01:00
• fee5515bbd First MVP of sorting minigame (#60) tschesky 2025-11-19 13:56:10 +00:00
• 247f7b73af Working minigame? sort_minigame Michal Pikulski 2025-11-19 14:54:33 +01:00
• 359e0e35bd Stash work on mingame Michal Pikulski 2025-11-19 08:30:47 +01:00
• f878521dab Added butterfly bottle AlexanderT 2025-11-18 17:06:06 +01:00
• 2c4e90b698 Finished changing score to amount of photos AlexanderT 2025-11-18 12:45:36 +01:00
• 219f2239a1 Added number of photos scoring AlexanderT 2025-11-18 11:33:16 +01:00
• 63f410298d Android build settings AlexanderT 2025-11-18 10:23:00 +01:00
• 235fa04eba Merge a card refresh (#59) tschesky 2025-11-18 08:40:59 +00:00
• fc0c3d0df3 Clean up docs cards_rewrite Michal Pikulski 2025-11-18 09:34:15 +01:00
• cf13fb78b5 Refactor, cleanup code and add documentaiton Michal Pikulski 2025-11-18 09:29:59 +01:00
• 034654c308 Stash factoring out functionality out of album view page Michal Pikulski 2025-11-18 09:20:00 +01:00
• 64c304bb6d Working refactor of cleaned up card structure Michal Pikulski 2025-11-18 01:03:45 +01:00
• 689e177c99 Finalize nice animations Michal Pikulski 2025-11-17 23:49:37 +01:00
• e18f1b9963 Working bottom-corner card display Michal Pikulski 2025-11-17 23:38:34 +01:00
• b5364a2bbc Stash work! Michal Pikulski 2025-11-17 17:10:24 +01:00
• c6f635f871 Update assets, working save kerfuffle Michal Pikulski 2025-11-17 14:30:07 +01:00
• ee07d89d3e Update pages to follow new card flow Michal Pikulski 2025-11-17 10:59:59 +01:00
• 7aca1a17ac Stash work Michal Pikulski 2025-11-17 08:39:41 +01:00
• 78aafb9275 Almost working card state machine Michal Pikulski 2025-11-16 20:35:54 +01:00
• 6fe7d012fc Updates to testing scene Michal Pikulski 2025-11-12 20:26:51 +01:00
• b2c47d4e4f Stash scene changes Michal Pikulski 2025-11-12 14:50:26 +01:00
• 755082c67d Updates to card testing scene Michal Pikulski 2025-11-12 14:39:38 +01:00
• 4e7f774386 Stash half-assed work on testing scene Michal Pikulski 2025-11-12 11:58:01 +01:00
• 39d5890db4 Fix up card flows, align with the old 1:1 Michal Pikulski 2025-11-12 10:55:00 +01:00
• a6471ede45 Make cards use settings Michal Pikulski 2025-11-12 09:24:27 +01:00
• 4fdbbb0aa8 Add roadmap docs Michal Pikulski 2025-11-11 21:03:05 +01:00
• 1fdff3450b Update the card kerfufle Michal Pikulski 2025-11-11 20:25:23 +01:00
• 06cc3bde3b Merge pull request 'DamianBranch' (#58) from DamianBranch into main damian 2025-11-14 09:30:49 +00:00
• 9cc112e5f0 Update Quarry.unity Damian 2025-11-14 10:30:05 +01:00
• 19be64a75f Butterfly Distraction DamianCorazza 2025-11-14 00:04:33 +01:00
• c08fc4a720 WIP Butterfly can be set free, now only missing forcing the couple to look. Damian 2025-11-13 16:23:52 +01:00
• 16962a5ae3 Merge branch 'main' into animation-pipeline-overhaul animation-pipeline-overhaul AlexanderT 2025-11-13 15:21:32 +01:00
• c3639bbb93 Added the Flying Butterfly WIP Damian 2025-11-12 16:25:32 +01:00
• 612ca7eae8 Interactables documentaiton Michal Pikulski 2025-11-11 15:55:38 +01:00
• 2602cbbeb3 Trafalgar-Reimport AlexanderT 2025-11-11 14:24:56 +01:00
• acf46c701e Last life cycle refactor updates + add comprehensive documentation (#57) tschesky 2025-11-11 12:32:36 +00:00
• dcf8c8bb87 Add documentation lifecycle_docs_and_updates Michal Pikulski 2025-11-11 13:20:06 +01:00
• 9a6914b9bd Final touchups to the lifecycle management Michal Pikulski 2025-11-11 10:53:09 +01:00
• fe2eb0a280 Merge remote-tracking branch 'origin/kill-json-player' AlexanderT 2025-11-11 10:06:23 +01:00
• 0aa2270e1a Lifecycle System Refactor & Logging Centralization (#56) tschesky 2025-11-11 08:48:29 +00:00
• 32ecbf4dc4 Add docs to the logger update_tooling_and_docs Michal Pikulski 2025-11-11 09:30:11 +01:00
• 4dfe6202fd Update logging calls to new system Michal Pikulski 2025-11-11 09:00:05 +01:00
• f8805dabe7 Custom logger Michal Pikulski 2025-11-11 08:30:21 +01:00
• 961da5e729 Fix deprecation and other warnings Michal Pikulski 2025-11-10 23:18:01 +01:00
• a049c6a750 Update methods to be internal, remove invocation bloat Michal Pikulski 2025-11-10 21:59:47 +01:00
• 01caca1878 Add docs and clear the zero-width-backspace-formatting Michal Pikulski 2025-11-10 15:56:30 +01:00
• d647bb5707 Target eliminated, good job 47 kill-json-player MacBuilder 2025-11-10 15:55:28 +01:00
• 7565b189b9 Add distinction between managed awake and managed start Michal Pikulski 2025-11-10 15:52:53 +01:00
• dec7ced2d1 Began killing json MacBuilder 2025-11-10 14:57:42 +01:00
• c4d356886f Dumb fix for data clearing Michal Pikulski 2025-11-10 14:27:14 +01:00
• 64d7f19b83 ADd clearing saves Michal Pikulski 2025-11-10 14:11:02 +01:00
• ce21e8b02e Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-11-10 13:13:36 +01:00
• f44f8c5171 Made intro VO play in diving minigame AlexanderT 2025-11-10 13:13:32 +01:00
• 9772206362 Merge pull request 'Clean up logging' (#55) from clean_up_logging into main tschesky 2025-11-10 12:06:05 +00:00
• 3ebbecc277 Clean up logging clean_up_logging Michal Pikulski 2025-11-10 13:03:36 +01:00
• c99aad49f3 Save bird states Michal Pikulski 2025-11-10 12:55:22 +01:00
• 3fe4c6afd9 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-11-10 12:53:07 +01:00
• 9c61065947 Fixed nullref in TakePhotoState AlexanderT 2025-11-10 12:53:03 +01:00
• 7c09db641a Only show cards when in actual album Michal Pikulski 2025-11-10 12:41:28 +01:00
• e369660a8f Fix tab navigation on card select less wonky Michal Pikulski 2025-11-10 12:29:17 +01:00
• a6e3413499 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-11-10 12:19:25 +01:00
• 7bb992acb8 Made apple audio sources use OnManagedAwake AlexanderT 2025-11-10 12:19:20 +01:00
• cefa488a92 Update issues with card appearing twice after reopening page Michal Pikulski 2025-11-10 11:55:55 +01:00
• 9344f06886 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction Damian 2025-11-10 11:37:53 +01:00