Commit graph

186 commits

Author SHA1 Message Date
nutbuster
b4112f4621 Replace textboxes with images
Template Image & Cleaner non-bitmap text
2021-06-30 10:45:56 +10:00
PrincipalSpears
095299b9ba Merge pull request 'https://git.snootgame.xyz/Cavemanon/SnootGame/issues/41#issuecomment-585' (#2) from Cavemanon/SnootGame:pr/41 into chapter-1-choreo
Reviewed-on: https://git.snootgame.xyz/Bowie/SnootGame/pulls/2
2021-06-29 06:05:54 +00: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
fbee733ff0 Merge pull request 'Fixes #2 - Refactoring Code so its not one 28k line blob' (#17) from coolestskinnieinthejungle/SnootGame:master into Patchy-Patch5
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/17
Seems to be working
(scream at me if it is not working)
2021-06-18 22:05:56 +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
tick bumley
23d8fc43d0 Merge pull request 'issue34-bugfixes' (#7) from issue34-bugfixes into master
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/7
2021-06-18 18:25: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
tick bumley
947826bd8b Merge pull request 'issue34-init' (#6) from issue34-init into master
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/6
2021-06-18 02:45:12 +00:00
coolestskinnieinthejungle
dda353b81c renaming again 2021-06-17 21:14:47 -05:00