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

• 81723a3cdb Anna Lise Moves To the Spot and takes a picture when the bird is there. Damian 2025-09-16 18:14:00 +02:00
• 70a14e5a84 AnneLise moved to the spot, still trying to make her interactable then Damian 2025-09-16 15:52:30 +02:00
• a455e34ed0 Add a sprite collider generator tool window Michal Pikulski 2025-09-16 15:39:49 +02:00
• 75be338065 Working generic object pooling, pool monitor editor tool and batch component adder editor tool Michal Pikulski 2025-09-16 15:02:50 +02:00
• bcc6f05058 Working single-purpose object pooling solution Michal Pikulski 2025-09-16 12:23:25 +02:00
• 2c56d0e1de Merge pull request 'Introduce unit and integration tests' (#3) from integration_test into main tschesky 2025-09-15 07:32:18 +00:00
• 793da5e568 [Test] Cleanup assemblies for Android build test. Working game flow, working build, passing unit tests integration_test Michal Pikulski 2025-09-15 09:30:27 +02:00
• 15414f9414 [Test] Add unit tests for base code Michal Pikulski 2025-09-14 13:35:35 +02:00
• 8cffe0b161 Fix build issues due to comparison operators Michal Pikulski 2025-09-12 16:47:45 +02:00
• 0057ae9fa3 Fix issues with scene loading, introduce an intermediate bootstrap scene Michal Pikulski 2025-09-12 15:37:26 +02:00
• cec661586e Fix issues with disabled puzzle steps not registering with puzzle manager Michal Pikulski 2025-09-12 14:38:56 +02:00
• a580a5f35a Eyes are working now DamianCorazza 2025-09-12 13:57:26 +02:00
• c0df46f9f8 Update dispatchers and message for slotting items Michal Pikulski 2025-09-12 13:24:04 +02:00
• 9a12a79698 Fix item removed being called one too many times, fix Pulver movement Michal Pikulski 2025-09-12 13:14:17 +02:00
• d62516f0cb Added Bird Spawning and Copied behaviour for the hammer bird DamianCorazza 2025-09-12 12:49:07 +02:00
• 445e36975d Interactable items - slotting working correctly and calling the dispatchers each time Michal Pikulski 2025-09-12 12:26:44 +02:00
• ef96d80d51 Small touchups of input and A* graphing Michal Pikulski 2025-09-12 10:36:18 +02:00
• afd3bc3863 Eyes Work nicely now, switching items is a bit iffy though DamianCorazza 2025-09-12 10:30:49 +02:00
• 9b590ca6ec Made Changes To slotted items (not fully functional but progressing) Damian 2025-09-11 17:03:56 +02:00
• 15b8146815 Update Puzzle Manager's initialization sequence Michal Pikulski 2025-09-11 15:48:44 +02:00
• c5b8561b73 Quick scene browser tab Michal Pikulski 2025-09-11 15:29:28 +02:00
• fd220de298 Merge pull request 'rewrite_interactables' (#2) from rewrite_interactables into main tschesky 2025-09-11 12:39:22 +00:00
• 6c76759057 Touched up editor tool windows rewrite_interactables Michal Pikulski 2025-09-11 13:15:43 +02:00
• e1ff13db30 Rework interactables into a flatter hierarchy, reenable puzzles as well Michal Pikulski 2025-09-11 13:00:26 +02:00
• 3a40d1a151 Interactables fully working now Michal Pikulski 2025-09-10 17:38:03 +02:00
• 0ef25f265c Semi-working Interactables rework Michal Pikulski 2025-09-10 16:42:43 +02:00
• abffb5c558 Michal saw we were programming with sticks Damian 2025-09-11 13:53:42 +02:00
• 16c98ee8e3 Prefabs Modified Damian 2025-09-11 13:03:43 +02:00
• 1239052a5f Fiddling with state machines Damian 2025-09-11 10:44:01 +02:00
• faa2bd73b5 Forgot the elusive soundbird AlexanderT 2025-09-10 22:29:19 +02:00
• 1c987af2b8 Added animations, two state machines AlexanderT 2025-09-10 22:17:51 +02:00
• e7c950480f Big ol' asset dump AlexanderT 2025-09-10 20:18:53 +02:00
• e431846cc1 Modified the Prefabs for items Damian 2025-09-10 17:41:01 +02:00
• 57f5e7e631 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction Damian 2025-09-10 16:13:49 +02:00
• ce9f490ed5 Changed All prefabs to variants of BasePrefab Damian 2025-09-10 16:13:43 +02:00
• 5d81a2acfc Move the prefab editor to a dedicated tool window Michal Pikulski 2025-09-10 15:53:31 +02:00
• 9579a8ef57 [Util] Add the possiblity to also edit items via the custom editor window Michal Pikulski 2025-09-10 14:45:25 +02:00
• ba56f1ec9c Add a prefab creator window Michal Pikulski 2025-09-10 13:47:59 +02:00
• f5bd7457a9 Birdeyes animations AlexanderT 2025-09-10 13:43:15 +02:00
• e970aa7b66 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction Damian 2025-09-10 13:38:48 +02:00
• 36ab5864e5 Placeholder for bike horn + Pulver grid change + changed gardener tag Damian 2025-09-10 13:38:40 +02:00
• d19077b907 Add a simple utility to list objects in the current scene Michal Pikulski 2025-09-10 13:18:44 +02:00
• ffd26a4e28 Make the puzzle chain editor work again Michal Pikulski 2025-09-10 13:08:08 +02:00
• 8491b74d5d Cleanup deprecation warnings in the plugin Michal Pikulski 2025-09-10 12:56:51 +02:00
• e0af6b999d [DivingForPictures] Tile spawning prototype for descending minigame Michal Pikulski 2025-09-10 12:35:22 +02:00
• 2dfe6de144 Updates and reworks, code rewrites Michal Pikulski 2025-09-10 09:36:15 +02:00
• 52bd7ef585 Installed Surge, fixed compile errors, moved a bunch of external stuff into folder AlexanderT 2025-09-10 10:53:04 +02:00
• a3649c65b0 Touch-up some warnings in IntroCinematicsPlayer Michal Pikulski 2025-09-10 09:10:58 +02:00
• 6f65297ba1 Gardener and his animations implemented AlexanderT 2025-09-09 17:45:51 +02:00
• 91f1e3f114 Update Quarry.unity Damian 2025-09-09 16:20:11 +02:00
• 08dde63c5d Update Quarry.unity Damian 2025-09-09 15:26:49 +02:00
• 253708a909 Added Camera limits to town map and made some puzzle updates in quarry Damian 2025-09-09 14:30:37 +02:00
• 5a07c4b135 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-09-09 14:23:57 +02:00
• 2be6b5626e Reimplemented intro animation as regular ol' sprites AlexanderT 2025-09-09 14:22:05 +02:00
• c15f207415 Fake Physics on Player Michal Pikulski 2025-09-09 14:18:19 +02:00
• cfa3c32657 Sprite flips depending on movement direction Michal Pikulski 2025-09-09 14:01:17 +02:00
• ccdc80e89e Update AppleHillsOverworld.unity Damian 2025-09-09 13:53:40 +02:00
• d0adfd4933 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction Damian 2025-09-09 13:46:49 +02:00
• 1838b84a76 Updates to the Quarry Damian 2025-09-09 13:46:45 +02:00
• 07e88a88fe OneClickInteractable Michal Pikulski 2025-09-09 13:38:03 +02:00
• aa127bf6d5 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-09-09 13:11:26 +02:00
• ed093c3ddd Intro cinematic implementation and Apple Hills map AlexanderT 2025-09-09 13:11:18 +02:00
• 8d94fad5d9 Puzzle hiccup Damian 2025-09-09 13:04:19 +02:00
• bf81da11cd [Bug] Fix the issue where player would move back if already close to an item Michal Pikulski 2025-09-09 11:38:40 +02:00
• c83bd5633b Updated Pivot on Trafalgar sprites AlexanderT 2025-09-09 11:07:37 +02:00
• 6e52de3f42 Fix orientation forcing Michal Pikulski 2025-09-09 11:00:25 +02:00
• 4d0ba9fad8 Add minigame switcher to Quarry Michal Pikulski 2025-09-09 10:35:02 +02:00
• e2e5c9ae09 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction Damian 2025-09-09 10:25:00 +02:00
• 6080419105 Changed the Quarry camera limits Damian 2025-09-09 10:24:48 +02:00
• 3f93ca3b66 Add level switch confirmation popup Michal Pikulski 2025-09-09 10:23:00 +02:00
• 4b0db92cea Merge pull request 'Fix slot items to fully work with the stashing prefab flow' (#1) from rework_slots into main tschesky 2025-09-09 08:11:22 +00:00
• 5804b170d0 Fix slot items to fully work with the stashing prefab flow Michal Pikulski 2025-09-08 16:13:13 +02:00
• a8d398e097 Added Puzzle Steps and organized the Puzzle Item Data Damian 2025-09-08 16:22:32 +02:00
• 6bbb40b1c0 [Interactions] Correctly display items now Michal Pikulski 2025-09-08 15:23:31 +02:00
• 2e24b343c3 Cache full pickup object on Pulver Michal Pikulski 2025-09-08 15:09:45 +02:00
• f4a183d524 [Interactions] Make combinable object pickup-able and swappable Michal Pikulski 2025-09-08 14:56:59 +02:00
• a1b1d7475f Preliminary screen rotation work Michal Pikulski 2025-09-08 14:25:50 +02:00
• 32888a6843 [Interactions] Switch interactables to trace on layer configured in game settings Michal Pikulski 2025-09-08 12:51:33 +02:00
• 749d72904e Add main menu scene, setup framework for orientation switching Michal Pikulski 2025-09-08 12:44:31 +02:00
• dec34b0ef3 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-09-08 12:34:32 +02:00
• 3859b21bf3 Added some UI pics AlexanderT 2025-09-08 12:34:25 +02:00
• 81cd20ceef Created Prefab of BurgerBuns Damian 2025-09-08 12:31:34 +02:00
• 604871a870 [Input] Fix issue where player would not move to items after using direct/drag movement mode Michal Pikulski 2025-09-08 08:56:11 +02:00
• 3b0988243e [Misc] Singleton pattern improvements, get rid of warnings and errors Michal Pikulski 2025-09-08 08:45:13 +02:00
• f161d0069b [Bootstrap] Redo scenes with bootstrapper Michal Pikulski 2025-09-07 14:18:17 +02:00
• d20004238d [Bootstrap] First go at Addressables bootsrapped objects Michal Pikulski 2025-09-07 12:36:35 +02:00
• d3c6b838b4 Big script cleanup. Remove the examples from Ropes' external package Michal Pikulski 2025-09-06 21:01:54 +02:00
• 045bd7966e PLaceholder Items and organization Damian 2025-09-05 17:37:21 +02:00
• 1489dbda05 Big Input refactor Michal Pikulski 2025-09-05 15:03:52 +02:00
• c6a5d6329f Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction Damian 2025-09-05 14:20:45 +02:00
• 9da2989b23 Sorting Layers and pivot modifications Damian 2025-09-05 14:20:36 +02:00
• 5d3a587b5e Update touch input settings Michal Pikulski 2025-09-05 14:10:42 +02:00
• 32f09f4755 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction Damian 2025-09-05 11:42:00 +02:00
• 15326d4658 Created Placeholder Prefabs + Player Prefab Damian 2025-09-05 11:40:26 +02:00
• d3870ec342 Fixup level path weirdness Michal Pikulski 2025-09-05 09:13:37 +02:00
• 4a098365d0 Setup Universal Render Pipeline Michal Pikulski 2025-09-05 09:10:19 +02:00
• 32e1a54825 Placeholder tiles Michal Pikulski 2025-09-05 00:00:45 +02:00
• a3883d66b4 Better looking ropes now Michal Pikulski 2025-09-04 23:18:25 +02:00
• fbb658098b [Diving] Movement with a rock and 3 ropes is working Michal Pikulski 2025-09-04 23:13:19 +02:00
• d34eb77e20 [Diving][FX] Add some simple bubble fun Michal Pikulski 2025-09-04 22:26:45 +02:00