Commit Graph

129 Commits

Author SHA1 Message Date
tick bumley b6b7f73cfb Merge remote-tracking branch 'origin/issue2-linting' into issue2-linting 2021-06-16 11:54:22 -05:00
tick bumley 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
tick bumley aebdeaef0f HATE GIT (conflict fix?) 2021-06-16 11:49:23 -05:00
tick bumley 3512ac6f10 a fuckload of linting fixes 2021-06-16 11:30:17 -05:00
MichaelYick 7902966c14 GPL Exception added lol 2021-06-16 05:23:00 -05:00
MichaelYick 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
MichaelYick 746f4d5e05 cleaned up bad route for this scene 2021-06-16 04:47:54 -05:00
Nio 4a9f9d5616 wider panel added, text resized in About page, still not entirely sold on this, might do a version where it is integrated into the old menu layout 2021-06-16 18:43:06 +10:00
Nio e340999249 bg attempt for submenu - see extras -> updates for demo 2021-06-16 16:15:25 +10:00
Nio 533ef77484 test for new layout 2021-06-16 14:00:20 +10:00
Nio 767dfe1bd3 Merge branch 'master' of https://git.snootgame.xyz/Nio/SnootGame_w_ExtrasMenu 2021-06-16 13:13:45 +10:00
Nio 6891dafbcd test new menu layout 2021-06-16 13:13:26 +10:00
tick bumley a6423e3ab0 Merge branch 'Patchy-Patch5' into master 2021-06-15 16:06:11 +00:00
MichaelYick d74e3bb6c1 Merge branch 'updates' into Patchy-Patch5 2021-06-15 09:52:29 +00:00
MichaelYick 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
MichaelYick 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
MichaelYick 7baee7dc2b Merge branch 'updates' into Patchy-Patch5 2021-06-15 05:02:29 +00:00
MichaelYick 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
tick bumley 0ee77cc555 ch14c line 470 - renamed to fang c happy 2021-06-14 18:57:33 -05:00
tick bumley 50a8a50825 ch8 needed jump to chapter_9 on line 930, ty coffeeanon 2021-06-14 17:01:37 -05:00
tick bumley d41e6df4a6 ch13A fixed to xalign instead of align, ty coffeeanon 2021-06-14 17:01:23 -05:00
tick bumley ce8efa6f4c filenames were too long, caused error with build on win10 2021-06-14 16:58:34 -05:00
MichaelYick 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
tick bumley 26c63c4aa1 removing a comment 2021-06-13 17:34:49 -05:00
tick bumley 1e4d2f9f4b LeftStage var handling fix from lazysnake 2021-06-13 17:34:22 -05:00
tick bumley b8c035b305 stella shocked img import fix from lazysnake 2021-06-13 17:33:26 -05:00
tick bumley 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
tick bumley aa9886848a whoops i fucked up some formatting and a label name
fixed now doe
2021-06-12 23:13:10 -05:00
tick bumley 6411935284 fixed a few more script names that were activating my ocd almonds 2021-06-12 22:35:14 -05:00
tick bumley 027631b3cf more appropriate title / tweak for these two 2021-06-12 22:32:17 -05:00
tick bumley cdec7f5ddd renpy does not like dots in labels pt.2 - fixed labels and jumps
yay
2021-06-12 22:29:29 -05:00
tick bumley 535298892b renpy does not like dots in labels pt.1 - integers for chapters
fugg
2021-06-12 22:22:16 -05:00
tick bumley 7648bf2a59 meant to delete this useless empty file.
go away
2021-06-12 22:21:08 -05:00
tick bumley a13b151125 goodbye old script high 2021-06-12 22:03:20 -05:00
tick bumley 47d53bb065 bloomer end reformatted 2021-06-12 21:58:04 -05:00
tick bumley f1e70f0db2 tradoomer end reformatted 2021-06-12 21:58:04 -05:00
tick bumley 01c9909d9d doomer end reformatted 2021-06-12 21:58:04 -05:00
tick bumley 4ce721fdbb shooter end reformatted 2021-06-12 21:58:04 -05:00
tick bumley c6baa7d575 fates are decided and also given their own file 2021-06-12 21:46:55 -05:00
tick bumley 9f4f3dde6b now everything up until the route splits 2021-06-12 20:23:34 -05:00
tick bumley 4d520f89ff first five parts now with proper naming! 2021-06-12 19:11:50 -05:00
tick bumley 8e289aca06 initial organizations into new file format
this would've been done 1 hour earlier if pacman didn't fuck up my xfce4 conf
2021-06-12 15:53:25 -05:00
tick bumley 7541c8e25b fun sanity czech
making sure i didnt fuck up my dev env lol
2021-06-12 11:50:10 -05:00
MichaelYick c5601639d0 updated version number 2021-06-12 00:09:23 -05:00
MichaelYick b4a6abec8c Phantom-non-binary bracelet removed 2021-06-11 15:14:30 -05:00
MichaelYick ba37989a2a updated patch number 2021-06-10 16:08:19 -05:00