|
|
dd61898f95
|
Merge pull request 'Fix Concert Tarot if/else branching' (#56) from nutbuster/SnootGame:mustard into master
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/56
|
2021-07-14 04:12:48 +00:00 |
|
|
|
d9de78e09f
|
Merge branch 'master' of https://git.snootgame.xyz/Cavemanon/SnootGame
|
2021-07-14 11:23:06 +10:00 |
|
|
|
f5abb91f91
|
Fix Tarot if/else branch flow
|
2021-07-14 11:20:28 +10:00 |
|
|
|
652372713b
|
LAST HOTFIX additional updater end user diagnostics
|
2021-07-13 17:47:23 -05:00 |
|
|
|
fdfd364d43
|
HOTFIX TO FIX STUPID FUCKING 6 HOUR UPDATE COOLDOWN
|
2021-07-11 22:00:01 -05:00 |
|
|
|
9cb70ad986
|
Merge pull request 'Chapter 7 if/else indentation' (#53) from nutbuster/SnootGame:mustard into master
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/53
|
2021-07-11 00:10:59 +00:00 |
|
|
|
cc86a7e3f0
|
Fix indentation
|
2021-07-10 09:12:11 +10:00 |
|
|
|
daef7af4e6
|
HOTFIX: ignore remote update is versname is "TEST", less naggy autoup
|
2021-07-09 01:42:04 -05:00 |
|
|
|
19e840d627
|
Merge branch 'Patchy-Patch5'
|
2021-07-09 00:04:15 -05:00 |
|
|
|
1244ea7d01
|
Merge pull request 'updates branch/feature merging into patchy-patch5' (#52) from updates into Patchy-Patch5
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/52
|
2021-07-09 04:29:22 +00:00 |
|
|
|
c619a98e7a
|
Merge branch 'Patchy-Patch5' into updates
|
2021-07-09 04:27:31 +00:00 |
|
|
|
48c8eaebec
|
Merge pull request 'working update + autoupdate functionality for update branch' (#48) from coolestskinnieinthejungle/SnootGame:master into updates
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/48
|
2021-07-09 02:44:51 +00:00 |
|
|
|
9dce47c686
|
persistent.updateWebServer
|
2021-07-02 14:26:48 -05:00 |
|
|
|
4338796483
|
at long last, update + autoupdate working as intended
|
2021-07-02 14:17:34 -05:00 |
|
|
|
2020d5e1a8
|
fixes for #43
|
2021-06-27 20:01:26 -05:00 |
|
|
|
e02118180e
|
Ready to test the stuff for website
|
2021-06-27 19:42:23 -05:00 |
|
|
|
19b3b2ee0c
|
OH NO IT BROKE FURTHER
|
2021-06-24 18:51:08 -05:00 |
|
|
|
06df0be4b5
|
Merge pull request 'Correction to Fixes #7 - Game should be able to update itself' (#42) from coolestskinnieinthejungle-patch-updates into updates
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/42
|
2021-06-24 15:07:16 +00:00 |
|
|
|
002405a5fc
|
use of Function() to call UpdateCheck()
|
2021-06-24 05:14:33 +00:00 |
|
|
|
397de2b950
|
Worked a little on the code, its absolutely broken. Going to ask for help
|
2021-06-23 20:12:27 -05:00 |
|
|
|
203077c184
|
Merge branch 'Patchy-Patch5' of https://git.snootgame.xyz/PrincipalSpears/SnootGame into Patchy-Patch5
|
2021-06-23 18:29:42 -05:00 |
|
|
|
05df5c6448
|
Minor grammatical errors, #38, patched.
|
2021-06-23 18:29:07 -05:00 |
|
|
|
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 |
|
|
|
2051203075
|
good for use for now
|
2021-06-23 22:03:47 +10:00 |
|
|
|
9189c258d6
|
new subscreen layout full on extras
|
2021-06-23 00:42:13 +10:00 |
|
|
|
019d467a7e
|
reworked subscreen for extras menu, will expand soon
|
2021-06-23 00:21:14 +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 |
|
|
|
c6a94f7528
|
new control event buttons
|
2021-06-22 00:38:35 +10: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 |
|
|
|
3de25169f2
|
updates got a shaded button on selected_idle and hover for demo
|
2021-06-18 18:49:03 +10:00 |
|
|
|
386a2ac5bd
|
two buttons to with different designs, about and help
|
2021-06-18 17:12:12 +10:00 |
|
|
|
e0b11c5df4
|
about button looks test
|
2021-06-18 17:04:39 +10: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 |
|
