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

• 4f8c8ff563 Stopped texture flickering main DamianBranch AlexanderT 2025-12-09 14:02:50 +01:00
• 8a65a5d0f6 Stash work trash_maze Michal Pikulski 2025-12-08 16:46:50 +01:00
• 73e9e2b82f Added cookie eating interaction, fixed museum interaction AlexanderT 2025-12-08 15:57:31 +01:00
• 596f3e4fa6 Got rid of old sprites AlexanderT 2025-12-08 14:59:06 +01:00
• c47d4e5225 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-12-08 14:57:56 +01:00
• 175e9804fe Updated cement dressup assets AlexanderT 2025-12-08 14:57:32 +01:00
• e338e28673 Update the statue game to include rotation etc. Michal Pikulski 2025-12-08 14:48:09 +01:00
• fff50990f1 Update slots to support assigning to specific items Michal Pikulski 2025-12-08 13:34:06 +01:00
• c15b7e9d92 Fixed the receptionist being stuck AlexanderT 2025-12-08 13:34:08 +01:00
• ed6390d802 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-12-08 13:18:56 +01:00
• 2839223513 Implemented museum chain reaction AlexanderT 2025-12-08 13:18:51 +01:00
• 41d99a1390 Some more airplane game doodles Michal Pikulski 2025-12-08 12:56:14 +01:00
• 861749485e Merge pull request 'DamianBranch' (#78) from DamianBranch into main damian 2025-12-08 09:19:49 +00:00
• 3e1fd3fb95 Merge branch 'main' into DamianBranch Damian-Fools 2025-12-08 10:18:38 +01:00
• 7de0e1776e MVP for Dump Puzzle Damian-Fools 2025-12-08 08:48:35 +01:00
• fe06b1529b Switch to 6.3 Michal Pikulski 2025-12-07 21:15:45 +01:00
• c27f22ef0a MVP of the plane throwing game (#77) tschesky 2025-12-07 19:36:57 +00:00
• 6754664a34 Remove old docs valentines Michal Pikulski 2025-12-07 20:36:01 +01:00
• 5d7b36b740 Working? MVP of the minigame Michal Pikulski 2025-12-07 20:34:12 +01:00
• 7ce6d914e6 Stash work Michal Pikulski 2025-12-05 16:24:44 +01:00
• ab579e2d21 Generic MVP working Michal Pikulski 2025-12-05 12:18:29 +01:00
• 11833ba503 Refactored trajectory component Michal Pikulski 2025-12-05 11:03:47 +01:00
• a4363fecb3 Stash work on refactor of trajecotry Michal Pikulski 2025-12-04 16:23:53 +01:00
• e9d528d837 Working MVP code for Valentines Michal Pikulski 2025-12-04 15:10:20 +01:00
• ad8338f37e Merge pull request 'DamianBranch' (#76) from DamianBranch into main damian 2025-12-05 14:50:24 +00:00
• c96be39e64 The worker respects the splines now Damian-Fools 2025-12-05 15:49:06 +01:00
• 82b1a1e78c Update CementFactory.unity Damian-Fools 2025-12-05 11:42:16 +01:00
• 49f563dbd1 Merge branch 'main' into DamianBranch Damian-Fools 2025-12-04 17:04:11 +01:00
• bd093b8696 Added some placeholder elements Damian-Fools 2025-12-04 17:02:49 +01:00
• 8efe5dce30 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-12-04 14:38:38 +01:00
• 1c64c67cf8 Worker barely working AlexanderT 2025-12-04 14:38:32 +01:00
• 38e4cdcf88 add correct labels again Michal Pikulski 2025-12-04 12:26:01 +01:00
• edb83ef13d Simple Pigman AI Michal Pikulski 2025-12-04 08:52:59 +01:00
• a463e099b4 Simple Pigman AI fort_fight Michal Pikulski 2025-12-04 08:52:59 +01:00
• e60d516e7e Implement Fort Fight minigame (#75) tschesky 2025-12-04 01:18:29 +00:00
• 9b71b00441 Finish work Michal Pikulski 2025-12-04 02:16:38 +01:00
• 88049ac97c Data refactor Michal Pikulski 2025-12-03 22:45:22 +01:00
• 0b8d2a279f Working MVP Michal Pikulski 2025-12-03 22:17:12 +01:00
• d5ab69d944 Stash work Michal Pikulski 2025-12-02 23:56:13 +01:00
• bb8d600af2 Merge pull request 'DamianBranch' (#74) from DamianBranch into main damian 2025-12-03 03:23:37 +00:00
• 1b8c180425 Added anim placeholders for the worker belt animation Damian-Fools 2025-12-03 04:22:26 +01:00
• fa6af89a62 Update CementFactory.unity Damian-Fools 2025-12-02 20:19:56 +01:00
• c210b47644 Cement factory level and prefab making Damian-Fools 2025-12-02 18:47:11 +01:00
• 2589e56bda Finished secretary AlexanderT 2025-12-02 14:49:55 +01:00
• 8da24e3ea3 Merge pull request 'DamianBranch' (#70) from DamianBranch into main damian 2025-12-02 03:27:28 +00:00
• 516430c813 Changed the cabinets for the cookie cabinet Damian-Fools 2025-12-02 04:25:34 +01:00
• 8a37107244 Fixed some troubles with the puzzles Damian-Fools 2025-12-02 04:00:07 +01:00
• ce7ed89c4e Added the new decorations to the minigame Damian-Fools 2025-12-02 03:31:14 +01:00
• b466fe782e Added new decorations Damian-Fools 2025-12-02 03:19:51 +01:00
• 13527f7102 Merge branch 'main' into DamianBranch Damian-Fools 2025-12-02 02:47:42 +01:00
• 2c93a60ca9 Update CementFactory.unity Damian-Fools 2025-12-02 02:47:22 +01:00
• e9ba3b7431 Added cementmachine with animated states AlexanderT 2025-12-01 18:36:17 +01:00
• 789ffcf929 Added DoTween AlexanderT 2025-12-01 17:57:48 +01:00
• 5f842e50d3 Almost fully implemented card machine AlexanderT 2025-12-01 17:53:26 +01:00
• 946cbabc92 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-12-01 15:22:35 +01:00
• 0bee5ac19c Re-import some crates with a thinner outline AlexanderT 2025-12-01 15:22:30 +01:00
• d706b28f9c Merge pull request 'Update CementFactory.unity' (#69) from DamianBranch into main damian 2025-12-01 11:54:57 +00:00
• b4fc531cbd Update CementFactory.unity Damian-Fools 2025-12-01 11:01:26 +01:00
• dc038b8c4c Merge pull request 'DamianBranch' (#68) from DamianBranch into main damian 2025-11-28 15:45:39 +00:00
• 0f43a282ae Update CementFactory.unity Damian-Fools 2025-11-28 16:43:45 +01:00
• dc23e3e415 Updates walls so they are not clown central Damian-Fools 2025-11-28 16:15:05 +01:00
• 652e3ab814 Added audio to the decorations minigame and switched the rock for the fez journaliciouz 2025-11-28 15:28:15 +01:00
• fbf9ee464a Merge pull request 'DamianBranch' (#66) from DamianBranch into main damian 2025-11-28 10:13:17 +00:00
• 2845a4ddb8 Update CementFactory.unity Damian-Fools 2025-11-28 10:48:27 +01:00
• 4ae950bbcd WIP Decorations Damian-Fools 2025-11-28 05:05:17 +01:00
• d1f1416025 Merge branch 'main' into DamianBranch and solved conflicts Damian-Fools 2025-11-27 17:10:51 +01:00
• 47b04ceebc Merge branch 'main' into DamianBranch Damian-Fools 2025-11-27 16:22:53 +01:00
• a915e6af3c Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction AlexanderT 2025-11-27 15:06:55 +01:00
• d3f619ce25 Cement machine asset AlexanderT 2025-11-27 15:06:50 +01:00
• 83aa3d5e6d Implement MVP for the statue decoration minigame (#65) tschesky 2025-11-27 13:21:22 +00:00
• 3723857a14 Add docs, cleanup structure continue_with_minigame Michal Pikulski 2025-11-27 14:19:01 +01:00
• a57fca63bf Cleanup code structure, code smells, rename paramter, break out more granular managers Michal Pikulski 2025-11-27 12:10:25 +01:00
• d083c2873e Finalized work Michal Pikulski 2025-11-27 11:27:36 +01:00
• 8bc4a88958 Finalize the cursed work Michal Pikulski 2025-11-27 00:58:19 +01:00
• 5bab6d9596 stash work Michal Pikulski 2025-11-26 17:11:02 +01:00
• 8d410b42d3 Finalize capture taking Michal Pikulski 2025-11-26 10:58:34 +01:00
• 5ad84ca3e8 Updated cement tilemap with new walls and more variation AlexanderT 2025-11-27 10:15:55 +01:00
• ce2b5738a9 WIP First iteration of the cement factory visuals. Damian-Fools 2025-11-26 19:47:38 +01:00
• 1c23a75e16 Added kitchen cabinets AlexanderT 2025-11-26 15:24:22 +01:00
• 43c5052c54 Moved Placeholder Folder to the right location Damian-Fools 2025-11-26 13:04:41 +01:00
• 97c25737b1 Asset dump AlexanderT 2025-11-26 11:59:06 +01:00
• d4b87c5139 Merge pull request 'DamianBranch' (#64) from DamianBranch into main damian 2025-11-25 19:43:23 +00:00
• 9aafafece4 Added the Rube Goldberg MAchine Damian-Fools 2025-11-25 20:41:14 +01:00
• 17d48c5812 Flower and belt puzzle steps added (WIP, just skeleton) Damian-Fools 2025-11-25 19:42:40 +01:00
• 8b1066f394 Merge branch 'main' into DamianBranch Damian-Fools 2025-11-25 16:03:11 +01:00
• c5736f836a Disabled Saves, moved Folders adn renamed Data files, and added a state machine to the cookie puzzle Damian-Fools 2025-11-25 16:02:55 +01:00
• a02b70e1f7 Fix method signatures for apple machines Michal Pikulski 2025-11-25 15:48:18 +01:00
• 83fcf24f52 Add the screenshot helper to the project, add assembly definitions and setup cross-references Michal Pikulski 2025-11-25 10:46:01 +01:00
• 57be1a941c Added Cement Factory Puzzle Data Damian-Fools 2025-11-25 03:52:47 +01:00
• 9d936c06ac Merge branch 'main' into DamianBranch Damian-Fools 2025-11-24 17:09:06 +01:00
• 86c1df55f2 First pass over MPV for the cement-statue-sticker minigame (#63) tschesky 2025-11-24 14:55:45 +00:00
• b90ab4b0ba FInalize first pass over cement decoration game cement_statue Michal Pikulski 2025-11-24 15:54:03 +01:00
• e04db31a98 Settings cleaned up, working on dragging etc. Michal Pikulski 2025-11-24 14:18:56 +01:00
• 6a41fd3340 Setup scene for the statue nonsense Michal Pikulski 2025-11-24 13:43:42 +01:00
• e9a6f35ef5 cement daddy Michal Pikulski 2025-11-24 09:40:21 +01:00
• e33de5da3d Fix the sound bird interactaiblity issues. Michal Pikulski 2025-11-24 11:41:47 +01:00
• f0abc4760b Hide Ana-Lyse's dialogue component when taking photo, also correctly restore a hidden state with the dialogu turned off Michal Pikulski 2025-11-24 11:07:46 +01:00
• ff28bd23cb Fix up eagle eye's weirdness, add option to auto clear saves Michal Pikulski 2025-11-24 10:37:40 +01:00
• b20192a03a cement daddy michal_dumb Michal Pikulski 2025-11-24 09:40:21 +01:00
• 56c2d03099 Merge branch 'main' into DamianBranch Damian-Fools 2025-11-23 22:37:04 +01:00