Skip to content
This repository was archived by the owner on May 3, 2026. It is now read-only.

Commit e892b6e

Browse files
authored
Merge pull request #7 from StrataSource/master
Pull from upstream
2 parents 875ee1d + 4b58974 commit e892b6e

5 files changed

Lines changed: 12 additions & 0 deletions

File tree

db/factories/momentum.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ window_pane
378378
world_items
379379
worldspawn
380380
zone_allowbhop
381+
zone_overbounce
381382
zone_timer_start
382383
zone_timer_cancel
383384
zone_timer_end

fgd/bases/BaseClusteredLight.fgd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[
33
spawnflags(flags) =
44
[
5+
1: "Initially dark" : 0
56
2: "Shadowed" : 0
67
]
78
_lightmode(choices) : "Light mode" : 0 : "The level of dynamic lighting to use for this light. 'Static' lights have no dynamic or specular lighting, and produce direct and bounced static lightmaps. 'Specular' lights have specular lighting, and produce direct and bounced static lightmaps. 'Static Bounce' lights have dynamic direct and specular lighting, and produce only bounced static lightmaps. 'Fully Dynamic' lights have dynamic direct and specular lighting, and produce no static lightmaps." =

fgd/bases/BaseLight.fgd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,9 @@
4141
input Toggle(void) : "Toggle the light's current state."
4242
input SetPattern(string) : "Set a custom pattern of light brightness for this light. Pattern format is a string of characters, where 'a' is total darkness, 'z' fully bright. i.e. 'aaggnnttzz' would be a steppy fade in from dark to light."
4343
input FadeToPattern(string) : "Fades from first value in old pattern, to first value in the new given pattern. Pattern format is a string of characters, where 'a' is total darkness, 'z' fully bright. i.e. 'aaggnnttzz' would be a steppy fade in from dark to light."
44+
input SetLightColor(color255) : "Sets the light color. Light scale is set separately."
45+
input SetLightScale(float) : "Sets the light scale."
46+
input SetLightFalloff(vector) : "Vector of (Constant, Linear, Quadratic) falloff parameters for the light."
47+
input SetInnerAngle(float) : "Sets the inner angle (if this is a spotlight)."
48+
input SetOuterAngle(float) : "Sets the outer angle (if this is a spotlight)."
4449
]
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@SolidClass appliesto(MOMENTUM)
2+
= zone_overbounce : "Zone that allows the player to overbounce inside of its volume. This is used in Defrag modes only."
3+
[
4+
]

fgd/visgroups.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
* `trigger_transition`
206206
- Zone Triggers
207207
* `zone_allowbhop`
208+
* `zone_overbounce`
208209
* `zone_timer_checkpoint`
209210
* `zone_timer_stage`
210211
* `zone_timer_start`

0 commit comments

Comments
 (0)