Closes: lazysnake/feature/ISSUE-3_CG_Gallery #3 #55

Closed
nutbuster wants to merge 50 commits from lazysnake/feature/ISSUE-3_CG_Gallery into Monster-Update-6

50 Commits

Author SHA1 Message Date
Nutbuster f78394ddcf Predict the images to be loaded 2021-07-12 10:57:07 +10:00
Nutbuster 38d465145e Remove unlocked 2021-07-11 15:18:16 +10:00
Nutbuster 5cb9c4785c Rewrite how unlocking works 2021-07-11 15:10:52 +10:00
Nutbuster 83e4d77249 Fix scrollbar 2021-07-11 14:00:50 +10:00
Nutbuster 8c307865af Menu cleanup & touchup 2021-07-11 13:51:25 +10:00
Nutbuster 572ecccd3b Remove menu button images & Render buttons 2021-07-11 13:28:42 +10:00
Nutbuster c3ebb51d4b Remove unused functions 2021-07-11 13:10:06 +10:00
Nutbuster d6686c318a CG Menu Redo 2021-07-11 13:09:22 +10:00
Nutbuster 5723216d95 Revert "added cg unlocks"
This reverts commit 2cba3b2be1.
2021-07-11 11:44:32 +10:00
Nutbuster cb4ac81cae Extra Spaces fix 2021-07-11 11:44:10 +10:00
Nutbuster 059a1381bb Remove the Nth times the style was redefined
DO NOT REDEFINE STYLES MULTIPLE TIMES
DO NOT REDEFINE STYLES MULTIPLE TIMES
DO NOT REDEFINE STYLES MULTIPLE TIMES
DO NOT REDEFINE STYLES MULTIPLE TIMES
DO NOT REDEFINE STYLES MULTIPLE TIMES
2021-07-11 11:12:11 +10:00
Nutbuster 30df22db5d merge 2021-07-11 10:53:54 +10:00
Nutbuster fce061e138 Merge remote-tracking branch 'origin/Monster-Update-6' into lazysnake/feature/ISSUE-3_CG_Gallery 2021-07-11 10:51:29 +10:00
Nutbuster 87c6665084 Remove unused CG 2021-07-11 10:42:16 +10:00
Nutbuster 8117fa1981 loadGallery SDK Fix & seen_image 2021-07-11 10:40:15 +10:00
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
MichaelYick 2020d5e1a8 fixes for #43 2021-06-27 20:01:26 -05:00
MichaelYick 203077c184 Merge branch 'Patchy-Patch5' of https://git.snootgame.xyz/PrincipalSpears/SnootGame into Patchy-Patch5 2021-06-23 18:29:42 -05:00
MichaelYick 05df5c6448 Minor grammatical errors, #38, patched. 2021-06-23 18:29:07 -05:00
MichaelYick 2436150a75 Merge pull request 'Fixes #19 - Extras menu' (#29) from Nio/SnootGame_w_ExtrasMenu:master into Patchy-Patch5
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/29
2021-06-23 23:25:29 +00:00
Nio 2051203075 good for use for now 2021-06-23 22:03:47 +10:00
Nio 9189c258d6 new subscreen layout full on extras 2021-06-23 00:42:13 +10:00
Nio 019d467a7e reworked subscreen for extras menu, will expand soon 2021-06-23 00:21:14 +10:00
Nio c6a94f7528 new control event buttons 2021-06-22 00:38:35 +10:00
Nio 3de25169f2 updates got a shaded button on selected_idle and hover for demo 2021-06-18 18:49:03 +10:00
Nio 386a2ac5bd two buttons to with different designs, about and help 2021-06-18 17:12:12 +10:00
Nio e0b11c5df4 about button looks test 2021-06-18 17:04:39 +10: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
Nio 95e9a9ad47 positioning fist draft, all buttons done for idle 2021-06-17 21:00:26 +10:00
lazysnake f819958d80 cg gallery wip vol2: commenting, minor code cleanup 2021-06-16 21:54:10 +02:00
Nio 4a9f9d5616 wider panel added, text resized in About page, still not entirely sold on this, might do a version where it is integrated into the old menu layout 2021-06-16 18:43:06 +10:00
Nio e340999249 bg attempt for submenu - see extras -> updates for demo 2021-06-16 16:15:25 +10:00
Nio 533ef77484 test for new layout 2021-06-16 14:00:20 +10:00
Nio 767dfe1bd3 Merge branch 'master' of https://git.snootgame.xyz/Nio/SnootGame_w_ExtrasMenu 2021-06-16 13:13:45 +10:00
Nio 6891dafbcd test new menu layout 2021-06-16 13:13:26 +10: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