Mirrors/SnootGame
1
0
Fork 0
mirror of https://git.cavemanon.xyz/Cavemanon/SnootGame.git synced 2025-01-22 17:26:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
1196 commits 15 branches 11 tags 1.2 GiB
Commit graph

1196 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
lazysnake
f819958d80 cg gallery wip vol2: commenting, minor code cleanup 2021-06-16 21:54:10 +02: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
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
coolestskinnieinthejungle
aebdeaef0f HATE GIT (conflict fix?) 2021-06-16 11:49:23 -05:00
coolestskinnieinthejungle
3512ac6f10 a fuckload of linting fixes 2021-06-16 11:30:17 -05:00
CaveManon
7902966c14 GPL Exception added lol 2021-06-16 05:23:00 -05:00
PrincipalSpears
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
CaveManon
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
PrincipalSpears
d74e3bb6c1 Merge branch 'updates' into Patchy-Patch5 2021-06-15 09:52:29 +00:00
PrincipalSpears
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
PrincipalSpears
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
PrincipalSpears
7baee7dc2b Merge branch 'updates' into Patchy-Patch5 2021-06-15 05:02:29 +00:00
CaveManon
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
coolestskinnieinthejungle
0ee77cc555 ch14c line 470 - renamed to fang c happy 2021-06-14 18:57:33 -05:00
coolestskinnieinthejungle
50a8a50825 ch8 needed jump to chapter_9 on line 930, ty coffeeanon 2021-06-14 17:01:37 -05:00
coolestskinnieinthejungle
d41e6df4a6 ch13A fixed to xalign instead of align, ty coffeeanon 2021-06-14 17:01:23 -05:00
coolestskinnieinthejungle
ce8efa6f4c filenames were too long, caused error with build on win10 2021-06-14 16:58:34 -05:00
lazysnake
bd6c710380 cg gallery wip vol2: load all files 2021-06-14 21:27:30 +02:00
lazysnake
d4781d2d4c Merge remote-tracking branch 'staging/master' into feature/ISSUE-3_CG_Gallery 2021-06-14 20:41:11 +02:00
PrincipalSpears
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
coolestskinnieinthejungle
26c63c4aa1 removing a comment 2021-06-13 17:34:49 -05:00
coolestskinnieinthejungle
1e4d2f9f4b LeftStage var handling fix from lazysnake 2021-06-13 17:34:22 -05:00
coolestskinnieinthejungle
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
coolestskinnieinthejungle
aa9886848a whoops i fucked up some formatting and a label name 
fixed now doe
 2021-06-12 23:13:10 -05:00
coolestskinnieinthejungle
6411935284 fixed a few more script names that were activating my ocd almonds 2021-06-12 22:35:14 -05:00
coolestskinnieinthejungle
027631b3cf more appropriate title / tweak for these two 2021-06-12 22:32:17 -05:00