Commit graph

124 commits

Author SHA1 Message Date
nutbuster
9ff428aeaf Fix mobile main menu 2021-07-02 10:35:52 +10:00
nutbuster
367c7fd9a3 Render Main Menu Buttons' Text 2021-07-02 10:35:17 +10:00
nutbuster
ab1ef7b47e Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/Cavemanon/SnootGame into Monster-Update-6 2021-07-02 10:11:56 +10:00
nutbuster
8d1fe9056e Quick Button style 2021-07-02 09:38:36 +10:00
nutbuster
f6a92b7f65 Windowed respects all window resolutions 2021-07-01 20:19:18 +10:00
nutbuster
b343365ef6 Bigger desktop quick button hitbox 2021-07-01 19:55:03 +10:00
nutbuster
f795f4d690 Remove magic number 2021-07-01 19:39:52 +10:00
nutbuster
fce9268dca Change idle_small_color from blue to aqua 2021-07-01 19:30:40 +10:00
nutbuster
8f01493824 Add Outline to most fonts 2021-07-01 19:29:01 +10:00
nutbuster
255e03dc90 Render All Quick Buttons' Text
Helper Array Function also added
2021-07-01 17:31:55 +10:00
CaveManon
7a58c9fea9 Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/PrincipalSpears/SnootGame into Monster-Update-6 2021-07-01 01:45:35 -05:00
CaveManon
863aa68070 fixes #13 2021-07-01 01:44:56 -05:00
nutbuster
b876f089ce Remove Quit & Move Return menu 2021-07-01 16:29:25 +10:00
PrincipalSpears
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
nutbuster
123ee89e2d Fix Namebox position for mobile 2021-06-30 15:54:29 +10:00
PrincipalSpears
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
nutbuster
6e10937b8b Bigger Buttons 2021-06-30 12:05:31 +10:00
nutbuster
b4112f4621 Replace textboxes with images
Template Image & Cleaner non-bitmap text
2021-06-30 10:45:56 +10:00
CaveManon
47140a15fe pulling stuff 2021-06-21 17:03:36 -05:00
CaveManon
335d96402d Bug #39 fixed. For some reason, a random alarm started playing. 2021-06-21 17:02:39 -05:00
PrincipalSpears
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
CaveManon
ee770d3059 changed files to accomidate asset changes 2021-06-20 00:25:26 -05:00
CaveManon
58d71a632e compressed assets 2021-06-20 00:16:10 -05:00
CaveManon
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
CaveManon
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
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
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
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