Commit Graph

213 Commits

Author SHA1 Message Date
c4f95dd7c6 Loopable Screens between different folders 2021-07-18 08:13:17 +10:00
24324ec3ed Add data structs to support multiple folders 2021-07-17 15:54:26 +10:00
fa2cbd7137 Re touch up doc and placeholder textbuttons 2021-07-17 14:43:15 +10:00
a5c223cb1b Rehaul Gallery Menu 2021-07-17 14:22:01 +10:00
dc4b133c79 return 1 var 2021-07-17 13:32:30 +10:00
d6824c5111 CG Gallery EX
Remove Gallery Object
Text & Correct Aspect Ratio Thumbnails
Pan & Scan
2021-07-17 12:49:18 +10:00
38e62a4814 menu name consistency, reformat updates submenu, fix "extramenu" messy 2021-07-16 16:42:58 -05:00
8c4177438b Merge remote-tracking branch 'nutbuster/lazysnake/feature/ISSUE-3_CG_Gallery' into 5.1.1 2021-07-16 15:08:41 -05:00
dd61898f95 Merge pull request 'Fix Concert Tarot if/else branching' (#56) from nutbuster/SnootGame:mustard into master
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/56
2021-07-14 04:12:48 +00:00
d9de78e09f Merge branch 'master' of https://git.snootgame.xyz/Cavemanon/SnootGame 2021-07-14 11:23:06 +10:00
f5abb91f91 Fix Tarot if/else branch flow 2021-07-14 11:20:28 +10:00
652372713b LAST HOTFIX additional updater end user diagnostics 2021-07-13 17:47:23 -05:00
fdfd364d43 HOTFIX TO FIX STUPID FUCKING 6 HOUR UPDATE COOLDOWN 2021-07-11 22:00:01 -05:00
f78394ddcf Predict the images to be loaded 2021-07-12 10:57:07 +10:00
38d465145e Remove unlocked 2021-07-11 15:18:16 +10:00
5cb9c4785c Rewrite how unlocking works 2021-07-11 15:10:52 +10:00
83e4d77249 Fix scrollbar 2021-07-11 14:00:50 +10:00
8c307865af Menu cleanup & touchup 2021-07-11 13:51:25 +10:00
572ecccd3b Remove menu button images & Render buttons 2021-07-11 13:28:42 +10:00
c3ebb51d4b Remove unused functions 2021-07-11 13:10:06 +10:00
d6686c318a CG Menu Redo 2021-07-11 13:09:22 +10:00
5723216d95 Revert "added cg unlocks"
This reverts commit 2cba3b2be1.
2021-07-11 11:44:32 +10:00
cb4ac81cae Extra Spaces fix 2021-07-11 11:44:10 +10:00
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
30df22db5d merge 2021-07-11 10:53:54 +10:00
fce061e138 Merge remote-tracking branch 'origin/Monster-Update-6' into lazysnake/feature/ISSUE-3_CG_Gallery 2021-07-11 10:51:29 +10:00
87c6665084 Remove unused CG 2021-07-11 10:42:16 +10:00
8117fa1981 loadGallery SDK Fix & seen_image 2021-07-11 10:40:15 +10:00
9cb70ad986 Merge pull request 'Chapter 7 if/else indentation' (#53) from nutbuster/SnootGame:mustard into master
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/53
2021-07-11 00:10:59 +00:00
cc86a7e3f0 Fix indentation 2021-07-10 09:12:11 +10:00
daef7af4e6 HOTFIX: ignore remote update is versname is "TEST", less naggy autoup 2021-07-09 01:42:04 -05:00
19e840d627 Merge branch 'Patchy-Patch5' 2021-07-09 00:04:15 -05:00
1244ea7d01 Merge pull request 'updates branch/feature merging into patchy-patch5' (#52) from updates into Patchy-Patch5
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/52
2021-07-09 04:29:22 +00:00
c619a98e7a Merge branch 'Patchy-Patch5' into updates 2021-07-09 04:27:31 +00:00
48c8eaebec Merge pull request 'working update + autoupdate functionality for update branch' (#48) from coolestskinnieinthejungle/SnootGame:master into updates
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/48
2021-07-09 02:44:51 +00:00
c131ce6328 Merge pull request 'Fix #47 & #9 - UI Changes' (#49) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/49
2021-07-04 01:14:00 +00:00
409a84d1b7 Change yoffset magic number to variable 2021-07-04 10:28:52 +10:00
f332a988c2 minor fixes 2021-07-03 14:33:50 +02:00
2cba3b2be1 added cg unlocks 2021-07-03 14:29:38 +02:00
81cd41ac9a slightly better panning for gallery items 2021-07-03 13:57:10 +02:00
dfc3a2263e gallery opened cg panning vol1, code cleanup 2021-07-03 13:40:34 +02:00
3441dbdbf5 cg button scaling, code cleanup 2021-07-03 12:42:12 +02:00
d44edb546e Delete unused assets 2021-07-03 17:08:50 +10:00
c84be31c37 conflict resolution 2021-07-03 09:03:47 +02:00
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
385b25c7d7 Merge remote-tracking branch 'staging/master' into feature/ISSUE-3_CG_Gallery 2021-07-03 09:01:27 +02:00
a8da4e16d2 Merge remote-tracking branch 'origin/Patchy-Patch5' into feature/ISSUE-3_CG_Gallery 2021-07-03 09:01:07 +02:00
40686cf245 Adjust Input prompt around OSK 2021-07-03 16:51:13 +10:00
6ac6fb8b44 Dialogue uses more width and slightly large font size 2021-07-03 12:12:11 +10:00
b774c119f8 Disable editing page values 2021-07-03 09:23:18 +10:00