|
|
b876f089ce
|
Remove Quit & Move Return menu
|
2021-07-01 16:29:25 +10:00 |
|
|
|
afd1def9d3
|
Merge pull request 'Fixes: #8 - Namebox position for mobile' (#45) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/45
|
2021-07-01 05:49:44 +00:00 |
|
|
|
123ee89e2d
|
Fix Namebox position for mobile
|
2021-06-30 15:54:29 +10:00 |
|
|
|
e5769eb984
|
Merge pull request 'Fixes: #11 - Mobile Buttons' (#44) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/44
|
2021-06-30 02:23:33 +00:00 |
|
|
|
6e10937b8b
|
Bigger Buttons
|
2021-06-30 12:05:31 +10:00 |
|
|
|
b4112f4621
|
Replace textboxes with images
Template Image & Cleaner non-bitmap text
|
2021-06-30 10:45:56 +10:00 |
|
|
|
47140a15fe
|
pulling stuff
|
2021-06-21 17:03:36 -05:00 |
|
|
|
335d96402d
|
Bug #39 fixed. For some reason, a random alarm started playing.
|
2021-06-21 17:02:39 -05:00 |
|
|
|
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 |
|
|
|
ee770d3059
|
changed files to accomidate asset changes
|
2021-06-20 00:25:26 -05:00 |
|
|
|
58d71a632e
|
compressed assets
|
2021-06-20 00:16:10 -05:00 |
|
|
|
1f731ec0f6
|
Merge branch 'Patchy-Patch5' of https://git.snootgame.xyz/PrincipalSpears/SnootGame into Patchy-Patch5
|
2021-06-19 23:33:11 -05: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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
05ae546d4b
|
cleaned up and improved .gitignore
|
2021-06-17 20:39:10 -05:00 |
|
|
|
a789e15a39
|
improved gitignore
|
2021-06-17 20:38:01 -05:00 |
|
stillzero
|
544640a554
|
adding scene changes for issue #25
|
2021-06-17 19:47:29 -05:00 |
|
Your Name
|
00a4b11694
|
issue 25 tweaks
|
2021-06-17 06:49:15 -05:00 |
|
Your Name
|
c89901924d
|
issue 25 tweaks
|
2021-06-17 06:46:10 -05:00 |
|
Your Name
|
1f29121588
|
wingStory if/else added
|
2021-06-17 06:11:15 -05:00 |
|
|
|
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 |
|
|
|
c3680ef867
|
fixing conflict
|
2021-06-16 18:09:17 -05:00 |
|
|
|
6d9cc95624
|
Updated Exception
|
2021-06-16 17:48:17 -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 |
|
|
|
7902966c14
|
GPL Exception added lol
|
2021-06-16 05:23:00 -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 |
|
