Merge remote-tracking branch 'origin/development' into development

This commit is contained in:
overdev 2021-10-10 09:29:39 +02:00
commit 283ab552e8
12 changed files with 400 additions and 139 deletions

1
.gitattributes vendored
View File

@ -25,3 +25,4 @@
*.sln filter= diff= merge= text eol=crlf *.sln filter= diff= merge= text eol=crlf
*.props filter= diff= merge= text eol=crlf *.props filter= diff= merge= text eol=crlf
*.inl filter= diff= merge= text eol=crlf *.inl filter= diff= merge= text eol=crlf
*.flm filter= diff= merge= text eol=crlf

1
.gitignore vendored
View File

@ -1,3 +1,2 @@
*.flm
*.zip *.zip
*.7z *.7z

Binary file not shown.

File diff suppressed because one or more lines are too long

BIN
interface/quest_journal.swf (Stored with Git LFS)

Binary file not shown.

BIN
interface/quest_journal.swf.flm (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -66,6 +66,7 @@ EndFunction
Function StrandingCutscene() Function StrandingCutscene()
Timescale.SetValue(10)
AudioCategoryAMB.Unmute() AudioCategoryAMB.Unmute()
AudioCategoryAMB2x.Unmute() AudioCategoryAMB2x.Unmute()
AudioCategoryAMBr.Unmute() AudioCategoryAMBr.Unmute()
@ -213,6 +214,7 @@ Sound Property MAGVampireSunlight Auto
GlobalVariable Property TalentPoints Auto GlobalVariable Property TalentPoints Auto
GlobalVariable Property Lernpunkte Auto GlobalVariable Property Lernpunkte Auto
GlobalVariable Property Timescale Auto
Spell Property _00E_MQP03_MagicFeverSpell Auto Spell Property _00E_MQP03_MagicFeverSpell Auto

View File

@ -134,6 +134,14 @@ endFunction
Function DisableDialogueQuitting() Global Function DisableDialogueQuitting() Global
{Disables the TAB Key during dialogue. Resets automatically upon dialogue exit via Goodbye.} {Disables the TAB Key during dialogue. Resets automatically upon dialogue exit via Goodbye.}
if UI.GetBool("Dialogue Menu", "_root.DialogueMenu_mc.bEnableTab") != true
; Suspected non-Enderal dialoguemenu.swf replacer, rechecking value in order to be sure.
UI.InvokeBool("Dialogue Menu", "_root.DialogueMenu_mc.SetVariable", True)
if UI.GetBool("Dialogue Menu", "_root.DialogueMenu_mc.bEnableTab") != true
Debug.Notification("Detected incompatible dialoguemenu.swf!")
endif
endif
UI.InvokeBool("Dialogue Menu", "_root.DialogueMenu_mc.SetVariable", False) UI.InvokeBool("Dialogue Menu", "_root.DialogueMenu_mc.SetVariable", False)
EndFunction EndFunction