Merge branch 'master' of https://github.com/sirjuddington/SLADE

dist/res/config/entry_types/text.cfg

@@ -608,6 +608,8 @@ zscript : text
 {
 	name = "ZScript";
 	match_name = "zscript";
+	match_ext = "zs", "zsc", "zc";
+	match_extorname = 1;
 	text_language = "zscript";
 	icon = "code";
 }

dist/res/config/languages/decorate.txt

@@ -176,7 +176,8 @@ decorate : cstyle {
 		BOUNCEONUNRIPPABLES, DONTBOUNCEONSHOOTABLES, DONTBOUNCEONSKY, RETARGETAFTERSLAM, E1M8BOSS, E2M8BOSS,
 		E3M8BOSS, E4M6BOSS, E4M8BOSS, MAP07BOSS1, MAP07BOSS2, HIGHERMPROB, DONTFOLLOWPLAYERS, SEEFRIENDLYMONSTERS,
 		ADDLIGHTLEVEL, CROSSLINECHECK, MASTERNOSEE, INVISIBLEINMIRRORS, ONLYVISIBLEINMIRRORS, ONLYSLAMSOLID,
-		SHADOWAIM, DOSHADOWBLOCK, SHADOWBLOCK, SHADOWAIMVERT, NOSAVEGAME,
+		SHADOWAIM, DOSHADOWBLOCK, SHADOWBLOCK, SHADOWAIMVERT, NOSAVEGAME, DECOUPLEDANIMATIONS, BILLBOARDFACECAMERA,
+		BILLBOARDNOFACECAMERA, FLIPSPRITEOFFSETX, FLIPSPRITEOFFSETY,
 
 		// INVENTORY.
 		INVENTORY,
@@ -388,7 +389,7 @@ decorate : cstyle {
 
 		// A_SpawnParticle flags
 		SPF_FULLBRIGHT, SPF_RELACCEL, SPF_RELANG, SPF_RELATIVE, SPF_RELPOS, SPF_RELVEL, SPF_NOTIMEFREEZE,
-		SPF_ROLL, SPF_REPLACE,
+		SPF_ROLL, SPF_REPLACE, SPF_NO_XY_BILLBOARD, SPF_LOCAL_ANIM,
 
 		// Render styles
 		STYLE_None, STYLE_Normal, STYLE_Fuzzy, STYLE_SoulTrans, STYLE_OptFuzzy, STYLE_Stencil, STYLE_Translucent,

dist/res/config/languages/zdoom.txt

@@ -257,7 +257,8 @@ z_mapinfo {
 		e2m8special, e3m8special, e4m6special, e4m8special, disableshadowmap, enableshadowmap,
 		avoidmelee, compat_avoidhazards, compat_stayonlift, compat_nombf21, compat_vileghosts,
 		attenuatelights, intro, outro, lightblendmode, cvar_redirect, compat_voodoozombies,
-		nopassover, passover,
+		nopassover, passover, colormap, nogravity, lightningsound, isocam_pitch, isometricmode,
+		isometricsprites, iso_dist, orthographic,
 
 		// GZDoom
 		FogDensity, OutsideFogDensity, SkyFog, LightMode, NoColoredSpriteLighting, SkyRotate, PixelRatio,
@@ -359,13 +360,13 @@ z_modeldef {
 		MODEL, PATH, SKIN, SCALE, FRAME, FRAMEINDEX,
 		Rotation-Speed, Rotation-Vector, Rotation-Center, 
 		Offset, AngleOffset, PitchOffset, RollOffset, ZOffset, SurfaceSkin,
-		Animation
+		Animation, BaseFrame
 	}
 
 	constants = {
 		PITCHFROMMOMENTUM, IGNORETRANSLATION, INTERPOLATEDOUBLEDFRAMES, ROTATING, NOINTERPOLATION,
 		INHERITACTORPITCH, INHERITACTORROLL, USEACTORPITCH, USEACTORROLL, DONTCULLBACKFACES,
-		SCALEWEAPONFOV, MODELSAREATTACHMENTS, CORRECTPIXELSTRETCH
+		SCALEWEAPONFOV, MODELSAREATTACHMENTS, CORRECTPIXELSTRETCH, FORCECULLBACKFACES
 	}
 }
 

dist/res/config/languages/zscript.txt

@@ -16,14 +16,192 @@ zscript
 		extend, clearscope, vararg, ui, play, virtual, virtualscope, meta, Property,
 		version, in, out, states, action, override, super, is, let, const, replaces,
 		protected, self, abstract, enum, switch, case, until, nullptr, foreach, array,
-		map, mapiterator, sealed
+		map, mapiterator, sealed, function
 	}
 
 	types =
 	{
 		object, vector2, vector3, name, string, color, sound, void, double, bool,
 		int, float, uint8, uint16, uint, int8, int16, TextureID, SpriteID,
-		voidptr, short, fvector2, fvector3, fvector4, vector4, fquat, quat
+		voidptr, short, fvector2, fvector3, fvector4, vector4, fquat, quat,
+		TranslationID
+	}
+
+	properties =
+	{
+		// Actor flags (as variables accessible from scripts)
+
+		// Internal flags
+		bINCHASE, bUNMORPHED, bFLY, bONMOBJ, bARGSDEFINED, bNOSIGHTCHECK, bCRASHED,
+		bWARNBOT, bHUNTPLAYERS, bNOHATEPLAYERS, bSCROLLMOVE, bVFRICTION, bBOSSSPAWNED,
+		bAVOIDINGDROPOFF, bCHASEGOAL, bINCONVERSATION, bARMED, bFALLING, bLINEDONE,
+		bSHATTERING, bKILLED, bBOSSCUBE, bINTRYMOVE, bHANDLENODELAY, bFLYCHEAT,
+		bRESPAWNINVUL,
+
+		// MF
+		bPICKUP, bSPECIAL, bSOLID, bSHOOTABLE, bNOSECTOR, bNOBLOCKMAP, bAMBUSH, bJUSTHIT,
+		bJUSTATTACKED, bSPAWNCEILING, bNOGRAVITY, bDROPOFF, bNOCLIP, bFLOAT, bTELEPORT,
+		bMISSILE, bDROPPED, bSHADOW, bNOBLOOD, bCORPSE, bINFLOAT, bCOUNTKILL, bCOUNTITEM,
+		bSKULLFLY, bNOTDMATCH, bSPAWNSOUNDSOURCE, bFRIENDLY, bNOLIFTDROP, bSTEALTH,
+		bICECORPSE,
+
+		// MF2
+		bDONTREFLECT, bWINDTHRUST, bDONTSEEKINVISIBLE, bBLASTED, bFLOORCLIP, bSPAWNFLOAT,
+		bNOTELEPORT, bRIPPER, bPUSHABLE, bSLIDESONWALLS, bCANPASS, bCANNOTPUSH, bTHRUGHOST,
+		bBOSS, bNODAMAGETHRUST, bDONTTRANSLATE, bTELESTOMP, bFLOATBOB, bTHRUACTORS,
+		bACTIVATEIMPACT, bCANPUSHWALLS, bACTIVATEMCROSS, bACTIVATEPCROSS,
+		bCANTLEAVEFLOORPIC, bNONSHOOTABLE, bINVULNERABLE, bDORMANT, bSEEKERMISSILE,
+		bREFLECTIVE,
+
+		// MF3
+		bFLOORHUGGER, bCEILINGHUGGER, bNORADIUSDMG, bGHOST, bSPECIALFLOORCLIP, bALWAYSPUFF,
+		bDONTSPLASH, bDONTOVERLAP, bDONTMORPH, bDONTSQUASH, bEXPLOCOUNT, bFULLVOLACTIVE,
+		bISMONSTER, bSKYEXPLODE, bSTAYMORPHED, bDONTBLAST, bCANBLAST, bNOTARGET, bDONTGIB,
+		bNOBLOCKMONST, bFULLVOLDEATH, bAVOIDMELEE, bSCREENSEEKER, bFOILINVUL, bNOTELEOTHER,
+		bBLOODLESSIMPACT, bNOEXPLODEFLOOR, bPUFFONACTORS,
+
+		// MF4
+		bQUICKTORETALIATE, bNOICEDEATH, bRANDOMIZE, bFIXMAPTHINGPOS, bACTLIKEBRIDGE,
+		bSTRIFEDAMAGE, bCANUSEWALLS, bMISSILEMORE, bMISSILEEVENMORE, bFORCERADIUSDMG,
+		bDONTFALL, bSEESDAGGERS, bINCOMBAT, bLOOKALLAROUND, bSTANDSTILL, bSPECTRAL,
+		bNOSPLASHALERT, bSYNCHRONIZED, bNOTARGETSWITCH, bDONTHARMCLASS, bSHIELDREFLECT,
+		bDEFLECT, bALLOWPARTICLES, bEXTREMEDEATH, bNOEXTREMEDEATH, bFRIGHTENED, bNOSKIN,
+		bBOSSDEATH,
+
+		// MF5
+		bDONTDRAIN, bGETOWNER, bNODROPOFF, bNOFORWARDFALL, bCOUNTSECRET, bNODAMAGE,
+		bBLOODSPLATTER, bOLDRADIUSDMG, bDEHEXPLOSION, bPIERCEARMOR, bNOBLOODDECALS,
+		bUSESPECIAL, bNOPAIN, bALWAYSFAST, bNEVERFAST, bALWAYSRESPAWN, bNEVERRESPAWN,
+		bDONTRIP, bNOINFIGHTING, bNOINTERACTION, bNOTIMEFREEZE, bPUFFGETSOWNER,
+		bSPECIALFIREDAMAGE, bSUMMONEDMONSTER, bNOVERTICALMELEERANGE, bBRIGHT, bCANTSEEK,
+		bPAINLESS, bMOVEWITHSECTOR,
+
+		// MF6
+		bNOBOSSRIP, bTHRUSPECIES, bMTHRUSPECIES, bFORCEPAIN, bNOFEAR, bBUMPSPECIAL,
+		bDONTHARMSPECIES, bSTEPMISSILE, bNOTELEFRAG, bTOUCHY, bCANJUMP, bJUMPDOWN,
+		bVULNERABLE, bNOTRIGGER, bADDITIVEPOISONDAMAGE, bADDITIVEPOISONDURATION,
+		bBLOCKEDBYSOLIDACTORS, bNOMENU, bSEEINVISIBLE, bDONTCORPSE, bDOHARMSPECIES,
+		bPOISONALWAYS, bNOTAUTOAIMED, bNOTONAUTOMAP, bRELATIVETOFLOOR,
+
+		// MF7
+		bNEVERTARGET, bNOTELESTOMP, bALWAYSTELEFRAG, bWEAPONSPAWN, bHARMFRIENDS, bBUDDHA,
+		bFOILBUDDHA, bDONTTHRUST, bALLOWPAIN, bCAUSEPAIN, bTHRUREFLECT, bMIRRORREFLECT,
+		bAIMREFLECT, bHITTARGET, bHITMASTER, bHITTRACER, bNODECAL, bFORCEDECAL, bLAXTELEFRAGDMG,
+		bICESHATTER, bALLOWTHRUFLAGS, bUSEKILLSCRIPTS, bNOKILLSCRIPTS, bSPRITEANGLE,
+		bSMASHABLE, bNOSHIELDREFLECT, bFORCEZERORADIUSDMG, bNOINFIGHTSPECIES, bFORCEINFIGHTING,
+
+		// MF8
+		bFRIGHTENING, bBLOCKASPLAYER, bDONTFACETALKER, bHITOWNER, bNOFRICTION,
+		bNOFRICTIONBOUNCE, bRETARGETAFTERSLAM, bSTOPRAILS, bFALLDAMAGE, bMINVISIBLE,
+		bMVISBLOCKED, bABSVIEWANGLES, bALLOWTHRUBITS, bFULLVOLSEE, bE1M8BOSS, bE2M8BOSS,
+		bE3M8BOSS, bE4M8BOSS, bE4M6BOSS, bMAP07BOSS1, bMAP07BOSS2, bAVOIDHAZARDS,
+		bSTAYONLIFT, bDONTFOLLOWPLAYERS, bSEEFRIENDLYMONSTERS, bCROSSLINECHECK,
+		bMASTERNOSEE, bADDLIGHTLEVEL, bONLYSLAMSOLID,
+
+		// MF9
+		bSHADOWAIM, bDOSHADOWBLOCK, bSHADOWBLOCK, bSHADOWAIMVERT, bDECOUPLEDANIMATIONS,
+
+		// Effect flags
+		bVISIBILITYPULSE, bROCKETTRAIL, bGRENADETRAIL, bINVISIBLE, bFORCEYBILLBOARD,
+		bFORCEXYBILLBOARD, bROLLSPRITE, bFLATSPRITE, bWALLSPRITE, bDONTFLIP, bROLLCENTER,
+		bMASKROTATION, bABSMASKANGLE, bABSMASKPITCH, bXFLIP, bYFLIP, bINTERPOLATEANGLES,
+		bDONTINTERPOLATE, bSPRITEFLIP, bZDOOMTRANS, bCASTSPRITESHADOW, bNOSPRITESHADOW,
+		bINVISIBLEINMIRRORS, bONLYVISIBLEINMIRRORS, bBILLBOARDFACECAMERA,
+		bBILLBOARDNOFACECAMERA, bFLIPSPRITEOFFSETX, bFLIPSPRITEOFFSETY,
+
+		// Bounce flags
+		bBOUNCEONWALLS, bBOUNCEONFLOORS, bBOUNCEONCEILINGS, bALLOWBOUNCEONACTORS,
+		bBOUNCEAUTOOFF, bBOUNCELIKEHERETIC, bCANBOUNCEWATER, bNOWALLBOUNCESND,
+		bNOBOUNCESOUND, bBOUNCEONACTORS, bEXPLODEONWATER, bMBFBOUNCER, bBOUNCEAUTOOFFFLOORONLY,
+		bUSEBOUNCESTATE, bDONTBOUNCEONSHOOTABLES, bBOUNCEONUNRIPPABLES, bDONTBOUNCEONSKY,
+
+		// Misc
+		bNOSAVEGAME
+	}
+
+	constants =
+	{
+		// Actor flags (used in an actor's definition)
+
+		// MF
+		PICKUP, SPECIAL, SOLID, SHOOTABLE, NOSECTOR, NOBLOCKMAP, AMBUSH, JUSTHIT,
+		JUSTATTACKED, SPAWNCEILING, NOGRAVITY, DROPOFF, NOCLIP, FLOAT, TELEPORT,
+		MISSILE, DROPPED, SHADOW, NOBLOOD, CORPSE, INFLOAT, COUNTKILL, COUNTITEM,
+		SKULLFLY, NOTDMATCH, SPAWNSOUNDSOURCE, FRIENDLY, NOLIFTDROP, STEALTH,
+		ICECORPSE,
+
+		// MF2
+		DONTREFLECT, WINDTHRUST, DONTSEEKINVISIBLE, BLASTED, FLOORCLIP, SPAWNFLOAT,
+		NOTELEPORT, RIPPER, PUSHABLE, SLIDESONWALLS, CANPASS, CANNOTPUSH, THRUGHOST,
+		BOSS, NODAMAGETHRUST, DONTTRANSLATE, TELESTOMP, FLOATBOB, THRUACTORS,
+		ACTIVATEIMPACT, CANPUSHWALLS, ACTIVATEMCROSS, ACTIVATEPCROSS,
+		CANTLEAVEFLOORPIC, NONSHOOTABLE, INVULNERABLE, DORMANT, SEEKERMISSILE,
+		REFLECTIVE,
+
+		// MF3
+		FLOORHUGGER, CEILINGHUGGER, NORADIUSDMG, GHOST, SPECIALFLOORCLIP, ALWAYSPUFF,
+		DONTSPLASH, DONTOVERLAP, DONTMORPH, DONTSQUASH, EXPLOCOUNT, FULLVOLACTIVE,
+		ISMONSTER, SKYEXPLODE, STAYMORPHED, DONTBLAST, CANBLAST, NOTARGET, DONTGIB,
+		NOBLOCKMONST, FULLVOLDEATH, AVOIDMELEE, SCREENSEEKER, FOILINVUL, NOTELEOTHER,
+		BLOODLESSIMPACT, NOEXPLODEFLOOR, PUFFONACTORS,
+
+		// MF4
+		QUICKTORETALIATE, NOICEDEATH, RANDOMIZE, FIXMAPTHINGPOS, ACTLIKEBRIDGE,
+		STRIFEDAMAGE, CANUSEWALLS, MISSILEMORE, MISSILEEVENMORE, FORCERADIUSDMG,
+		DONTFALL, SEESDAGGERS, INCOMBAT, LOOKALLAROUND, STANDSTILL, SPECTRAL,
+		NOSPLASHALERT, SYNCHRONIZED, NOTARGETSWITCH, DONTHARMCLASS, SHIELDREFLECT,
+		DEFLECT, ALLOWPARTICLES, EXTREMEDEATH, NOEXTREMEDEATH, FRIGHTENED, NOSKIN,
+		BOSSDEATH,
+
+		// MF5
+		DONTDRAIN, GETOWNER, NODROPOFF, NOFORWARDFALL, COUNTSECRET, NODAMAGE,
+		BLOODSPLATTER, OLDRADIUSDMG, DEHEXPLOSION, PIERCEARMOR, NOBLOODDECALS,
+		USESPECIAL, NOPAIN, ALWAYSFAST, NEVERFAST, ALWAYSRESPAWN, NEVERRESPAWN,
+		DONTRIP, NOINFIGHTING, NOINTERACTION, NOTIMEFREEZE, PUFFGETSOWNER,
+		SPECIALFIREDAMAGE, SUMMONEDMONSTER, NOVERTICALMELEERANGE, BRIGHT, CANTSEEK,
+		PAINLESS, MOVEWITHSECTOR,
+
+		// MF6
+		NOBOSSRIP, THRUSPECIES, MTHRUSPECIES, FORCEPAIN, NOFEAR, BUMPSPECIAL,
+		DONTHARMSPECIES, STEPMISSILE, NOTELEFRAG, TOUCHY, CANJUMP, JUMPDOWN,
+		VULNERABLE, NOTRIGGER, ADDITIVEPOISONDAMAGE, ADDITIVEPOISONDURATION,
+		BLOCKEDBYSOLIDACTORS, NOMENU, SEEINVISIBLE, DONTCORPSE, DOHARMSPECIES,
+		POISONALWAYS, NOTAUTOAIMED, NOTONAUTOMAP, RELATIVETOFLOOR,
+
+		// MF7
+		NEVERTARGET, NOTELESTOMP, ALWAYSTELEFRAG, WEAPONSPAWN, HARMFRIENDS, BUDDHA,
+		FOILBUDDHA, DONTTHRUST, ALLOWPAIN, CAUSEPAIN, THRUREFLECT, MIRRORREFLECT,
+		AIMREFLECT, HITTARGET, HITMASTER, HITTRACER, NODECAL, FORCEDECAL, LAXTELEFRAGDMG,
+		ICESHATTER, ALLOWTHRUFLAGS, USEKILLSCRIPTS, NOKILLSCRIPTS, SPRITEANGLE,
+		SMASHABLE, NOSHIELDREFLECT, FORCEZERORADIUSDMG, NOINFIGHTSPECIES, FORCEINFIGHTING,
+
+		// MF8
+		FRIGHTENING, BLOCKASPLAYER, DONTFACETALKER, HITOWNER, NOFRICTION,
+		NOFRICTIONBOUNCE, RETARGETAFTERSLAM, STOPRAILS, FALLDAMAGE, MINVISIBLE,
+		MVISBLOCKED, ABSVIEWANGLES, ALLOWTHRUBITS, FULLVOLSEE, E1M8BOSS, E2M8BOSS,
+		E3M8BOSS, E4M8BOSS, E4M6BOSS, MAP07BOSS1, MAP07BOSS2, AVOIDHAZARDS,
+		STAYONLIFT, DONTFOLLOWPLAYERS, SEEFRIENDLYMONSTERS, CROSSLINECHECK,
+		MASTERNOSEE, ADDLIGHTLEVEL, ONLYSLAMSOLID,
+
+		// MF9
+		SHADOWAIM, DOSHADOWBLOCK, SHADOWBLOCK, SHADOWAIMVERT, DECOUPLEDANIMATIONS,
+
+		// Effect flags
+		VISIBILITYPULSE, ROCKETTRAIL, GRENADETRAIL, INVISIBLE, FORCEYBILLBOARD,
+		FORCEXYBILLBOARD, ROLLSPRITE, FLATSPRITE, WALLSPRITE, DONTFLIP, ROLLCENTER,
+		MASKROTATION, ABSMASKANGLE, ABSMASKPITCH, XFLIP, YFLIP, INTERPOLATEANGLES,
+		DONTINTERPOLATE, SPRITEFLIP, ZDOOMTRANS, CASTSPRITESHADOW, NOSPRITESHADOW,
+		INVISIBLEINMIRRORS, ONLYVISIBLEINMIRRORS, BILLBOARDFACECAMERA,
+		BILLBOARDNOFACECAMERA, FLIPSPRITEOFFSETX, FLIPSPRITEOFFSETY,
+
+		// Bounce flags
+		BOUNCEONWALLS, BOUNCEONFLOORS, BOUNCEONCEILINGS, ALLOWBOUNCEONACTORS,
+		BOUNCEAUTOOFF, BOUNCELIKEHERETIC, CANBOUNCEWATER, NOWALLBOUNCESND,
+		NOBOUNCESOUND, BOUNCEONACTORS, EXPLODEONWATER, MBFBOUNCER, BOUNCEAUTOOFFFLOORONLY,
+		USEBOUNCESTATE, DONTBOUNCEONSHOOTABLES, BOUNCEONUNRIPPABLES, DONTBOUNCEONSKY,
+
+		// Misc
+		NOSAVEGAME
 	}
 
 	// Function info we cannot parse from (g)zdoom.pk3