Commit Graph

523 Commits

Author SHA1 Message Date
32601e5ef8 Card Data Update 2025-11-07 15:54:25 +01:00
dba3c5a1af Changed the Arrows of the Scrapbook 2025-11-07 14:05:12 +01:00
5c4b8825ee Card Creation 2025-11-07 13:57:36 +01:00
355c3fabc8 Merge branch 'main' into DamianBranch 2025-11-07 13:35:19 +01:00
00e1746ac4 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction 2025-11-07 13:34:56 +01:00
d7d9d74a7b Change to Card NamePlaque, and Card Album Prefabs 2025-11-07 13:34:30 +01:00
Michal Pikulski
5b70042005 Update minigames to start unlocked 2025-11-07 13:31:49 +01:00
6aacd9234c ExtraConfirmations Screens and WIP for the diving minigame end screen 2025-11-07 13:01:22 +01:00
Michal Pikulski
32a477b843 WOrking card dragging, slotting, previewing 2025-11-07 12:51:45 +01:00
Michal Pikulski
77f7d1ee97 Working card dragging into album slots, persistent slots 2025-11-07 11:24:19 +01:00
Michal Pikulski
0d8702a5f6 Move some tools for consistency, audo add feature for card debugger 2025-11-07 09:32:43 +01:00
Michal Pikulski
3e607f3857 Slotting cards in album after revealing 2025-11-07 01:51:03 +01:00
Michal Pikulski
debe70c9b1 Hammer out some last flows of the booster opening page 2025-11-06 23:52:02 +01:00
DamianCorazza
fda67e4b92 Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction 2025-11-06 23:43:52 +01:00
DamianCorazza
3a1eef8a12 Cut up the Prefab and reset some pivots 2025-11-06 23:43:38 +01:00
Michal Pikulski
a705b3a829 Semi-working rarity upgrades 2025-11-06 23:18:02 +01:00
Michal Pikulski
d23c000347 Working flipping cards 2025-11-06 23:17:55 +01:00
Michal Pikulski
774f27410a Working drag, tap, open sequence, looking pretty OK 2025-11-06 23:17:46 +01:00
Michal Pikulski
1b1ea65744 Fire off impulses on booster taps 2025-11-06 23:17:36 +01:00
Michal Pikulski
d01859cec0 More snappy tap animation 2025-11-06 23:17:35 +01:00
a9b9fb87b5 Merge pull request 'Added New Card Graphics' (#50) from DamianBranch into main
Reviewed-on: #50
2025-11-06 21:31:23 +00:00
153ab2bb08 Merge branch 'main' into DamianBranch 2025-11-06 21:31:12 +00:00
journaliciouz
f576dad677 New and crispy apple map 2025-11-06 22:28:38 +01:00
DamianCorazza
3ac90bea1e Added New Card Graphics 2025-11-06 22:17:43 +01:00
430522b872 Merge pull request 'DamianBranch' (#49) from DamianBranch into main
Reviewed-on: #49
2025-11-06 18:45:03 +00:00
ba6f671104 Merge branch 'main' into DamianBranch 2025-11-06 19:44:15 +01:00
984c8f0566 Added TownMap Icons (WIP need to check with Michal) 2025-11-06 19:44:02 +01:00
69e628ceb8 Added New art for level selection 2025-11-06 19:22:26 +01:00
Michal Pikulski
1c9d0333ea Fix editor compilation issue 2025-11-06 18:23:21 +01:00
eb9da316ad Put the appswitcher in the overworld for build test 2025-11-06 17:59:26 +01:00
7fb0b14337 Merge branch 'ui-animation' 2025-11-06 17:49:57 +01:00
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