Nutbuster
a39c3c24e2
Merge branch 'master' into Monster-Update-6
...
Move mod_menu into it's own file in src/
2021-07-22 21:28:18 +10:00
tick bumley
160cb1037f
Merge pull request '5.1.1 release' ( #62 ) from 5.1.1 into master
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/62
2021-07-21 18:45:21 +00:00
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
tick bumley
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
Nutbuster
d9de78e09f
Merge branch 'master' of https://git.snootgame.xyz/Cavemanon/SnootGame
2021-07-14 11:23:06 +10:00
Nutbuster
f5abb91f91
Fix Tarot if/else branch flow
2021-07-14 11:20:28 +10:00
tick bumley
652372713b
LAST HOTFIX additional updater end user diagnostics
2021-07-13 17:47:23 -05:00
tick bumley
fdfd364d43
HOTFIX TO FIX STUPID FUCKING 6 HOUR UPDATE COOLDOWN
2021-07-11 22:00:01 -05: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
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
Nutbuster
9fa26bc67b
Misc template fix
2021-07-06 14:25:16 +10:00
Nutbuster
0c4aab6858
Namebox is default long
2021-07-05 10:14:46 +10:00
Nutbuster
0959d0f275
Documentation for modders & empty create directory
2021-07-05 10:06:55 +10:00
Nutbuster
cd780dfa36
Clean up Mod Menu and other details
2021-07-05 09:35:56 +10:00
Nutbuster
400d305f23
Change Mods folder struct, everything is contained
2021-07-05 04:37:26 +10:00
Nutbuster
76e3212bf1
Remove trailing backspaces & vbox instead of grid
2021-07-04 19:51:24 +10:00
Nutbuster
c1e7fd2bbf
Add Error Message for not having Mods
2021-07-04 19:00:39 +10:00
Nutbuster
f9edccabd4
Add Mod Support
2021-07-04 16:21:04 +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
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
MichaelYick
2020d5e1a8
fixes for #43
2021-06-27 20:01:26 -05:00
MichaelYick
e02118180e
Ready to test the stuff for website
2021-06-27 19:42:23 -05:00
MichaelYick
19b3b2ee0c
OH NO IT BROKE FURTHER
2021-06-24 18:51:08 -05:00
tick bumley
06df0be4b5
Merge pull request 'Correction to Fixes #7 - Game should be able to update itself' ( #42 ) from coolestskinnieinthejungle-patch-updates into updates
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/42
2021-06-24 15:07:16 +00:00
tick bumley
002405a5fc
use of Function() to call UpdateCheck()
2021-06-24 05:14:33 +00:00
MichaelYick
397de2b950
Worked a little on the code, its absolutely broken. Going to ask for help
2021-06-23 20:12:27 -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
Nutbuster
tick bumley
Nio
lazysnake
MichaelYick