stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2024-11-10 06:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged in GZDB r2464.

Browse source
This commit is contained in:
MascaraSnake 2016-01-22 23:52:57 +01:00
parent 193ee733ab
commit 4dfd8297c7
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Build/Configurations/Includes/ZDoom_things.cfg
View file

@ -826,7 +826,7 @@ zdoom
9994 9994
{ {
title = "Player uses sector"; title = "Player uses wall";
class = "SecActUseWall"; class = "SecActUseWall";
} }
@ -842,7 +842,7 @@ zdoom
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255; default = 255;
} }
arg2 arg2
{ {

22
Build/Scripting/ZDoom_DECORATE.cfg
View file

@ -185,7 +185,7 @@ keywords
A_SetRipperLevel = "A_SetRipperLevel(int level)"; A_SetRipperLevel = "A_SetRipperLevel(int level)";
A_SetRipMin = "A_SetRipMin(int min)"; A_SetRipMin = "A_SetRipMin(int min)";
A_SetRipMax = "A_SetRipMax(int max)"; A_SetRipMax = "A_SetRipMax(int max)";
A_SetRoll = "A_SetRoll(float pitch[, int flags = 0[, int pointer = AAPTR_DEFAULT]])"; A_SetRoll = "A_SetRoll(float roll[, int flags = 0[, int pointer = AAPTR_DEFAULT]])";
A_SetScale = "A_SetScale(float scaleX[, float scaleY = scaleX[, int pointer = AAPTR_DEFAULT]])"; A_SetScale = "A_SetScale(float scaleX[, float scaleY = scaleX[, int pointer = AAPTR_DEFAULT]])";
A_SetShadow = "A_SetShadow"; A_SetShadow = "A_SetShadow";
A_SetShootable = "A_SetShootable"; A_SetShootable = "A_SetShootable";
@ -385,6 +385,22 @@ constants
Bounce.Wall:; Bounce.Wall:;
Bounce.Actor:; Bounce.Actor:;
Bounce.Actor.Creature:; Bounce.Actor.Creature:;
//weapon states:
Ready:;
Select:;
Deselect:;
Fire:;
AltFire:;
Hold:;
AltHold:;
Flash:;
AltFlash:;
Reload:;
Zoom:;
User1:;
User2:;
User3:;
User4:;
//flow control //flow control
loop; loop;
stop; stop;
@ -667,6 +683,10 @@ constants
WRF_NOSECONDARY; WRF_NOSECONDARY;
WRF_ALLOWRELOAD; WRF_ALLOWRELOAD;
WRF_ALLOWZOOM; WRF_ALLOWZOOM;
WRF_ALLOWUSER1;
WRF_ALLOWUSER2;
WRF_ALLOWUSER3;
WRF_ALLOWUSER4;
ZOOM_INSTANT; ZOOM_INSTANT;
ZOOM_NOSCALETURNING; ZOOM_NOSCALETURNING;
CPF_USEAMMO; CPF_USEAMMO;