Cavemanon
/
SnootGame
25
0
Fork 16
Code Issues 2 Pull Requests 3 Projects Releases 4 Wiki Activity

5.1.1 release #62

Merged
coolestskinnieinthejungle merged 96 commits from 5.1.1 into master 2021-07-21 18:45:22 +00:00
Conversation 0 Commits 96 Files Changed 64 +586 -444

96 Commits

Author SHA1 Message Date
tick bumley 2eb5e199d7 character name color tweaks 2021-07-21 13:44:27 -05:00
tick bumley dfc021a662 Merge remote-tracking branch 'origin/5.1.1' into 5.1.1 2021-07-21 13:31:09 -05:00
tick bumley de994b92b9 le link change 2021-07-21 12:52:35 -05:00
tick bumley 04f7439813 Merge pull request 'Make CG Gallery Extra good' (#58) from nutbuster/SnootGame:511 into 5.1.1 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/58
 2021-07-21 17:42:46 +00:00
Nutbuster e2173db325 Rename wounds{1..9} -> wounds0{1..9} 2021-07-19 19:27:48 +10:00
Nutbuster 795a58e5ca Disable Zoom 2021-07-19 19:11:19 +10:00
Nutbuster 914dd89b02 Revert "Increase rows to 4" 
This reverts commit 0de34a0000.
 2021-07-19 19:01:40 +10:00
Nutbuster 0de34a0000 Increase rows to 4 2021-07-19 18:55:37 +10:00
Nutbuster 097befa6e7 Replay animations 2021-07-19 18:52:29 +10:00
Nutbuster bcbdc23967 Speed up transition 2021-07-19 18:13:52 +10:00
Nutbuster 24a8aeadc1 zoom_arr change & Fix 0 == 0.0 bug 2021-07-19 10:15:09 +10:00
Nutbuster 0f581c1344 mv 2021-07-18 17:54:21 +10:00
Nutbuster 3357355a8a Clean up functions 2021-07-18 17:48:00 +10:00
Nutbuster a905747e2c Menu Redo: More Horizontal than Vert 2021-07-18 17:32:48 +10:00
Nutbuster be45045956 fangtail -> fang tail 2021-07-18 17:25:34 +10:00
Nutbuster 8cd9fe8d24 Make UI for Mobile 2021-07-18 13:40:23 +10:00
Nutbuster e8b907fe1d Add back in Animations 2021-07-18 13:16:11 +10:00
Nutbuster 6b86285683 Merge remote-tracking branch 'refs/remotes/origin/5.1.1' into 511 2021-07-18 13:11:56 +10:00
Nutbuster 854ae7f546 Add CG Menu & Zoom control 2021-07-18 13:09:37 +10:00
tick bumley 46b05c8df5 redelete unused cgs and more update menu cleanliness 2021-07-17 20:50:31 -05:00
tick bumley 9c18b2e9c0 Merge remote-tracking branch 'Nio/master' into 5.1.1 2021-07-17 19:39:31 -05:00
Nutbuster c4f95dd7c6 Loopable Screens between different folders 2021-07-18 08:13:17 +10:00
Nio 1a09e1c776 colors muted 2021-07-17 16:37:32 +10:00
Nutbuster 24324ec3ed Add data structs to support multiple folders 2021-07-17 15:54:26 +10:00
Nutbuster fa2cbd7137 Re touch up doc and placeholder textbuttons 2021-07-17 14:43:15 +10:00
Nutbuster a5c223cb1b Rehaul Gallery Menu 2021-07-17 14:22:01 +10:00
Nutbuster dc4b133c79 return 1 var 2021-07-17 13:32:30 +10:00
Nio 0f3481c705 man redef remd 2021-07-17 13:27:31 +10:00
Nutbuster d6824c5111 CG Gallery EX 
Remove Gallery Object
Text & Correct Aspect Ratio Thumbnails
Pan & Scan
 2021-07-17 12:49:18 +10:00
tick bumley 38e62a4814 menu name consistency, reformat updates submenu, fix "extramenu" messy 2021-07-16 16:42:58 -05:00
tick bumley 8c4177438b Merge remote-tracking branch 'nutbuster/lazysnake/feature/ISSUE-3_CG_Gallery' into 5.1.1 2021-07-16 15:08:41 -05:00
Nio afe98372b5 colors modified muted ver 1 on extras 2021-07-15 18:48:31 +10:00
Nio 7d76bd3782 font color tweak 2021-07-14 18:16:01 +10:00
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
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
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
MichaelYick afd1def9d3 Merge pull request 'Fixes: #8 - Namebox position for mobile' (#45) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/45
 2021-07-01 05:49:44 +00:00
Nutbuster 123ee89e2d Fix Namebox position for mobile 2021-06-30 15:54:29 +10:00
MichaelYick e5769eb984 Merge pull request 'Fixes: #11 - Mobile Buttons' (#44) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/44
 2021-06-30 02:23:33 +00:00
Nutbuster 6e10937b8b Bigger Buttons 2021-06-30 12:05:31 +10:00
Nutbuster b4112f4621 Replace textboxes with images 
Template Image & Cleaner non-bitmap text
 2021-06-30 10:45:56 +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
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