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 |
|
Bowie
|
d2ecb69f1c
|
finish ch2 first pass, add SFX from gdrive
|
2021-07-10 19:29:47 +01:00 |
|
nutbuster
|
cc86a7e3f0
|
Fix indentation
|
2021-07-10 09:12:11 +10:00 |
|
Bowie
|
fbd3eacc33
|
add yet another missing sound effect
|
2021-07-09 21:04:13 +01:00 |
|
coolestskinnieinthejungle
|
daef7af4e6
|
HOTFIX: ignore remote update is versname is "TEST", less naggy autoup
|
2021-07-09 01:42:04 -05:00 |
|
tick bumley
|
c619a98e7a
|
Merge branch 'Patchy-Patch5' into updates
|
2021-07-09 04:27:31 +00:00 |
|
Bowie
|
6f75382f66
|
add missing ambient track
|
2021-07-08 23:46:53 +01:00 |
|
Bowie
|
9e19298144
|
stash ch2 changes
|
2021-07-08 23:10:54 +01: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 |
|
Bowie
|
528be7f2c8
|
clean up
|
2021-07-04 19:06:52 +01:00 |
|
Bowie
|
d439bfc005
|
move CTC indicator to end of text
|
2021-07-04 16:49:16 +01:00 |
|
Bowie
|
3a41a71118
|
Merge branch 'Monster-Update-6' into chapter-1-choreo
# Conflicts:
# game/script.rpy
|
2021-07-04 16:37:03 +01:00 |
|
Bowie
|
8b980c00c0
|
make CTC indicator less intrusive
|
2021-07-04 16:33:50 +01:00 |
|
Bowie
|
19bad8b682
|
mix up slapstick SFX
|
2021-07-04 16:18:46 +01:00 |
|
Bowie
|
1c49e00b94
|
replace classroom anxiety SFX
|
2021-07-04 16:00:51 +01: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 |
|
nutbuster
|
409a84d1b7
|
Change yoffset magic number to variable
|
2021-07-04 10:28:52 +10:00 |
|
Bowie
|
981b7df998
|
crunch some sounds
|
2021-07-03 20:41:06 +01:00 |
|
Bowie
|
5335540d0b
|
remove unused effect
|
2021-07-03 18:39:32 +01:00 |
|
Bowie
|
c3c7b3b753
|
add missing punch to Naser's outburst
|
2021-07-03 17:08:48 +01:00 |
|
Bowie
|
f7db5fb407
|
Merge branch 'Monster-Update-6' into chapter-1-choreo
# Conflicts:
# game/script.rpy
|
2021-07-03 15:52:39 +01:00 |
|
Bowie
|
0df8dd9f94
|
fix line in canteen scene
|
2021-07-03 15:44:06 +01:00 |
|
Bowie
|
7832a18822
|
more ch1 tweaks before looking at ch2
|
2021-07-03 15:34:06 +01:00 |
|
Bowie
|
9290b34829
|
add missing scene after bench scene, SFX uplift
|
2021-07-03 14:02:55 +01: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 |
|
Bowie
|
e19566dfa8
|
replace bell sound
|
2021-07-03 10:12:53 +01: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 |
|
Bowie
|
bc4c4a2304
|
add ambience to reflective scene after concert
|
2021-07-02 22:11:04 +01:00 |
|
Bowie
|
56fe353dd8
|
SFX uplift for pizza scene
|
2021-07-02 22:01:58 +01:00 |
|
Bowie
|
cd44add13d
|
cleanup, add more TODOs
|
2021-07-02 21:40:41 +01:00 |
|
Bowie
|
83b680efe1
|
SFX & music tweaks, TODOs for missing scene after Anon meets Naser & Naomi
|
2021-07-02 21:19:06 +01:00 |
|
coolestskinnieinthejungle
|
9dce47c686
|
persistent.updateWebServer
|
2021-07-02 14:26:48 -05:00 |
|
coolestskinnieinthejungle
|
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 |
|
Bowie
|
6ae319c6ce
|
lined up end of ch1 with start of ch2
|
2021-07-01 21:17:38 +01:00 |
|
Bowie
|
075743f063
|
music changes to some ch1 scenes, add another music channel for crossfade effect
|
2021-07-01 21:09:46 +01:00 |
|
Bowie
|
e1eee3852d
|
Naser gives fewer fucks when blocking Trish, volume control back up, added outdoor ambience, converted some SFX to .ogg format
|
2021-07-01 18:40:10 +01: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 |
|
CaveManon
|
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 |
|
CaveManon
|
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 |
|
nutbuster
|
123ee89e2d
|
Fix Namebox position for mobile
|
2021-06-30 15:54:29 +10: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 |
|
CaveManon
|
e77bcbb9a3
|
https://git.snootgame.xyz/Cavemanon/SnootGame/issues/41#issuecomment-585
|
2021-06-29 01:01:03 -05:00 |
|
Bowie
|
fe1391a8a0
|
made trish shorter when confronting Naser
|
2021-06-28 21:52:46 +01:00 |
|
Bowie
|
f26f6a33fd
|
Merge branch 'Monster-Update-6' into chapter-1-choreo
# Conflicts:
# game/script.rpy
# game/script/1.first-two-days-anon-meets-fang.rpy
|
2021-06-28 20:57:01 +01:00 |
|
CaveManon
|
2020d5e1a8
|
fixes for #43
|
2021-06-27 20:01:26 -05:00 |
|
CaveManon
|
e02118180e
|
Ready to test the stuff for website
|
2021-06-27 19:42:23 -05:00 |
|
Bowie
|
98275a6cfe
|
slight change to crowd noises at the failed concert
|
2021-06-27 15:36:02 +01:00 |
|
Bowie
|
66e3ab693b
|
yet more ch1 tweaks
|
2021-06-27 13:14:53 +01:00 |
|
Bowie
|
6828f773d6
|
add Spears roar to concert aftermath
|
2021-06-27 12:37:23 +01:00 |
|
Bowie
|
22d44dcc74
|
fix Naser posessing naomi for a single line of dialogue
|
2021-06-26 20:58:55 +01:00 |
|
Bowie
|
b03361b476
|
change CTC icon to start off at min alpha instead of max alpha
|
2021-06-26 20:24:32 +01:00 |
|
Bowie
|
f687e6a032
|
fix minor continuity error
|
2021-06-26 19:58:32 +01:00 |
|
Bowie
|
c0b49eea9c
|
more minor timing tweaks
|
2021-06-26 19:35:17 +01:00 |
|
Bowie
|
799f07d0e4
|
add CTC to inner monologue
|
2021-06-26 18:15:21 +01:00 |
|
Bowie
|
d9e46a6135
|
timing tweaks
|
2021-06-26 18:09:53 +01:00 |
|
Bowie
|
6de77d3c61
|
finish first pass of chapter 1
|
2021-06-26 17:32:32 +01:00 |
|
Bowie
|
3aac53c8b7
|
minor tweaks to Spear's office scene
|
2021-06-26 15:18:42 +01:00 |
|
Bowie
|
3fd3895178
|
rework quick route to Spear's office
|
2021-06-26 15:10:03 +01:00 |
|
Bowie
|
6e7e9ac7d7
|
merge both routes through Spear's office into one with the appropriate dialogue variation, rework Spear's office scene
|
2021-06-26 13:51:28 +01:00 |
|
Bowie
|
a22aa136cb
|
change CTC icon, add ambient sound channel, rework 'nasers a bro' scenes
|
2021-06-26 12:41:19 +01:00 |
|
CaveManon
|
19b3b2ee0c
|
OH NO IT BROKE FURTHER
|
2021-06-24 18:51:08 -05:00 |
|
Bowie
|
468f367261
|
rework anon's morning routine
|
2021-06-24 22:32:48 +01:00 |
|
Bowie
|
3af087ee77
|
rework concert disaster & subsequent run in with Spears
|
2021-06-24 21:05:45 +01:00 |
|
Bowie
|
541645f810
|
rework meeting Spear, Naser's heart-to-heart, add placeholder support for CTC, add support for ambient sound loop channel
|
2021-06-24 19:47:45 +01:00 |
|
tick bumley
|
002405a5fc
|
use of Function() to call UpdateCheck()
|
2021-06-24 05:14:33 +00:00 |
|
CaveManon
|
397de2b950
|
Worked a little on the code, its absolutely broken. Going to ask for help
|
2021-06-23 20:12:27 -05:00 |
|
CaveManon
|
203077c184
|
Merge branch 'Patchy-Patch5' of https://git.snootgame.xyz/PrincipalSpears/SnootGame into Patchy-Patch5
|
2021-06-23 18:29:42 -05:00 |
|
CaveManon
|
05df5c6448
|
Minor grammatical errors, #38, patched.
|
2021-06-23 18:29:07 -05:00 |
|
PrincipalSpears
|
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 |
|
CaveManon
|
47140a15fe
|
pulling stuff
|
2021-06-21 17:03:36 -05:00 |
|
CaveManon
|
335d96402d
|
Bug #39 fixed. For some reason, a random alarm started playing.
|
2021-06-21 17:02:39 -05:00 |
|
Bowie
|
6316d33c1f
|
finish canteen rework
|
2021-06-21 22:59:04 +01:00 |
|
Bowie
|
f56c5dc80b
|
rework canteen opening
|
2021-06-21 22:03:37 +01:00 |
|
Nio
|
c6a94f7528
|
new control event buttons
|
2021-06-22 00:38:35 +10:00 |
|
PrincipalSpears
|
445f4490c3
|
Merge pull request 'Minor Issue Fixes Issues #25 and #31' (#33) from stillzero/SnootGame:master into Patchy-Patch5
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/33
|
2021-06-21 00:09:04 +00:00 |
|
Bowie
|
6c07424023
|
make Anon's first class more unpleasant, start reworking canteen scene
|
2021-06-20 22:20:18 +01:00 |
|
Bowie
|
8c3bf9e54c
|
rework choreo for Anon's first class
|
2021-06-20 17:16:30 +01:00 |
|
Bowie
|
60a04b8daa
|
add spotlight effect during Fang introduction
|
2021-06-20 16:17:16 +01:00 |
|
Bowie
|
b4e561e1d7
|
minor tweaks
|
2021-06-20 12:43:13 +01:00 |
|
Bowie
|
f6b55addfa
|
rework choreo up to first meeting Naomi & Naser
|
2021-06-20 12:27:09 +01:00 |
|
CaveManon
|
ee770d3059
|
changed files to accomidate asset changes
|
2021-06-20 00:25:26 -05:00 |
|
CaveManon
|
58d71a632e
|
compressed assets
|
2021-06-20 00:16:10 -05:00 |
|
CaveManon
|
1f731ec0f6
|
Merge branch 'Patchy-Patch5' of https://git.snootgame.xyz/PrincipalSpears/SnootGame into Patchy-Patch5
|
2021-06-19 23:33:11 -05:00 |
|
Bowie
|
b86cac340b
|
add basic utility for debugging game variables
|
2021-06-19 14:36:02 +01:00 |
|
stillzero
|
16466f62ac
|
added missed wing label
|
2021-06-18 22:05:42 -05:00 |
|
stillzero
|
09ec83d90c
|
adding fixes to merge
|
2021-06-18 21:36:38 -05:00 |
|
CaveManon
|
f7a9dd8aec
|
updated cg from artists
|
2021-06-18 21:05:50 -05:00 |
|
stillzero
|
614c29eec1
|
conflict resolution
|
2021-06-18 21:03:15 -05:00 |
|
PrincipalSpears
|
f7c785b5b1
|
Merge pull request 'sync patchy patch with some master changes' (#36) from master into Patchy-Patch5
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/36
|
2021-06-19 00:20:41 +00:00 |
|
PrincipalSpears
|
b64f2a15aa
|
Merge pull request 'Fixes #6 - better gitignore' (#35) from gitignore into master
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/35
|
2021-06-18 21:13:17 +00:00 |
|
coolestskinnieinthejungle
|
f143bc1eda
|
renpy demands a "start" label
|
2021-06-18 13:17:21 -05:00 |
|
coolestskinnieinthejungle
|
99a458cf40
|
missing return on line 53 added
|
2021-06-18 13:02:55 -05:00 |
|
coolestskinnieinthejungle
|
67f6080b3a
|
naming consistency
|
2021-06-18 12:59:52 -05:00 |
|
coolestskinnieinthejungle
|
12e6a7f6fa
|
h8 python indent formatting + replaced a stray jump w/ return
|
2021-06-18 12:59:39 -05: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 |
|
coolestskinnieinthejungle
|
dda353b81c
|
renaming again
|
2021-06-17 21:14:47 -05:00 |
|
coolestskinnieinthejungle
|
fffe7b520a
|
removed a empty line and typo in title
|
2021-06-17 21:10:32 -05:00 |
|
coolestskinnieinthejungle
|
ba47180cc8
|
refactor to the refactor
|
2021-06-17 21:01:49 -05:00 |
|
CaveManon
|
05ae546d4b
|
cleaned up and improved .gitignore
|
2021-06-17 20:39:10 -05:00 |
|
stillzero
|
544640a554
|
adding scene changes for issue #25
|
2021-06-17 19:47:29 -05: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 |
|
Your Name
|
00a4b11694
|
issue 25 tweaks
|
2021-06-17 06:49:15 -05:00 |
|
Your Name
|
c89901924d
|
issue 25 tweaks
|
2021-06-17 06:46:10 -05:00 |
|
Your Name
|
1f29121588
|
wingStory if/else added
|
2021-06-17 06:11:15 -05:00 |
|