Mirrors/SnootGame
1
0
Fork 0
mirror of https://git.cavemanon.xyz/Cavemanon/SnootGame.git synced 2025-02-02 06:46:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge fix

Browse source
This commit is contained in:
nutbuster 2021-08-08 07:49:35 +10:00
parent 3b401ccf1c
commit 798ff85ff6
3 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
game/mods_example/template/chapter2_redo.rpy
View file

@ -8,8 +8,6 @@ label chapter_2_new:
play music 'audio/OST/Those Other Two Weirdos.ogg' play music 'audio/OST/Those Other Two Weirdos.ogg'
show anon neutral flip at aright with dissolve show anon neutral flip at aright with dissolve
A "Sample Text" A "Sample Text"
<<<<<<< HEAD
=======
F "Sample Text" F "Sample Text"
Lucy "Sample Text" Lucy "Sample Text"
Ro "Sample Text" Ro "Sample Text"
@ -35,5 +33,4 @@ label chapter_2_new:
carl "Sample Text" carl "Sample Text"
Drf "Sample Text" Drf "Sample Text"
FRT "Sample Text" FRT "Sample Text"
>>>>>>> origin/Monster-Update-6
return return

21
game/screens.rpy
View file

@ -39,27 +39,6 @@ init python:
# renpy.play("audio/ui/uiOptionOn.wav") # renpy.play("audio/ui/uiOptionOn.wav")
# preferences.all_mute = not preferences.all_mute # preferences.all_mute = not preferences.all_mute
=======
if renpy.variant("pc"): #Don't run this on mobile, not supported
if persistent.updateresult is None:
persistent.updateresult = "No new version is available"
if persistent.autoup is None:
persistent.autoup = False
if persistent.updateWebServer is None:
persistent.updateWebServer = "http://updates.snootgame.xyz/updates.json"
def UpdateCheck():
# WHY YES I ONLY ALLOW PEOPLE USING MY FRAMEWORK TO CHECK FOR AN UPDATE EVERY SIX FUCKING HOURS HOW DID YOU KNOW
# NOPE check_interval=5 (5 SECONDS) FUCK YOU
pendingVersion = updater.UpdateVersion(persistent.updateWebServer, check_interval=5)
if pendingVersion == None or pendingVersion == config.version or "TEST" in pendingVersion:
persistent.updateresult = "No new version is available"
else:
persistent.updateresult = pendingVersion
def ToggleAutoUpdate():
persistent.autoup = not persistent.autoup
>>>>>>> origin/Monster-Update-6
################################################################################ ################################################################################
## Initialization ## Initialization

3
game/src/mod_menu.rpy
View file

@ -10,13 +10,10 @@ screen mod_menu_button(filename, label, function):
xmaximum 600 xmaximum 600
ymaximum 129 ymaximum 129
action function action function
<<<<<<< HEAD
if 'Back' in label or 'Return' in label or 'Quit' in label or 'Main Menu' in label: if 'Back' in label or 'Return' in label or 'Quit' in label or 'Main Menu' in label:
activate_sound "audio/ui/uiBack.wav" activate_sound "audio/ui/uiBack.wav"
else: else:
activate_sound "audio/ui/uiClick.wav" activate_sound "audio/ui/uiClick.wav"
=======
>>>>>>> origin/Monster-Update-6
fixed: fixed:
add filename xalign 0.5 yalign 0.5 zoom 0.9 add filename xalign 0.5 yalign 0.5 zoom 0.9
text label xalign 0.5 yalign 0.5 xanchor 0.5 size 34 text label xalign 0.5 yalign 0.5 xanchor 0.5 size 34