stjr
/
ZoneBuilder
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged in GZDB r2489

This commit is contained in:
MascaraSnake 2016-01-30 00:09:10 +01:00
parent e7ad3d4bb2
commit 31a64b3863
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/ScintillaNET.3.5.dll
View File

Binary file not shown.

7
Build/Scripting/ZDoom_DECORATE.cfg
View File

@ -135,6 +135,7 @@ keywords
A_CheckRange = "A_CheckRange(float distance, int offset OR str state[, bool 2d_check])"; A_CheckRange = "A_CheckRange(float distance, int offset OR str state[, bool 2d_check])";
A_CheckSight = "A_CheckSight(int offset OR str state)"; A_CheckSight = "A_CheckSight(int offset OR str state)";
A_CheckSightOrRange = "A_CheckSightOrRange(float distance, int offset OR str state[, bool 2d_check])"; A_CheckSightOrRange = "A_CheckSightOrRange(float distance, int offset OR str state[, bool 2d_check])";
A_CheckSpecies = "A_CheckSpecies(str jump[, str species=\"None\"[, int pointer = AAPTR_DEFAULT]]) ";
A_Jump = "A_Jump(int chance, int offset OR str state, ...)"; A_Jump = "A_Jump(int chance, int offset OR str state, ...)";
A_JumpIf = "A_JumpIf(expression, int offset OR str state)"; A_JumpIf = "A_JumpIf(expression, int offset OR str state)";
A_JumpIfArmorType = "A_JumpIfArmorType(str armortype, str state[, int minimum])"; A_JumpIfArmorType = "A_JumpIfArmorType(str armortype, str state[, int minimum])";
@ -161,6 +162,7 @@ keywords
A_FadeIn = "A_FadeIn[(float increase_amount = 0.1[, int flags = 0])]\nflags: FTF flags."; A_FadeIn = "A_FadeIn[(float increase_amount = 0.1[, int flags = 0])]\nflags: FTF flags.";
A_FadeOut = "A_FadeOut[(float reduce_amount = 0.1[, int flags = FTF_REMOVE])]\nflags: FTF flags."; A_FadeOut = "A_FadeOut[(float reduce_amount = 0.1[, int flags = FTF_REMOVE])]\nflags: FTF flags.";
A_FadeTo = "A_FadeTo(float target[, float amount = 0.1[, int flags = 0]])\nflags: FTF flags."; A_FadeTo = "A_FadeTo(float target[, float amount = 0.1[, int flags = 0]])\nflags: FTF flags.";
A_FaceMovementDirection = "A_FaceMovementDirection([float offset = 0[, float anglelimit = 0[, float pitchlimit = 0[, int flags = 0[, int pointer = AAPTR_DEFAULT]]]]])";
A_Fall = "A_Fall"; A_Fall = "A_Fall";
A_Gravity = "A_Gravity"; A_Gravity = "A_Gravity";
A_HideThing = "A_HideThing"; A_HideThing = "A_HideThing";
@ -183,7 +185,7 @@ keywords
A_SetHealth = "A_SetHealth(int health[, int pointer = AAPTR_DEFAULT])\nhealth: The health value to set for the actor. Valid values are 1 and above.\npointer: The actor to set its health. Default is AAPTR_DEFAULT, which corresponds to the calling actor."; A_SetHealth = "A_SetHealth(int health[, int pointer = AAPTR_DEFAULT])\nhealth: The health value to set for the actor. Valid values are 1 and above.\npointer: The actor to set its health. Default is AAPTR_DEFAULT, which corresponds to the calling actor.";
A_SetInvulnerable = "A_SetInvulnerable"; A_SetInvulnerable = "A_SetInvulnerable";
A_SetMass = "A_SetMass(int mass)"; A_SetMass = "A_SetMass(int mass)";
A_SetPainThreshold = "A_SetPainThreshold(int threshold[, int ptr])"; A_SetPainThreshold = "A_SetPainThreshold(int threshold[, int pointer = AAPTR_DEFAULT])";
A_SetPitch = "A_SetPitch(float pitch[, int flags = 0[, int pointer = AAPTR_DEFAULT]])\npitch: The actor's new pitch, in degrees.\nflags: SPF flags."; A_SetPitch = "A_SetPitch(float pitch[, int flags = 0[, int pointer = AAPTR_DEFAULT]])\npitch: The actor's new pitch, in degrees.\nflags: SPF flags.";
A_SetReflective = "A_SetReflective"; A_SetReflective = "A_SetReflective";
A_SetReflectiveInvulnerable = "A_SetReflectiveInvulnerable"; A_SetReflectiveInvulnerable = "A_SetReflectiveInvulnerable";
@ -1054,6 +1056,9 @@ constants
DMSS_EXFILTER; DMSS_EXFILTER;
DMSS_EXSPECIES; DMSS_EXSPECIES;
DMSS_EITHER; DMSS_EITHER;
FMDF_NOPITCH;
FMDF_NOANGLE;
FMDF_INTERPOLATE;
FPF_AIMATANGLE; FPF_AIMATANGLE;
FPF_TRANSFERTRANSLATION; FPF_TRANSFERTRANSLATION;
FPF_NOAUTOAIM; FPF_NOAUTOAIM;

5
Source/Core/Controls/ScriptEditorControl.cs
View File

@ -309,6 +309,10 @@ namespace CodeImp.DoomBuilder.Controls
} }
} }
//mxd. Reset document slyle
scriptedit.ClearDocumentStyle();
scriptedit.StyleResetDefault();
// Check if specified lexer exists and set the lexer to use // Check if specified lexer exists and set the lexer to use
string lexername = "lexer" + (int)scriptconfig.Lexer; string lexername = "lexer" + (int)scriptconfig.Lexer;
if (!lexercfg.SettingExists(lexername)) throw new InvalidOperationException("Unknown lexer " + scriptconfig.Lexer + " specified in script configuration!"); if (!lexercfg.SettingExists(lexername)) throw new InvalidOperationException("Unknown lexer " + scriptconfig.Lexer + " specified in script configuration!");
@ -512,7 +516,6 @@ namespace CodeImp.DoomBuilder.Controls
} }
// Rearrange the layout // Rearrange the layout
scriptedit.ClearDocumentStyle();
this.PerformLayout(); this.PerformLayout();
} }