Commit graph

99 commits

Author SHA1 Message Date
Bowie
f56c5dc80b rework canteen opening 2021-06-21 22:03:37 +01: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
Bowie
b86cac340b add basic utility for debugging game variables 2021-06-19 14:36:02 +01: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
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
CaveManon
a789e15a39 improved gitignore 2021-06-17 20:38:01 -05:00
PrincipalSpears
db22f50be1 Merge pull request 'GPL Exception | solves #27' (#30) from GPL-Exception into master
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/30
2021-06-16 23:11:17 +00:00
CaveManon
c3680ef867 fixing conflict 2021-06-16 18:09:17 -05:00
CaveManon
6d9cc95624 Updated Exception 2021-06-16 17:48:17 -05:00
tick bumley
c24b9d8334 Merge pull request 'issue2-linting' (#5) from issue2-linting into master
fuck you

Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/5
2021-06-16 16:57:21 +00: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
PrincipalSpears
dee9282229 Merge pull request 'cleaned up bad route for this scene' (#4) from Cavemanon/SnootGame:pr/17 into master
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/4
2021-06-16 09:54:37 +00: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
d74e3bb6c1 Merge branch 'updates' into Patchy-Patch5 2021-06-15 09:52:29 +00:00
PrincipalSpears
58c12b3df0 Merge pull request 'pulling nios work over to the updates branch' (#20) from Nio/SnootGame_w_ExtrasMenu:master into updates
Reviewed-on: https://git.snootgame.xyz/PrincipalSpears/SnootGame/pulls/20
2021-06-15 08:52:05 +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
PrincipalSpears
7baee7dc2b Merge branch 'updates' into Patchy-Patch5 2021-06-15 05:02:29 +00:00
CaveManon
5f533f95e7 Option to export for updates enabled 2021-06-14 22:51:27 -05:00
tick bumley
0998c743eb Merge pull request 'issue2-extratweaks' (#3) from issue2-extratweaks into master
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/3
2021-06-15 00:18:22 +00: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
PrincipalSpears
c61f3b323c Updated README to add part about contributing
This should be the last commit directly to master BESIDES branch merges.
2021-06-14 00:47:27 +00:00
tick bumley
26f2a588b7 Merge pull request 'issue2-tweaks' (#2) from issue2-tweaks into master
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/2
2021-06-13 23:08:45 +00: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