Skip to content

Commit e2e613b

Browse files
committed
Merged master into engine_blade.
1 parent 416b97e commit e2e613b

File tree

272 files changed

+5525
-2390
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+5525
-2390
lines changed

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ignore=
88
# For a list of error codes, see:
99
# http://pylint-messages.wikidot.com/all-codes
1010
# disable=C0103, E0203, R0911, R0915, R0921, W0142, W0201, W0232, W0613
11-
disable=C0330, E0611, E1101, F0401, R0902, R0903, R0904, R0912, R0913, R0914, W0212, W0702
11+
disable=C0330, C0411, E0611, E1101, F0401, R0902, R0903, R0904, R0912, R0913, R0914, W0212, W0702
1212

1313

1414
[BASIC]

addons/source-python/data/source-python/client/csgo/CBaseClient.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
[virtual_function]
44
[[set_name]]
5-
offset_linux = 64
6-
offset_windows = 27
5+
offset_linux = 66
6+
offset_windows = 28
77
arguments = STRING

addons/source-python/data/source-python/credits.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
[Contributors]
3030
3131
jsza = ""
32+
KirillMysnik = "Kirill Mysnik"
33+
Mahi = "Markus Meskanen"
3234
olegtsvetkov = "Oleg Tsvetkov"
3335
OmegaK2 = ""
3436
ThaPwned = ""
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# ../effects/CTEArmorRicochet.ini
2+
# Temp Entity Name: Armor Ricochet
3+
4+
direction = m_vecDir
5+
position = m_vecPos
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# ../effects/CTEBSPDecal.ini
2+
# Temp Entity Name: BSP Decal
3+
4+
entity_index = m_nEntity
5+
decal_index = m_nIndex
6+
origin = m_vecOrigin
7+
8+
[entity]
9+
name = entity_index
10+
type = Entity
11+
12+
[decal]
13+
name = decal_index
14+
type = Decal
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# ../effects/CTEBeamEntPoint.ini
2+
# Temp Entity Name: BeamEntPoint
3+
4+
alpha = a
5+
blue = b
6+
green = g
7+
amplitude = m_fAmplitude
8+
end_width = m_fEndWidth
9+
life_time = m_fLife
10+
start_width = m_fWidth
11+
end_entity_index = m_nEndEntity
12+
fade_length = m_nFadeLength
13+
flags = m_nFlags
14+
frame_rate = m_nFrameRate
15+
halo_index = m_nHaloIndex
16+
model_index = m_nModelIndex
17+
speed = m_nSpeed
18+
start_entity_index = m_nStartEntity
19+
start_frame = m_nStartFrame
20+
end_point = m_vecEndPoint
21+
start_point = m_vecStartPoint
22+
red = r
23+
24+
[color]
25+
name = red, green, blue, alpha
26+
type = Color
27+
28+
[model]
29+
name = model_index
30+
type = Model
31+
32+
[halo]
33+
name = halo_index
34+
type = Model
35+
36+
[start_entity]
37+
name = start_entity_index
38+
type = Entity
39+
40+
[end_entity]
41+
name = end_entity_index
42+
type = Entity
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# ../effects/CTEBeamEntPoint.ini
2+
# Temp Entity Name: BeamEnts
3+
4+
alpha = a
5+
blue = b
6+
green = g
7+
amplitude = m_fAmplitude
8+
end_width = m_fEndWidth
9+
life_time = m_fLife
10+
start_width = m_fWidth
11+
end_entity_index = m_nEndEntity
12+
fade_length = m_nFadeLength
13+
flags = m_nFlags
14+
frame_rate = m_nFrameRate
15+
halo_index = m_nHaloIndex
16+
model_index = m_nModelIndex
17+
speed = m_nSpeed = int
18+
start_entity_index = m_nStartEntity
19+
start_frame = m_nStartFrame
20+
red = r
21+
22+
[color]
23+
name = red, green, blue, alpha
24+
type = Color
25+
26+
[model]
27+
name = model_index
28+
type = Model
29+
30+
[halo]
31+
name = halo_index
32+
type = Model
33+
34+
[start_entity]
35+
name = start_entity_index
36+
type = Entity
37+
38+
[end_entity]
39+
name = end_entity_index
40+
type = Entity
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# ../effects/CTEBeamFollow.ini
2+
# Temp Entity Name: BeamFollow
3+
4+
alpha = a
5+
blue = b
6+
green = g
7+
amplitude = m_fAmplitude
8+
end_width = m_fEndWidth
9+
life_time = m_fLife
10+
start_width = m_fWidth
11+
entity_index = m_iEntIndex
12+
fade_length = m_nFadeLength
13+
flags = m_nFlags
14+
frame_rate = m_nFrameRate
15+
halo_index = m_nHaloIndex
16+
model_index = m_nModelIndex
17+
speed = m_nSpeed
18+
start_frame = m_nStartFrame
19+
red = r
20+
21+
[color]
22+
name = red, green, blue, alpha
23+
type = Color
24+
25+
[model]
26+
name = model_index
27+
type = Model
28+
29+
[halo]
30+
name = halo_index
31+
type = Model
32+
33+
[entity]
34+
name = entity_index
35+
type = Entity
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# ../effects/CTEBeamLaser.ini
2+
# Temp Entity Name: BeamLaser
3+
4+
alpha = a
5+
blue = b
6+
green = g
7+
amplitude = m_fAmplitude
8+
end_width = m_fEndWidth
9+
life_time = m_fLife
10+
start_width = m_fWidth
11+
end_entity_index = m_nEndEntity
12+
fade_length = m_nFadeLength
13+
flags = m_nFlags
14+
frame_rate = m_nFrameRate
15+
halo_index = m_nHaloIndex
16+
model_index = m_nModelIndex
17+
speed = m_nSpeed
18+
start_entity_index = m_nStartEntity
19+
start_frame = m_nStartFrame
20+
red = r
21+
22+
[color]
23+
name = red, green, blue, alpha
24+
type = Color
25+
26+
[model]
27+
name = model_index
28+
type = Model
29+
30+
[halo]
31+
name = halo_index
32+
type = Model
33+
34+
[start_entity]
35+
name = start_entity_index
36+
type = Entity
37+
38+
[end_entity]
39+
name = end_entity_index
40+
type = Entity
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# ../effects/CTEBeamPoints.ini
2+
# Temp Entity Name: BeamPoints
3+
4+
alpha = a
5+
blue = b
6+
green = g
7+
amplitude = m_fAmplitude
8+
end_width = m_fEndWidth
9+
life_time = m_fLife
10+
start_width = m_fWidth
11+
fade_length = m_nFadeLength
12+
flags = m_nFlags
13+
frame_rate = m_nFrameRate
14+
halo_index = m_nHaloIndex
15+
model_index = m_nModelIndex
16+
speed = m_nSpeed
17+
start_frame = m_nStartFrame
18+
end_point = m_vecEndPoint
19+
start_point = m_vecStartPoint
20+
red = r
21+
22+
[color]
23+
name = red, green, blue, alpha
24+
type = Color
25+
26+
[model]
27+
name = model_index
28+
type = Model
29+
30+
[halo]
31+
name = halo_index
32+
type = Model
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# ../effects/CTEBeamRing.ini
2+
# Temp Entity Name: BeamRing
3+
4+
alpha = a
5+
blue = b
6+
green = g
7+
amplitude = m_fAmplitude
8+
end_width = m_fEndWidth
9+
life_time = m_fLife
10+
start_width = m_fWidth
11+
end_entity_index = m_nEndEntity
12+
fade_length = m_nFadeLength
13+
flags = m_nFlags
14+
frame_rate = m_nFrameRate
15+
halo_index = m_nHaloIndex
16+
model_index = m_nModelIndex
17+
speed = m_nSpeed
18+
start_entity_index = m_nStartEntity
19+
start_frame = m_nStartFrame
20+
red = r
21+
22+
[color]
23+
name = red, green, blue, alpha
24+
type = Color
25+
26+
[model]
27+
name = model_index
28+
type = Model
29+
30+
[halo]
31+
name = halo_index
32+
type = Model
33+
34+
[start_entity]
35+
name = start_entity_index
36+
type = Entity
37+
38+
[end_entity]
39+
name = end_entity_index
40+
type = Entity
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# ../effects/CTEBeamRingPoint.ini
2+
# Temp Entity Name: BeamRingPoint
3+
4+
alpha = a
5+
blue = b
6+
green = g
7+
amplitude = m_fAmplitude
8+
end_width = m_fEndWidth
9+
life_time = m_fLife
10+
start_width = m_fWidth
11+
end_radius = m_flEndRadius
12+
start_radius = m_flStartRadius
13+
fade_length = m_nFadeLength
14+
flags = m_nFlags
15+
frame_rate = m_nFrameRate
16+
halo_index = m_nHaloIndex
17+
model_index = m_nModelIndex
18+
speed = m_nSpeed
19+
start_frame = m_nStartFrame
20+
center = m_vecCenter
21+
red = r
22+
23+
[halo]
24+
name = halo_index
25+
type = Model
26+
27+
[model]
28+
name = model_index
29+
type = Model
30+
31+
[color]
32+
name = red, green, blue, alpha
33+
type = Color
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# ../effects/CTEBeamSpline.ini
2+
# Temp Entity Name: BeamSpline
3+
4+
points_length = int
5+
6+
[points]
7+
name = m_vecPoints
8+
type = Vector
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# ../effects/CTEBloodSprite.ini
2+
# Temp Entity Name: Blood Sprite
3+
4+
alpha = a
5+
blue = b
6+
green = g
7+
drop_model_index = m_nDropModel
8+
size = m_nSize
9+
spray_model_index = m_nSprayModel
10+
direction = m_vecDirection
11+
origin = m_vecOrigin
12+
red = r
13+
14+
[color]
15+
name = red, green, blue, alpha
16+
type = Color
17+
18+
[drop_model]
19+
name = drop_model_index
20+
type = Model
21+
22+
[spray_model]
23+
name = spray_model_index
24+
type = Model
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# ../effects/CTEBloodStream.ini
2+
# Temp Entity Name: Blood Stream
3+
4+
alpha = a
5+
blue = b
6+
green = g
7+
amount = m_nAmount
8+
direction = m_vecDirection
9+
red = r
10+
11+
[color]
12+
name = red, green, blue, alpha
13+
type = Color
14+
15+
[origin]
16+
name = m_vecOrigin[0]
17+
type = Vector
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# ../effects/CTEBreakModel.ini
2+
# Temp Entity Name: breakmodel
3+
4+
life_time = m_fTime
5+
count = m_nCount
6+
flags = m_nFlags
7+
model_index = m_nModelIndex
8+
randomization = m_nRandomization
9+
origin = m_vecOrigin
10+
size = m_vecSize
11+
velocity = m_vecVelocity
12+
13+
[rotation]
14+
name = m_angRotation[0]
15+
type = Vector
16+
17+
[model]
18+
name = model_index
19+
type = Model

0 commit comments

Comments
 (0)