Cavemanon/SnootGame
28
Fork 18
Code Issues 3 Pull Requests 3 Actions Projects Releases 10 Wiki Activity

Minor Issue Fixes Issues #25 and #31 #33

Merged
MichaelYick merged 7 commits from (deleted):master into Patchy-Patch5 2021-06-21 00:09:10 +00:00
Conversation 2 Commits 7 Files Changed 5
+20 -3
Ghost commented 2021-06-17 11:34:42 +00:00
Copy Link
Copy Source

This pull request addresses issues #25 and #31

fixes #25
2 scenes were switched from bandroom to auditorium as the text implied, and then a misplaced scene BG was removed from the bus story.

fixes #31
a variable was created wingStory that is initialized as false, and switches to true only if Anon hears Fang's story about Naser. This variable is then checked during a Naser scene to see additional story if it is TRUE.

This pull request addresses issues #25 and #31 fixes #25 2 scenes were switched from bandroom to auditorium as the text implied, and then a misplaced scene BG was removed from the bus story. fixes #31 a variable was created wingStory that is initialized as false, and switches to true only if Anon hears Fang's story about Naser. This variable is then checked during a Naser scene to see additional story if it is TRUE.
Ghost added 1 commit 2021-06-17 11:34:44 +00:00
wingStory if/else added 1f29121588
Ghost changed title from WIP: wingStory if/else added to WIP: story issue #31 2021-06-17 11:39:04 +00:00
Ghost added 3 commits 2021-06-18 00:49:49 +00:00
issue 25 tweaks c89901924d
issue 25 tweaks 00a4b11694
adding scene changes for issue #25 544640a554
Ghost changed title from WIP: story issue #31 to WIP: Minor Issue Fixes Issues #25 and #31 2021-06-18 01:13:51 +00:00
Ghost added 64 commits 2021-06-19 02:38:03 +00:00
fang now gets a shirt instead of hoodie db852a7d83
ask fang scene got some updated cgs, something about the crest going past her eyebrows or something aec5c485e3
Fang no longer says a navy seal copy pasta meme with poor grammer (accidently left in a joke line) eb38e64f34
fixed a problem where stella and fang were stupid big. Stop having a giantess fetish you sickos. 685878c8cb
added chadshark b6ee45f4a9
new anon ending sprites 0d4ce46ee1
fang no longer is a giantess at christmas. in other news, fetish-anon's day ruined 4eef4ed2c9
updated patch number ba37989a2a
Phantom-non-binary bracelet removed b4a6abec8c
updated version number c5601639d0
fun sanity czech 7541c8e25b 
making sure i didnt fuck up my dev env lol
initial organizations into new file format 8e289aca06 
this would've been done 1 hour earlier if pacman didn't fuck up my xfce4 conf
first five parts now with proper naming! 4d520f89ff
now everything up until the route splits 9f4f3dde6b
fates are decided and also given their own file c6baa7d575
shooter end reformatted 4ce721fdbb
doomer end reformatted 01c9909d9d
tradoomer end reformatted f1e70f0db2
bloomer end reformatted 47d53bb065
goodbye old script high a13b151125
meant to delete this useless empty file. 7648bf2a59 
go away
renpy does not like dots in labels pt.1 - integers for chapters 535298892b 
fugg
renpy does not like dots in labels pt.2 - fixed labels and jumps cdec7f5ddd 
yay
more appropriate title / tweak for these two 027631b3cf
fixed a few more script names that were activating my ocd almonds 6411935284
whoops i fucked up some formatting and a label name aa9886848a 
fixed now doe
Merge pull request 'issue2-init' (#1) from issue2-init into master 74eb44ca99 
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/1
stella shocked img import fix from lazysnake b8c035b305
LeftStage var handling fix from lazysnake 1e4d2f9f4b
removing a comment 26c63c4aa1
Merge pull request 'issue2-tweaks' (#2) from issue2-tweaks into master 26f2a588b7 
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/2
filenames were too long, caused error with build on win10 ce8efa6f4c
ch13A fixed to xalign instead of align, ty coffeeanon d41e6df4a6
ch8 needed jump to chapter_9 on line 930, ty coffeeanon 50a8a50825
ch14c line 470 - renamed to fang c happy 0ee77cc555
Merge pull request 'issue2-extratweaks' (#3) from issue2-extratweaks into master 0998c743eb 
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/3
Option to export for updates enabled 5f533f95e7
Merge branch 'updates' into Patchy-Patch5 7baee7dc2b
initial commit for new menu pieces skeleton, added .ico file for windows builds 0485191d1c
Merge branch 'updates' into master f2becf7a8a
Merge pull request 'pulling nios work over to the updates branch' (#20) from Nio/SnootGame_w_ExtrasMenu:master into updates 58c12b3df0 
Reviewed-on: https://git.snootgame.xyz/PrincipalSpears/SnootGame/pulls/20
Merge branch 'updates' into Patchy-Patch5 d74e3bb6c1
Merge branch 'Patchy-Patch5' into master a6423e3ab0
cleaned up bad route for this scene 746f4d5e05
Merge pull request 'cleaned up bad route for this scene' (#4) from Cavemanon/SnootGame:pr/17 into master dee9282229 
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/4
a fuckload of linting fixes 3512ac6f10
HATE GIT (conflict fix?) aebdeaef0f
Merge branch 'master' into issue2-linting fddae7261d
stray " kill me 303de47203
Merge remote-tracking branch 'origin/issue2-linting' into issue2-linting b6b7f73cfb
Merge pull request 'issue2-linting' (#5) from issue2-linting into master c24b9d8334 
fuck you

Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/5
refactor to the refactor ba47180cc8
removed a empty line and typo in title fffe7b520a
renaming again dda353b81c
Merge pull request 'issue34-init' (#6) from issue34-init into master 947826bd8b 
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/6
h8 python indent formatting + replaced a stray jump w/ return 12e6a7f6fa
naming consistency 67f6080b3a
missing return on line 53 added 99a458cf40
renpy demands a "start" label f143bc1eda
Merge pull request 'issue34-bugfixes' (#7) from issue34-bugfixes into master 23d8fc43d0 
Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/7
Merge pull request 'Fixes #2 - Refactoring Code so its not one 28k line blob' (#17) from coolestskinnieinthejungle/SnootGame:master into Patchy-Patch5 fbee733ff0 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/17
Seems to be working
(scream at me if it is not working)
Merge pull request 'sync patchy patch with some master changes' (#36) from master into Patchy-Patch5 f7c785b5b1 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/36
conflict resolution 614c29eec1
adding fixes to merge 09ec83d90c
Ghost changed target branch from master to Patchy-Patch5 2021-06-19 02:38:35 +00:00
Ghost added 1 commit 2021-06-19 03:05:51 +00:00
added missed wing label 16466f62ac
MichaelYick commented 2021-06-20 04:23:28 +00:00
Owner
Copy Link
Copy Source

Is this good to push in? Its got WIP and just wanted to ask @stillzero.

Is this good to push in? Its got WIP and just wanted to ask @stillzero.
MichaelYick added this to the Patchy-Patch5 Release milestone 2021-06-20 04:29:00 +00:00
Ghost commented 2021-06-20 10:38:52 +00:00
Copy Link
Copy Source

Everything looks good locally. So yeah I think we are good to go.

Everything looks good locally. So yeah I think we are good to go.
Ghost marked the pull request as ready for review 2021-06-20 10:39:13 +00:00
MichaelYick merged commit 445f4490c3 into Patchy-Patch5 2021-06-21 00:09:10 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something is not working
 Critical Priority
Absolutely urgent issues that must be delt with before others can even be considered.
duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 High Priority
Bugs that cause crashes, major story errors, or other massively negative issues. Features that are a must-have inclusion or else the game won't be as good.
 Low Priority
Minor or easy to miss errors. Features that'd be nice, but can be done with out.
 Medium Priority
Errors that stick out, but aren't fatal to gameplay. Features that are in decent demand or would improve gameplay by a signifigant amount
 Meta
for all the other fun stuff about the project thats not code
 needs more info
Something is wrong
 question
refactor
Cleaning up the cruft
 wontfix
This won't be fixed
back-burner
"Shit Nobody Cares About" issues
 bug
Something is not working
 Critical Priority
Absolutely urgent issues that must be delt with before others can even be considered.
 enhancement
New feature
 help wanted
Need some help
 High Priority
Bugs that cause crashes, major story errors, or other massively negative issues. Features that are a must-have inclusion or else the game won't be as good.
 Low Priority
Minor or easy to miss errors. Features that'd be nice, but can be done with out.
 Medium Priority
Errors that stick out, but aren't fatal to gameplay. Features that are in decent demand or would improve gameplay by a signifigant amount
 Meta
for all the other fun stuff about the project thats not code
 question
More information is needed
 undelegated
Issues that need to be assigned by a project manager
No labels
Milestone
No items
No Milestone Patchy-Patch5 Release
Projects
Clear projects
No projects
Assignees
Clear assignees
bighoss (bighoss) Cereal (Cereal) columbo (columbo) Jluminate (Jluminate) Legalo (Legalo) Map (Map) MichaelYick (MichaelYick) Mod (Mod) Mono (Mono) Nerd (Nerd) Nio nutbuster (Nutbuster) ReleaseSmith Sl1 (Sl1) TheNeonWerewolf (TheNeonWerewolf) TheNerd writerdev Zadeon
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Cavemanon/SnootGame#33