Commit Graph

184 Commits

Author SHA1 Message Date
DamianCorazza
d00d20121c WIP Moving work from home to the office. 2025-11-04 12:21:02 +01:00
DamianCorazza
7051267c33 ScrapBookPrefab and textures 2025-11-04 04:59:33 +01:00
DamianCorazza
475f54b704 Modified TrashCan Prefab and Fixed Bunflers hard to grab. 2025-11-03 12:38:53 +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
cdbb2e0d3f Added audio of Pulver combining stuff 2025-10-31 15:45:28 +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
Michal Pikulski
f6ebadf21e Update Pause menu and MinigameSelection menu to icon-based with no text 2025-10-30 10:47:34 +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
54f355beda Merge branch 'main' into DamianCardStyles 2025-10-29 12:34:48 +00: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
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
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
7743fbdd8f Merge branch 'main' into DamianCardStyles 2025-10-28 09:51:42 +00:00
Michal Pikulski
fdfddaec95 Make combine animations and smacks ground Pulve 2025-10-27 14:43:24 +01:00
Michal Pikulski
f5c1ae51cd MPV of save/load system 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
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
2e05e500c9 Added the art for cards 2025-10-23 16:55:01 +02:00
786167115c Modified Speed of minigame and two small adjustments to prefabs. 2025-10-22 11:03:15 +02:00
Michal Adam Pikulski
8591490cb2 Make the score display a UIPage as well 2025-10-22 10:37:59 +02:00
acf3ecec3f Added Highlights to the quarry button and the Bunfflers. 2025-10-22 10:36:56 +02:00
Michal Adam Pikulski
68886aafd4 Roll the pause menu into the UI page system 2025-10-22 09:35:34 +02:00
Michal Adam Pikulski
357f942e0d Moved UIPageController out of the card system and into a dedicated prefab 2025-10-22 09:20:18 +02:00
Michal Adam Pikulski
5763aeb4b3 Un-fuck the booster opening page 2025-10-22 07:32:45 +02:00
Michal Adam Pikulski
3aed47b183 Fix input issues 2025-10-21 15:58:13 +02:00
Michal Adam Pikulski
00f6d2c6c6 Add a dirty booster pack opening sequence 2025-10-21 15:40:47 +02:00
DamianCorazza
0a240da9a7 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction 2025-10-21 14:54:08 +02:00
DamianCorazza
14d1b8316e Added New Textures for Cards And Configure basic Card Variations 2025-10-21 14:53:59 +02:00
MacBuilder
8e90878a97 Updated diving controls and tutorial 2025-10-21 13:47:18 +02:00
journaliciouz
84dd8004d5 Monster Approach and react audio 2025-10-20 22:33:39 +02:00
1b0a206be7 Wolter sound FX 2025-10-20 17:05:24 +02:00
Michal Adam Pikulski
3e833b8991 Working card system 2025-10-20 16:33:58 +02:00
Michal Adam Pikulski
83b5c8994d Kind of working booster packs 2025-10-20 16:33:58 +02:00
Michal Adam Pikulski
32f726d229 Second draft of the consolidated card system 2025-10-20 16:33:58 +02:00
Michal Adam Pikulski
542dd9a4b7 First draft of the consolidated card system 2025-10-20 16:33:58 +02:00
Michal Adam Pikulski
07750dd5ba Add AlbumViewPage prefab 2025-10-20 16:33:58 +02:00
Michal Pikulski
80005e6b7d Setup more of the card system stuff 2025-10-20 16:33:58 +02:00
Michal Pikulski
b1df36d48c Add prefabs for main menu and album page 2025-10-20 16:33:58 +02:00
Michal Pikulski
6c23d1bcfa Add implementation plan and main UI for the card system 2025-10-20 16:33:58 +02:00
c07f64ea4f Spatial lawnmower audio implemented 2025-10-20 16:21:32 +02:00