Mirrors/SnootGame
1
0
Fork 0
mirror of https://git.cavemanon.xyz/Cavemanon/SnootGame.git synced 2025-02-02 14:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
137 commits 15 branches 11 tags 1.2 GiB
Commit graph

119 commits

Author SHA1 Message Date
lazysnake
3441dbdbf5 cg button scaling, code cleanup 2021-07-03 12:42:12 +02:00
lazysnake
c84be31c37 conflict resolution 2021-07-03 09:03:47 +02:00
lazysnake
4f707ff8f4 Merge remote-tracking branch 'staging/Patchy-Patch5' into feature/ISSUE-3_CG_Gallery 
# Conflicts:
#	game/screens.rpy
#	game/script.rpy
 2021-07-03 09:03:33 +02:00
lazysnake
385b25c7d7 Merge remote-tracking branch 'staging/master' into feature/ISSUE-3_CG_Gallery 2021-07-03 09:01:27 +02:00
lazysnake
a8da4e16d2 Merge remote-tracking branch 'origin/Patchy-Patch5' into feature/ISSUE-3_CG_Gallery 2021-07-03 09:01:07 +02:00
CaveManon
2020d5e1a8 fixes for #43 2021-06-27 20:01:26 -05:00
CaveManon
203077c184 Merge branch 'Patchy-Patch5' of https://git.snootgame.xyz/PrincipalSpears/SnootGame into Patchy-Patch5 2021-06-23 18:29:42 -05:00
CaveManon
05df5c6448 Minor grammatical errors, #38, patched. 2021-06-23 18:29:07 -05:00
PrincipalSpears
2436150a75 Merge pull request 'Fixes #19 - Extras menu' (#29) from Nio/SnootGame_w_ExtrasMenu:master into Patchy-Patch5 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/29
 2021-06-23 23:25:29 +00:00
Nio
2051203075 good for use for now 2021-06-23 22:03:47 +10:00
Nio
9189c258d6 new subscreen layout full on extras 2021-06-23 00:42:13 +10:00
Nio
019d467a7e reworked subscreen for extras menu, will expand soon 2021-06-23 00:21:14 +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
Nio
c6a94f7528 new control event buttons 2021-06-22 00:38:35 +10: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
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
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
Nio
3de25169f2 updates got a shaded button on selected_idle and hover for demo 2021-06-18 18:49:03 +10:00
Nio
386a2ac5bd two buttons to with different designs, about and help 2021-06-18 17:12:12 +10:00
Nio
e0b11c5df4 about button looks test 2021-06-18 17:04:39 +10: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
stillzero
544640a554 adding scene changes for issue #25 2021-06-17 19:47:29 -05:00
lazysnake
b1cdf930a9 cg gallery wip vol5: slightly nicer pagination 2021-06-17 20:38:46 +02:00
lazysnake
1f3a04c355 cg gallery wip vol5: unlocking cgs 2021-06-17 20:31:04 +02:00
lazysnake
a8c65161be removed unnecessary code 2021-06-17 18:54:57 +02:00
lazysnake
9f0ade7fe4 cg gallery wip vol4: pagination 2021-06-17 18:53:01 +02:00
lazysnake
f4a7c84f81 cg gallery wip vol3: basic pagination handler 2021-06-17 18:36:25 +02: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
Nio
95e9a9ad47 positioning fist draft, all buttons done for idle 2021-06-17 21:00:26 +10:00
lazysnake
f819958d80 cg gallery wip vol2: commenting, minor code cleanup 2021-06-16 21:54:10 +02:00
coolestskinnieinthejungle
b6b7f73cfb Merge remote-tracking branch 'origin/issue2-linting' into issue2-linting 2021-06-16 11:54:22 -05:00
coolestskinnieinthejungle
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