Commit Graph

647 Commits

Author SHA1 Message Date
DamianCorazza
eb63086466 Added New Glow for the Combination of items, changed the position of gardener dialogue, changed position of the balls, changed soundbird cameraswitcher, changed hammerbird lurespot sprite order. 2025-11-03 11:43:05 +01:00
011901eb8f Refactoring of the interaction system and preliminary integration of save/load functionality across the game. (#44)
### Interactables Architecture Refactor
- Converted composition to inheritance, moved from component-based to class-based interactables. No more requirement for chain of "Interactable -> Item" etc.
- Created `InteractableBase` abstract base class with common functionality that replaces the old component
- Specialized child classes: `Pickup`, `ItemSlot`, `LevelSwitch`, `MinigameSwitch`, `CombinationItem`, `OneClickInteraction` are now children classes
- Light updates to the interactable inspector, moved some things arround, added collapsible inspector sections in the  UI for better editor experience

### State Machine Integration
- Custom `AppleMachine` inheritong from Pixelplacement's StateMachine which implements our own interface for saving, easy place for future improvements
- Replaced all previous StateMachines by `AppleMachine`
- Custom `AppleState`  extends from default `State`. Added serialization, split state logic into "EnterState", "RestoreState", "ExitState" allowing for separate logic when triggering in-game vs loading game
- Restores directly to target state without triggering transitional logic
- Migration tool converts existing instances

### Prefab Organization
- Saved changes from scenes into prefabs
- Cleaned up duplicated components, confusing prefabs hierarchies
- Created prefab variants where possible
- Consolidated Environment prefabs and moved them out of Placeholders subfolder into main Environment folder
- Organized item prefabs from PrefabsPLACEHOLDER into proper Items folder
- Updated prefab references - All scene references updated to new locations
- Removed placeholder files from Characters, Levels, UI, and Minigames folders

### Scene Updates
- Quarry scene with major updates
- Saved multiple working versions (Quarry, Quarry_Fixed, Quarry_OLD)
- Added proper lighting data
- Updated all interactable components to new architecture

### Minor editor tools
- New tool for testing cards from an editor window (no in-scene object required)
- Updated Interactable Inspector
- New debug option to opt in-and-out of the save/load system
- Tooling for easier migration

Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com>
Reviewed-on: #44
2025-11-03 10:12:51 +00:00
journaliciouz
d317fffad7 Added audio data to the item pickups 2025-10-31 16:22:48 +01:00
journaliciouz
cdbb2e0d3f Added audio of Pulver combining stuff 2025-10-31 15:45:28 +01:00
journaliciouz
5735bbcfae Made the gardener spatial 2025-10-31 14:35:28 +01:00
journaliciouz
d0da5d76cd Fixed a bug where state machines and auto play audio on awake fucked me 2025-10-31 11:19:47 +01:00
journaliciouz
d48b459fea Audio refactor almost done 2025-10-30 16:31:01 +01:00
journaliciouz
2b41a9f200 Gardener audio refactor 2025-10-30 15:25:07 +01:00
journaliciouz
e81879959e Properly queue critical VO clips 2025-10-30 14:17:47 +01:00
journaliciouz
64da60dadd Merge branch 'main' into audio-overhaul 2025-10-30 11:08:16 +01:00
9396bb76b4 Merge pull request 'Update Pause menu and MinigameSelection menu to icon-based with no text' (#43) from minigame_switch_improvements into main
Reviewed-on: #43
2025-10-30 09:48:35 +00:00
Michal Pikulski
f6ebadf21e Update Pause menu and MinigameSelection menu to icon-based with no text 2025-10-30 10:47:34 +01:00
Michal Pikulski
eeca4973ae Add component search+replace 2025-10-30 10:29:57 +01:00
988bc53ec8 Finally, priority VO 2025-10-29 17:01:02 +01:00
Michal Pikulski
a020e9af04 Update level select menu with icons and scrollable view 2025-10-29 14:37:11 +01:00
3cd2466fbb Merge branch 'main' into audio-overhaul 2025-10-29 14:22:53 +01:00
f7ee3a979a Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction 2025-10-29 14:22:38 +01:00
4e12e4f8c1 Fixed namespace kerfuffle prohibiting Android build 2025-10-29 14:22:33 +01:00
6ece49bb28 Merge pull request 'DamianCardStyles' (#42) from DamianCardStyles into main
Reviewed-on: #42
2025-10-29 12:34:56 +00:00
54f355beda Merge branch 'main' into DamianCardStyles 2025-10-29 12:34:48 +00:00
6dc49f1686 UPDATE FROM MAIN 2025-10-29 13:34:02 +01:00
d5d01e46ea Test the new cards and organized card textures in folders 2025-10-29 13:23:55 +01:00
bf0a37fe2e Merge branch 'main' into audio-overhaul 2025-10-29 11:33:13 +01:00
Michal Pikulski
c24c5df881 Update minigame switcher to only unlock when all puzzles completed 2025-10-29 11:19:17 +01:00
Michal Pikulski
bda645dcc3 Updates to minigame switching 2025-10-29 09:57:33 +01:00
2ce6452d90 Trying to make text Warp 2025-10-28 19:10:56 +01:00
Michal Pikulski
9a5735a1a1 Shitty polaroid picture 2025-10-28 16:39:28 +01:00
1a04e82920 Merge branch 'main' into audio-overhaul 2025-10-28 16:10:48 +01:00
Michal Pikulski
b56524f1f2 Updates to the level switcher UI menu, making it much larger 2025-10-28 16:04:44 +01:00
Michal Pikulski
43779c560e Cleanup compile warnings, cleanup logs, spruce up level selection menu 2025-10-28 14:31:17 +01:00
86bee75578 Implemented pauses on AudioManager 2025-10-28 13:19:33 +01:00
a5b1a4f8a0 Merge pull request 'DamianCardStyles' (#41) from DamianCardStyles into main
Reviewed-on: #41
2025-10-28 09:51:57 +00:00
7743fbdd8f Merge branch 'main' into DamianCardStyles 2025-10-28 09:51:42 +00:00
2a18489f44 Added A new tiles material and the two levels to the build 2025-10-28 10:49:37 +01:00
Michal Pikulski
a6f37ce8b5 Re-update cucumber smack 2025-10-28 10:34:41 +01:00
Michal Pikulski
fbbc8559e2 Update ItemSlots to combine images correctly 2025-10-28 10:30:43 +01:00
Michal Pikulski
548c5118ae Update render settings, add lighting settings and update some scripts 2025-10-28 10:08:49 +01:00
3a35024fbf WIP Added New Tiles (not working properly now) 2025-10-27 18:10:38 +01:00
Michal Pikulski
2aad46be98 AUtoprogress dialogue 2025-10-27 16:06:47 +01:00
Michal Pikulski
dad1f6498d Pause timescale when game is paused 2025-10-27 15:21:23 +01:00
Michal Pikulski
7005b70a0d Default tutorial to auto-progress 2025-10-27 14:56:59 +01:00
Michal Pikulski
3ea161c987 Auto vs Manual progression of the tutorial 2025-10-27 14:55:42 +01:00
Michal Pikulski
fdfddaec95 Make combine animations and smacks ground Pulve 2025-10-27 14:43:24 +01:00
64e81c8710 WIP Level Placeholders setting 2025-10-27 14:16:56 +01:00
Michal Pikulski
f5c1ae51cd MPV of save/load system vertical-slice 2025-10-27 14:00:37 +01:00
062297ce6f Merge branch 'main' into DamianCardStyles 2025-10-27 13:56:31 +01:00
2524d4dcdd WIP Card Reformatting 2025-10-24 18:07:18 +02:00
690e8b4507 Merge pull request 'Update the rotation enforcement to automatically lock device into' (#40) from screen_orientation_fun into main
Reviewed-on: #40
2025-10-24 14:50:20 +00:00
Michal Pikulski
cc797f09ef Update the rotation enforcement to automatically lock device into
desired orientation.
2025-10-24 16:48:45 +02:00
5a85a602bd Revamp game pausing and input handling. Fix minigame tutorial and end sequence. (#39)
- Revamp pausing and centralize management in GameManager
- Switch Pause implementation to be counter-based to solve corner case of multiple pause requests
- Remove duplicated Pause logic from other components
- Add pausing when browsing the card album
- Fully deliver the exclusive UI implementation
- Spruce up the MiniGame tutorial with correct pausing, hiding other UI
- Correctly unpause after showing tutorial
- Fix minigame ending sequence. The cinematic correctly plays only once now
- Replaying the minigame works

Co-authored-by: Michal Adam Pikulski <michal@foolhardyhorizons.com>
Co-authored-by: Michal Pikulski <michal@foolhardyhorizons.com>
Reviewed-on: #39
2025-10-24 11:09:32 +00:00