Commit Graph

642 Commits

Author SHA1 Message Date
eba2befc5f Good-enough-for-now appswitcher 2025-11-06 17:49:44 +01:00
fe7612d23a Merge pull request 'DamianBranch' (#48) from DamianBranch into main
Reviewed-on: #48
2025-11-06 16:16:18 +00:00
0eb1e0efd5 Merge branch 'main' into DamianBranch 2025-11-06 17:11:57 +01:00
d4f6505c85 Merge branch 'DamianBranch' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction into DamianBranch 2025-11-06 17:11:42 +01:00
5e4de3ebef Added the Eagle Eye button, It's a standalone prefab that can be added to other canvases. 2025-11-06 17:11:30 +01:00
78d0bf6441 AppSwitcher work 2025-11-06 15:36:02 +01:00
Michal Pikulski
7862af7f8b Cleanup 2025-11-06 15:33:30 +01:00
Michal Pikulski
2d10d92bf5 Add a semi-finished booster opening sequence 2025-11-06 15:27:08 +01:00
Michal Pikulski
4e0c9cb4c4 Working visual part 2025-11-06 15:27:08 +01:00
Michal Pikulski
95daea8d34 Code up the card part 2025-11-06 15:27:08 +01:00
Michal Pikulski
b6d8586eab Setup booster page opening 2025-11-06 15:27:08 +01:00
5792c01908 Merge pull request 'Update LevelConfirmMenu.prefab' (#47) from DamianBranch into main
Reviewed-on: #47
2025-11-06 14:07:19 +00:00
a41136e69e Merge branch 'main' into DamianBranch 2025-11-06 14:07:13 +00:00
9a4f604314 Update LevelConfirmMenu.prefab 2025-11-06 15:06:47 +01:00
6a1831c5e2 Merge branch 'main' into ui-animation 2025-11-06 14:27:53 +01:00
e7ff137d57 Implemented new Lottie plugin, added AppSwitcher icon 2025-11-06 14:27:44 +01:00
3f70591686 Merge pull request 'DamianBranch' (#46) from DamianBranch into main
Reviewed-on: #46
2025-11-06 13:21:55 +00:00
a3d0c3232d Merge branch 'main' into DamianBranch 2025-11-06 14:17:35 +01:00
0f1a0cfecc Delete CardSystem.prefab 2025-11-06 14:17:23 +01:00
2b3154c22b Level Change and Confirmation popups art change 2025-11-06 14:11:52 +01:00
3de3441a04 Added Lottie animation support plugin 2025-11-06 12:03:45 +01:00
Michal Pikulski
b17ba7bd98 Finish setting up the basic album layout 2025-11-06 01:25:13 +01:00
0ac8f4b70c CHanged Menus Backgrounds 2025-11-06 00:22:07 +01:00
Michal Pikulski
50c0a12391 New card UI, new visual config, new card definitions, new working editor window for authoring! 2025-11-05 23:50:15 +01:00
DamianCorazza
1442a2426b Changed ScrapBook Icon 2025-11-05 23:14:27 +01:00
629b137421 Added New Map TExture 2025-11-05 17:46:56 +01:00
0dc3f3e803 Added New Menu Background Textures 2025-11-05 17:25:26 +01:00
journaliciouz
949bd6d32b You can close the card album again 2025-11-05 16:36:00 +01:00
journaliciouz
0a183703db Unfucked the card UI 2025-11-05 16:00:22 +01:00
journaliciouz
54d6603f17 Merge branch 'main' into ui-animation 2025-11-05 14:49:08 +01:00
journaliciouz
041159a02a Implemented scrapbook assets into book plugin 2025-11-05 14:48:10 +01:00
1a6324b054 Clarifying name changes for cards 2025-11-05 12:59:57 +01:00
journaliciouz
9c8eababb3 Installed book plugin, fixed compiler errors 2025-11-05 12:03:39 +01:00
journaliciouz
92c08da136 Merge branch 'main' into ui-animation 2025-11-05 11:17:47 +01:00
1bc80fd73d Merge pull request 'DamianBranch' (#45) from DamianBranch into main
Reviewed-on: #45
2025-11-04 17:57:58 +00:00
c85b542215 Merge branch 'main' into DamianBranch 2025-11-04 17:57:49 +00:00
282904bae0 Moved the prefab 2025-11-04 18:56:57 +01:00
035fdda2be Added the textures for a smaller version of the scrapbook. 2025-11-04 18:51:42 +01:00
be22d09e39 Fixed SoundBird Bug 2025-11-04 16:26:33 +01:00
aabe023c64 Small fixes to quarry 2025-11-04 13:21:28 +01:00
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
journaliciouz
4d23a2ba8f confetti work 2025-11-03 15:52:52 +01:00
journaliciouz
ae840a4b2f Changed Awake/Start to OnAwake 2025-11-03 14:44:15 +01:00
DamianCorazza
475f54b704 Modified TrashCan Prefab and Fixed Bunflers hard to grab. 2025-11-03 12:38:53 +01:00
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