WIP: Fixes #3 - Image Gallery #14

Closed
dagoddamnlazysnake wants to merge 18 commits from feature/ISSUE-3_CG_Gallery into Patchy-Patch5

18 Commits

Author SHA1 Message Date
lazysnake f332a988c2 minor fixes 2021-07-03 14:33:50 +02:00
lazysnake 2cba3b2be1 added cg unlocks 2021-07-03 14:29:38 +02:00
lazysnake 81cd41ac9a slightly better panning for gallery items 2021-07-03 13:57:10 +02:00
lazysnake dfc3a2263e gallery opened cg panning vol1, code cleanup 2021-07-03 13:40:34 +02:00
lazysnake 3441dbdbf5 cg button scaling, code cleanup 2021-07-03 12:42:12 +02:00
lazysnake c84be31c37 conflict resolution 2021-07-03 09:03:47 +02:00
lazysnake 4f707ff8f4 Merge remote-tracking branch 'staging/Patchy-Patch5' into feature/ISSUE-3_CG_Gallery
# Conflicts:
#	game/screens.rpy
#	game/script.rpy
2021-07-03 09:03:33 +02:00
lazysnake 385b25c7d7 Merge remote-tracking branch 'staging/master' into feature/ISSUE-3_CG_Gallery 2021-07-03 09:01:27 +02:00
lazysnake a8da4e16d2 Merge remote-tracking branch 'origin/Patchy-Patch5' into feature/ISSUE-3_CG_Gallery 2021-07-03 09:01:07 +02:00
lazysnake b1cdf930a9 cg gallery wip vol5: slightly nicer pagination 2021-06-17 20:38:46 +02:00
lazysnake 1f3a04c355 cg gallery wip vol5: unlocking cgs 2021-06-17 20:31:04 +02:00
lazysnake a8c65161be removed unnecessary code 2021-06-17 18:54:57 +02:00
lazysnake 9f0ade7fe4 cg gallery wip vol4: pagination 2021-06-17 18:53:01 +02:00
lazysnake f4a7c84f81 cg gallery wip vol3: basic pagination handler 2021-06-17 18:36:25 +02:00
lazysnake f819958d80 cg gallery wip vol2: commenting, minor code cleanup 2021-06-16 21:54:10 +02:00
lazysnake bd6c710380 cg gallery wip vol2: load all files 2021-06-14 21:27:30 +02:00
lazysnake d4781d2d4c Merge remote-tracking branch 'staging/master' into feature/ISSUE-3_CG_Gallery 2021-06-14 20:41:11 +02:00
lazysnake 8cd9643818 cg gallery wip vol1: gallery data init, gallery screen 2021-06-12 21:50:48 +02:00