Commit Graph

84 Commits

Author SHA1 Message Date
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
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
f143bc1eda renpy demands a "start" label 2021-06-18 13:17:21 -05:00
99a458cf40 missing return on line 53 added 2021-06-18 13:02:55 -05:00
67f6080b3a naming consistency 2021-06-18 12:59:52 -05:00
12e6a7f6fa h8 python indent formatting + replaced a stray jump w/ return 2021-06-18 12:59:39 -05:00
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
dda353b81c renaming again 2021-06-17 21:14:47 -05:00
fffe7b520a removed a empty line and typo in title 2021-06-17 21:10:32 -05:00
ba47180cc8 refactor to the refactor 2021-06-17 21:01:49 -05:00
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
b6b7f73cfb Merge remote-tracking branch 'origin/issue2-linting' into issue2-linting 2021-06-16 11:54:22 -05:00
303de47203 stray " kill me 2021-06-16 11:54:06 -05:00
fddae7261d Merge branch 'master' into issue2-linting 2021-06-16 16:49:47 +00:00
aebdeaef0f HATE GIT (conflict fix?) 2021-06-16 11:49:23 -05:00
3512ac6f10 a fuckload of linting fixes 2021-06-16 11:30:17 -05:00
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
746f4d5e05 cleaned up bad route for this scene 2021-06-16 04:47:54 -05:00
a6423e3ab0 Merge branch 'Patchy-Patch5' into master 2021-06-15 16:06:11 +00:00
d74e3bb6c1 Merge branch 'updates' into Patchy-Patch5 2021-06-15 09:52:29 +00:00
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
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
7baee7dc2b Merge branch 'updates' into Patchy-Patch5 2021-06-15 05:02:29 +00:00
5f533f95e7 Option to export for updates enabled 2021-06-14 22:51:27 -05:00
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
0ee77cc555 ch14c line 470 - renamed to fang c happy 2021-06-14 18:57:33 -05:00
50a8a50825 ch8 needed jump to chapter_9 on line 930, ty coffeeanon 2021-06-14 17:01:37 -05:00
d41e6df4a6 ch13A fixed to xalign instead of align, ty coffeeanon 2021-06-14 17:01:23 -05:00
ce8efa6f4c filenames were too long, caused error with build on win10 2021-06-14 16:58:34 -05:00
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
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
26c63c4aa1 removing a comment 2021-06-13 17:34:49 -05:00
1e4d2f9f4b LeftStage var handling fix from lazysnake 2021-06-13 17:34:22 -05:00
b8c035b305 stella shocked img import fix from lazysnake 2021-06-13 17:33:26 -05:00
74eb44ca99 Merge pull request 'issue2-init' (#1) from issue2-init into master
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/1
2021-06-13 04:43:30 +00:00
aa9886848a whoops i fucked up some formatting and a label name
fixed now doe
2021-06-12 23:13:10 -05:00
6411935284 fixed a few more script names that were activating my ocd almonds 2021-06-12 22:35:14 -05:00
027631b3cf more appropriate title / tweak for these two 2021-06-12 22:32:17 -05:00
cdec7f5ddd renpy does not like dots in labels pt.2 - fixed labels and jumps
yay
2021-06-12 22:29:29 -05:00
535298892b renpy does not like dots in labels pt.1 - integers for chapters
fugg
2021-06-12 22:22:16 -05:00
7648bf2a59 meant to delete this useless empty file.
go away
2021-06-12 22:21:08 -05:00
a13b151125 goodbye old script high 2021-06-12 22:03:20 -05:00
47d53bb065 bloomer end reformatted 2021-06-12 21:58:04 -05:00
f1e70f0db2 tradoomer end reformatted 2021-06-12 21:58:04 -05:00
01c9909d9d doomer end reformatted 2021-06-12 21:58:04 -05:00
4ce721fdbb shooter end reformatted 2021-06-12 21:58:04 -05:00
c6baa7d575 fates are decided and also given their own file 2021-06-12 21:46:55 -05:00
9f4f3dde6b now everything up until the route splits 2021-06-12 20:23:34 -05:00
4d520f89ff first five parts now with proper naming! 2021-06-12 19:11:50 -05:00