Commit graph

1013 commits

Author SHA1 Message Date
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
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
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