Commit Graph

242 Commits

Author SHA1 Message Date
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
tick bumley 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
Nutbuster cc86a7e3f0 Fix indentation 2021-07-10 09:12:11 +10:00
tick bumley daef7af4e6 HOTFIX: ignore remote update is versname is "TEST", less naggy autoup 2021-07-09 01:42:04 -05:00
tick bumley 19e840d627 Merge branch 'Patchy-Patch5' 2021-07-09 00:04:15 -05:00
tick bumley 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
tick bumley c619a98e7a Merge branch 'Patchy-Patch5' into updates 2021-07-09 04:27:31 +00:00
tick bumley 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
MichaelYick 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
Nutbuster 409a84d1b7 Change yoffset magic number to variable 2021-07-04 10:28:52 +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
Nutbuster d44edb546e Delete unused assets 2021-07-03 17:08:50 +10: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
Nutbuster 40686cf245 Adjust Input prompt around OSK 2021-07-03 16:51:13 +10:00
Nutbuster 6ac6fb8b44 Dialogue uses more width and slightly large font size 2021-07-03 12:12:11 +10:00
Nutbuster b774c119f8 Disable editing page values 2021-07-03 09:23:18 +10:00
Nutbuster 586f446408 Delete Save System 2021-07-03 09:18:22 +10:00
Nutbuster f789c784d8 Replace Menu Button Asset 2021-07-03 09:18:05 +10:00
Nutbuster b687054963 Move Namebox magic numbers and edit the script
Edited the fourth day script: "Fang Reed and Trish"
-> into an actual Character object "Fang Reed & Trish"
2021-07-03 08:59:32 +10:00
tick bumley 9dce47c686 persistent.updateWebServer 2021-07-02 14:26:48 -05:00
tick bumley 4338796483 at long last, update + autoupdate working as intended 2021-07-02 14:17:34 -05:00
Nutbuster 4c16ad6465 Fix say window positions and relevant infomation 2021-07-02 16:11:47 +10:00
Nutbuster 5c18593a75 Modify Namebox adjustments 2021-07-02 13:39:57 +10:00
Nutbuster f2164ab113 Fix file slot parity 2021-07-02 11:25:21 +10:00
Nutbuster 9ff428aeaf Fix mobile main menu 2021-07-02 10:35:52 +10:00
Nutbuster 367c7fd9a3 Render Main Menu Buttons' Text 2021-07-02 10:35:17 +10:00
Nutbuster ab1ef7b47e Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/Cavemanon/SnootGame into Monster-Update-6 2021-07-02 10:11:56 +10:00
Nutbuster 8d1fe9056e Quick Button style 2021-07-02 09:38:36 +10:00
Nutbuster f6a92b7f65 Windowed respects all window resolutions 2021-07-01 20:19:18 +10:00
Nutbuster b343365ef6 Bigger desktop quick button hitbox 2021-07-01 19:55:03 +10:00
Nutbuster f795f4d690 Remove magic number 2021-07-01 19:39:52 +10:00
Nutbuster fce9268dca Change idle_small_color from blue to aqua 2021-07-01 19:30:40 +10:00
Nutbuster 8f01493824 Add Outline to most fonts 2021-07-01 19:29:01 +10:00
Nutbuster 255e03dc90 Render All Quick Buttons' Text
Helper Array Function also added
2021-07-01 17:31:55 +10:00
MichaelYick 7a58c9fea9 Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/PrincipalSpears/SnootGame into Monster-Update-6 2021-07-01 01:45:35 -05:00
MichaelYick 863aa68070 fixes #13 2021-07-01 01:44:56 -05:00
Nutbuster b876f089ce Remove Quit & Move Return menu 2021-07-01 16:29:25 +10:00