Commit graph

184 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
coolestskinnieinthejungle
b6b7f73cfb Merge remote-tracking branch 'origin/issue2-linting' into issue2-linting 2021-06-16 11:54:22 -05:00
coolestskinnieinthejungle
303de47203 stray " kill me 2021-06-16 11:54:06 -05:00
tick bumley
fddae7261d Merge branch 'master' into issue2-linting 2021-06-16 16:49:47 +00:00
coolestskinnieinthejungle
aebdeaef0f HATE GIT (conflict fix?) 2021-06-16 11:49:23 -05:00
coolestskinnieinthejungle
3512ac6f10 a fuckload of linting fixes 2021-06-16 11:30:17 -05:00
CaveManon
7902966c14 GPL Exception added lol 2021-06-16 05:23:00 -05:00
CaveManon
746f4d5e05 cleaned up bad route for this scene 2021-06-16 04:47:54 -05:00
tick bumley
a6423e3ab0 Merge branch 'Patchy-Patch5' into master 2021-06-15 16:06:11 +00:00
PrincipalSpears
f2becf7a8a Merge branch 'updates' into master 2021-06-15 08:50:45 +00:00
Nio
0485191d1c initial commit for new menu pieces skeleton, added .ico file for windows builds 2021-06-15 17:47:16 +10:00
CaveManon
5f533f95e7 Option to export for updates enabled 2021-06-14 22:51:27 -05:00
coolestskinnieinthejungle
0ee77cc555 ch14c line 470 - renamed to fang c happy 2021-06-14 18:57:33 -05:00
coolestskinnieinthejungle
50a8a50825 ch8 needed jump to chapter_9 on line 930, ty coffeeanon 2021-06-14 17:01:37 -05:00
coolestskinnieinthejungle
d41e6df4a6 ch13A fixed to xalign instead of align, ty coffeeanon 2021-06-14 17:01:23 -05:00
coolestskinnieinthejungle
ce8efa6f4c filenames were too long, caused error with build on win10 2021-06-14 16:58:34 -05:00
coolestskinnieinthejungle
26c63c4aa1 removing a comment 2021-06-13 17:34:49 -05:00
coolestskinnieinthejungle
1e4d2f9f4b LeftStage var handling fix from lazysnake 2021-06-13 17:34:22 -05:00
coolestskinnieinthejungle
b8c035b305 stella shocked img import fix from lazysnake 2021-06-13 17:33:26 -05:00
coolestskinnieinthejungle
aa9886848a whoops i fucked up some formatting and a label name
fixed now doe
2021-06-12 23:13:10 -05:00
coolestskinnieinthejungle
6411935284 fixed a few more script names that were activating my ocd almonds 2021-06-12 22:35:14 -05:00
coolestskinnieinthejungle
027631b3cf more appropriate title / tweak for these two 2021-06-12 22:32:17 -05:00
coolestskinnieinthejungle
cdec7f5ddd renpy does not like dots in labels pt.2 - fixed labels and jumps
yay
2021-06-12 22:29:29 -05:00
coolestskinnieinthejungle
535298892b renpy does not like dots in labels pt.1 - integers for chapters
fugg
2021-06-12 22:22:16 -05:00
coolestskinnieinthejungle
7648bf2a59 meant to delete this useless empty file.
go away
2021-06-12 22:21:08 -05:00
coolestskinnieinthejungle
a13b151125 goodbye old script high 2021-06-12 22:03:20 -05:00
coolestskinnieinthejungle
47d53bb065 bloomer end reformatted 2021-06-12 21:58:04 -05:00
coolestskinnieinthejungle
f1e70f0db2 tradoomer end reformatted 2021-06-12 21:58:04 -05:00
coolestskinnieinthejungle
01c9909d9d doomer end reformatted 2021-06-12 21:58:04 -05:00
coolestskinnieinthejungle
4ce721fdbb shooter end reformatted 2021-06-12 21:58:04 -05:00
coolestskinnieinthejungle
c6baa7d575 fates are decided and also given their own file 2021-06-12 21:46:55 -05:00
coolestskinnieinthejungle
9f4f3dde6b now everything up until the route splits 2021-06-12 20:23:34 -05:00