Commit Graph

402 Commits

Author SHA1 Message Date
988bc53ec8 Finally, priority VO 2025-10-29 17:01:02 +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
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
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 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
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
2e05e500c9 Added the art for cards 2025-10-23 16:55:01 +02:00
Michal Adam Pikulski
35acaddca5 FIx the issue of end game screen appearing twice 2025-10-22 11:50:24 +02:00
1cf8076488 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction 2025-10-22 11:03:23 +02:00
786167115c Modified Speed of minigame and two small adjustments to prefabs. 2025-10-22 11:03:15 +02:00
c80089e5fc Pushed app icons to get Steve Jobs off my back 2025-10-22 10:58:51 +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
faed21edab Make the Backpack UI visible in the AppleHillsLevel as well 2025-10-22 09:05: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
Michal Adam Pikulski
2abcf5c76a Cleanup the editor assembly and provide a tool overview doc 2025-10-21 14:54:58 +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