Fixed a typo in one of the Preferences window's tool-tips.

Updated ZDoom_DECORATE.cfg.
This commit is contained in:
MaxED 2015-02-19 20:50:03 +00:00
parent 25ca6f4e9b
commit e06a764d50
2 changed files with 11 additions and 6 deletions

View file

@ -113,12 +113,13 @@ keywords
A_CheckPlayerDone = "A_CheckPlayerDone"; A_CheckPlayerDone = "A_CheckPlayerDone";
A_PlayerSkinCheck = "A_PlayerSkinCheck(str state)"; A_PlayerSkinCheck = "A_PlayerSkinCheck(str state)";
A_SkullPop = "A_SkullPop[(str type = \"BloodySkull\")]"; A_SkullPop = "A_SkullPop[(str type = \"BloodySkull\")]";
A_Quake = "A_Quake (int intensity, int duration, int damageradius, int tremorradius[, str sound = \"world/quake\"])"; A_Quake = "A_Quake(int intensity, int duration, int damageradius, int tremorradius[, str sound = \"world/quake\"])";
A_QuakeEx = "A_QuakeEx(int intensityX, int intensityY, int intensityZ, int duration, int damrad, int tremrad[, str sound = \"world/quake\"[, int flags = 0]])";
//Spawn functions //Spawn functions
A_TossGib = "A_TossGib"; A_TossGib = "A_TossGib";
A_SpawnDebris = "A_SpawnDebris(str type[, bool translation = false[, float horizontal_vel = 1.0[, float vertical_vel = 1.0]]])"; A_SpawnDebris = "A_SpawnDebris(str type[, bool translation = false[, float horizontal_vel = 1.0[, float vertical_vel = 1.0]]])";
A_SpawnItem = "A_SpawnItem(str type, int distance, float zpos, bool useammo, bool translation)"; A_SpawnItem = "A_SpawnItem(str type, int distance, float zpos, bool useammo, bool translation)";
A_SpawnItemEx = "A_SpawnItemEx(str type[, float xoffset[, float yoffset[, float zoffset[, float xvelocity[, float yvelocity[, float zvelocity[, float angle[, int flags[, int skipchance[, int tid]]]]]]]]]])"; A_SpawnItemEx = "A_SpawnItemEx(str type[, float xoffset = 0[, float yoffset = 0[, float zoffset = 0[, float xvelocity = 0[, float yvelocity = 0[, float zvelocity = 0[, float angle = 0[, int flags = 0[, int skipchance = 0[, int tid = 0]]]]]]]]]])";
//State jumps //State jumps
A_CheckCeiling = "A_CheckCeiling(int offset OR str state)"; A_CheckCeiling = "A_CheckCeiling(int offset OR str state)";
A_CheckFloor = "A_CheckFloor(int offset OR str state)"; A_CheckFloor = "A_CheckFloor(int offset OR str state)";
@ -132,7 +133,7 @@ keywords
A_JumpIfArmorType = "A_JumpIfArmorType(str armortype, str state[, int minimum])"; A_JumpIfArmorType = "A_JumpIfArmorType(str armortype, str state[, int minimum])";
A_JumpIfCloser = "A_JumpIfCloser(int distance, int offset OR str state)"; A_JumpIfCloser = "A_JumpIfCloser(int distance, int offset OR str state)";
A_JumpIfHealthLower = "A_JumpIfHealthLower(int health, int offset OR str state[, int pointer = AAPTR_DEFAULT])"; A_JumpIfHealthLower = "A_JumpIfHealthLower(int health, int offset OR str state[, int pointer = AAPTR_DEFAULT])";
A_JumpIfInventory = "A_JumpIfInventory (str inventorytype, int amount, int offset OR str state[, int owner = AAPTR_DEFAULT])"; A_JumpIfInventory = "A_JumpIfInventory(str inventorytype, int amount, int offset OR str state[, int owner = AAPTR_DEFAULT])";
A_JumpIfInTargetInventory = "A_JumpIfInTargetInventory(str item, int count, int offset OR str state[, int forward])"; A_JumpIfInTargetInventory = "A_JumpIfInTargetInventory(str item, int count, int offset OR str state[, int forward])";
A_JumpIfInTargetLOS = "A_JumpIfInTargetLOS(int offset OR str state[, float fov = 0[, int flags = 0[, float dist_max = 0[, float dist_close = 0]]]])\nflags: JLOSF flags."; A_JumpIfInTargetLOS = "A_JumpIfInTargetLOS(int offset OR str state[, float fov = 0[, int flags = 0[, float dist_max = 0[, float dist_close = 0]]]])\nflags: JLOSF flags.";
A_JumpIfMasterCloser = "A_JumpIfMasterCloser(int distance, int offset OR str state)"; A_JumpIfMasterCloser = "A_JumpIfMasterCloser(int distance, int offset OR str state)";
@ -140,7 +141,7 @@ keywords
A_JumpIfTargetInLOS = "A_JumpIfTargetInLOS(int offset OR str state[, float fov = 0[, int flags = 0[, float dist_max = 0[, float dist_close = 0]]]])\nflags: JLOSF flags."; A_JumpIfTargetInLOS = "A_JumpIfTargetInLOS(int offset OR str state[, float fov = 0[, int flags = 0[, float dist_max = 0[, float dist_close = 0]]]])\nflags: JLOSF flags.";
A_JumpIfTargetInsideMeleeRange = "A_JumpIfTargetInsideMeleeRange(int offset OR str state)\nJumps the number of frames (offset) forward, or to the specified state\nwhen the target of the calling actor is within melee range of the caller."; A_JumpIfTargetInsideMeleeRange = "A_JumpIfTargetInsideMeleeRange(int offset OR str state)\nJumps the number of frames (offset) forward, or to the specified state\nwhen the target of the calling actor is within melee range of the caller.";
A_JumpIfTargetOutsideMeleeRange = "A_JumpIfTargetOutsideMeleeRange(int offset OR str state)\nJumps the number of frames (offset) forward, or to the specified state\nwhen the target of the calling actor is beyond melee range of the caller."; A_JumpIfTargetOutsideMeleeRange = "A_JumpIfTargetOutsideMeleeRange(int offset OR str state)\nJumps the number of frames (offset) forward, or to the specified state\nwhen the target of the calling actor is beyond melee range of the caller.";
A_JumpIfTracerCloser = "A_JumpIfTracerCloser (int distance, int offset OR str state)"; A_JumpIfTracerCloser = "A_JumpIfTracerCloser(int distance, int offset OR str state)";
//Status changes //Status changes
A_ActiveAndUnblock = "A_ActiveAndUnblock"; A_ActiveAndUnblock = "A_ActiveAndUnblock";
A_CallSpecial = "A_CallSpecial(int special[, int arg1[, int arg2[, int arg3[, int arg4[, int arg5]]]]])"; A_CallSpecial = "A_CallSpecial(int special[, int arg1[, int arg2[, int arg3[, int arg4[, int arg5]]]]])";
@ -615,7 +616,8 @@ constants
AAPTR_TRACER; AAPTR_TRACER;
AAPTR_PLAYER; AAPTR_PLAYER;
AAPTR_PLAYER_GETTARGET; AAPTR_PLAYER_GETTARGET;
AAPTR_PLAYER_GETCONVERSATION; AAPTR_PLAYER_GETCONVERSATION;
//A_SpawnItemEx flags
SXF_TRANSFERTRANSLATION; SXF_TRANSFERTRANSLATION;
SXF_ABSOLUTEPOSITION; SXF_ABSOLUTEPOSITION;
SXF_ABSOLUTEANGLE; SXF_ABSOLUTEANGLE;
@ -640,6 +642,7 @@ constants
SXF_NOPOINTERS; SXF_NOPOINTERS;
SXF_ORIGINATOR; SXF_ORIGINATOR;
SXF_TRANSFERSPRITEFRAME; SXF_TRANSFERSPRITEFRAME;
SXF_TRANSFERROLL;
//weapon flags //weapon flags
WRF_NOBOB; WRF_NOBOB;
WRF_NOFIRE; WRF_NOFIRE;
@ -1137,4 +1140,6 @@ constants
FAF_MIDDLE; FAF_MIDDLE;
FAF_TOP; FAF_TOP;
FAF_NODISTFACTOR; FAF_NODISTFACTOR;
//A_QuakeEx flags
QF_RELATIVE;
} }

View file

@ -298,7 +298,7 @@ namespace CodeImp.DoomBuilder.Windows
this.label25.Size = new System.Drawing.Size(87, 13); this.label25.Size = new System.Drawing.Size(87, 13);
this.label25.TabIndex = 47; this.label25.TabIndex = 47;
this.label25.Text = "Max. recent files:"; this.label25.Text = "Max. recent files:";
this.toolTip1.SetToolTip(this.label25, "Controls how many recent files \r\nare shown in th File menu. "); this.toolTip1.SetToolTip(this.label25, "Controls how many recent files \r\nare shown in the \"File\" menu.");
// //
// vertexScaleLabel // vertexScaleLabel
// //