Skip to content

Commit 488e40f

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into engine_sdk2013
2 parents 9104842 + 4a9c236 commit 488e40f

Some content is hidden

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

63 files changed

+17059
-50
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[input]
2+
3+
spark_once = SparkOnce
4+
start_spark = StartSpark
5+
stop_spark = StopSpark
6+
toggle_spark = ToggleSpark
7+
8+
9+
[keyvalue]
10+
11+
magnitude = Magnitude
12+
max_delay = MaxDelay
13+
trail_length = TrailLength
14+
15+
16+
[property]
17+
18+
glow_sprite_index = m_nGlowSpriteIndex

addons/source-python/data/source-python/entities/csgo/CCSPlayer.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ srv_check = False
1818
identifier_windows = 55 8B EC 83 EC 28 56 57 8B F9 F3 0F 11 4D FC
1919
identifier_linux = _ZN9CCSPlayer6DeafenEf
2020

21-
[[respawn]]
21+
[[_spawn]]
2222
identifier_windows = 55 8B EC 83 EC 08 56 8B F1 8B 0D 2A 2A 2A 2A 57 8B 01
2323
identifier_linux = _ZN9CCSPlayer12RoundRespawnEv
2424

addons/source-python/data/source-python/entities/orangebox/cstrike/CCSPlayer.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
identifier_linux = _ZN9CCSPlayer6DeafenEf
2525
arguments = FLOAT
2626

27-
[[respawn]]
28-
identifier_windows = 55 8B EC 51 89 2A 2A 8B 2A 2A 8B 10 8B 4D FC
29-
identifier_linux = _ZN9CCSPlayer12RoundRespawnEv
30-
3127
[[switch_team]]
3228
identifier_windows = 55 8B EC 83 EC 7C 89 4D FC
3329
identifier_linux = _ZN9CCSPlayer10SwitchTeamEi
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# -*- coding: utf-8 -*-
2+
3+
# Copyright (C) 2005 Michael Urman
4+
#
5+
# This program is free software; you can redistribute it and/or modify
6+
# it under the terms of version 2 of the GNU General Public License as
7+
# published by the Free Software Foundation.
8+
9+
10+
"""Mutagen aims to be an all purpose multimedia tagging library.
11+
12+
::
13+
14+
import mutagen.[format]
15+
metadata = mutagen.[format].Open(filename)
16+
17+
``metadata`` acts like a dictionary of tags in the file. Tags are generally a
18+
list of string-like values, but may have additional methods available
19+
depending on tag or format. They may also be entirely different objects
20+
for certain keys, again depending on format.
21+
"""
22+
23+
from mutagen._util import MutagenError
24+
from mutagen._file import FileType, StreamInfo, File
25+
from mutagen._tags import Tags, Metadata, PaddingInfo
26+
27+
version = (1, 34, 1)
28+
"""Version tuple."""
29+
30+
version_string = ".".join(map(str, version))
31+
"""Version string."""
32+
33+
MutagenError
34+
35+
FileType
36+
37+
StreamInfo
38+
39+
File
40+
41+
Tags
42+
43+
Metadata
44+
45+
PaddingInfo
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# -*- coding: utf-8 -*-
2+
3+
# Copyright (C) 2013 Christoph Reiter
4+
#
5+
# This program is free software; you can redistribute it and/or modify
6+
# it under the terms of version 2 of the GNU General Public License as
7+
# published by the Free Software Foundation.
8+
9+
import sys
10+
11+
12+
PY2 = sys.version_info[0] == 2
13+
PY3 = not PY2
14+
15+
if PY2:
16+
from StringIO import StringIO
17+
BytesIO = StringIO
18+
from cStringIO import StringIO as cBytesIO
19+
from itertools import izip
20+
21+
long_ = long
22+
integer_types = (int, long)
23+
string_types = (str, unicode)
24+
text_type = unicode
25+
26+
xrange = xrange
27+
cmp = cmp
28+
chr_ = chr
29+
30+
def endswith(text, end):
31+
return text.endswith(end)
32+
33+
iteritems = lambda d: d.iteritems()
34+
itervalues = lambda d: d.itervalues()
35+
iterkeys = lambda d: d.iterkeys()
36+
37+
iterbytes = lambda b: iter(b)
38+
39+
exec("def reraise(tp, value, tb):\n raise tp, value, tb")
40+
41+
def swap_to_string(cls):
42+
if "__str__" in cls.__dict__:
43+
cls.__unicode__ = cls.__str__
44+
45+
if "__bytes__" in cls.__dict__:
46+
cls.__str__ = cls.__bytes__
47+
48+
return cls
49+
50+
elif PY3:
51+
from io import StringIO
52+
StringIO = StringIO
53+
from io import BytesIO
54+
cBytesIO = BytesIO
55+
56+
long_ = int
57+
integer_types = (int,)
58+
string_types = (str,)
59+
text_type = str
60+
61+
izip = zip
62+
xrange = range
63+
cmp = lambda a, b: (a > b) - (a < b)
64+
chr_ = lambda x: bytes([x])
65+
66+
def endswith(text, end):
67+
# usefull for paths which can be both, str and bytes
68+
if isinstance(text, str):
69+
if not isinstance(end, str):
70+
end = end.decode("ascii")
71+
else:
72+
if not isinstance(end, bytes):
73+
end = end.encode("ascii")
74+
return text.endswith(end)
75+
76+
iteritems = lambda d: iter(d.items())
77+
itervalues = lambda d: iter(d.values())
78+
iterkeys = lambda d: iter(d.keys())
79+
80+
iterbytes = lambda b: (bytes([v]) for v in b)
81+
82+
def reraise(tp, value, tb):
83+
raise tp(value).with_traceback(tb)
84+
85+
def swap_to_string(cls):
86+
return cls
Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
# -*- coding: utf-8 -*-
2+
3+
"""Constants used by Mutagen."""
4+
5+
GENRES = [
6+
u"Blues",
7+
u"Classic Rock",
8+
u"Country",
9+
u"Dance",
10+
u"Disco",
11+
u"Funk",
12+
u"Grunge",
13+
u"Hip-Hop",
14+
u"Jazz",
15+
u"Metal",
16+
u"New Age",
17+
u"Oldies",
18+
u"Other",
19+
u"Pop",
20+
u"R&B",
21+
u"Rap",
22+
u"Reggae",
23+
u"Rock",
24+
u"Techno",
25+
u"Industrial",
26+
u"Alternative",
27+
u"Ska",
28+
u"Death Metal",
29+
u"Pranks",
30+
u"Soundtrack",
31+
u"Euro-Techno",
32+
u"Ambient",
33+
u"Trip-Hop",
34+
u"Vocal",
35+
u"Jazz+Funk",
36+
u"Fusion",
37+
u"Trance",
38+
u"Classical",
39+
u"Instrumental",
40+
u"Acid",
41+
u"House",
42+
u"Game",
43+
u"Sound Clip",
44+
u"Gospel",
45+
u"Noise",
46+
u"Alt. Rock",
47+
u"Bass",
48+
u"Soul",
49+
u"Punk",
50+
u"Space",
51+
u"Meditative",
52+
u"Instrumental Pop",
53+
u"Instrumental Rock",
54+
u"Ethnic",
55+
u"Gothic",
56+
u"Darkwave",
57+
u"Techno-Industrial",
58+
u"Electronic",
59+
u"Pop-Folk",
60+
u"Eurodance",
61+
u"Dream",
62+
u"Southern Rock",
63+
u"Comedy",
64+
u"Cult",
65+
u"Gangsta Rap",
66+
u"Top 40",
67+
u"Christian Rap",
68+
u"Pop/Funk",
69+
u"Jungle",
70+
u"Native American",
71+
u"Cabaret",
72+
u"New Wave",
73+
u"Psychedelic",
74+
u"Rave",
75+
u"Showtunes",
76+
u"Trailer",
77+
u"Lo-Fi",
78+
u"Tribal",
79+
u"Acid Punk",
80+
u"Acid Jazz",
81+
u"Polka",
82+
u"Retro",
83+
u"Musical",
84+
u"Rock & Roll",
85+
u"Hard Rock",
86+
u"Folk",
87+
u"Folk-Rock",
88+
u"National Folk",
89+
u"Swing",
90+
u"Fast-Fusion",
91+
u"Bebop",
92+
u"Latin",
93+
u"Revival",
94+
u"Celtic",
95+
u"Bluegrass",
96+
u"Avantgarde",
97+
u"Gothic Rock",
98+
u"Progressive Rock",
99+
u"Psychedelic Rock",
100+
u"Symphonic Rock",
101+
u"Slow Rock",
102+
u"Big Band",
103+
u"Chorus",
104+
u"Easy Listening",
105+
u"Acoustic",
106+
u"Humour",
107+
u"Speech",
108+
u"Chanson",
109+
u"Opera",
110+
u"Chamber Music",
111+
u"Sonata",
112+
u"Symphony",
113+
u"Booty Bass",
114+
u"Primus",
115+
u"Porn Groove",
116+
u"Satire",
117+
u"Slow Jam",
118+
u"Club",
119+
u"Tango",
120+
u"Samba",
121+
u"Folklore",
122+
u"Ballad",
123+
u"Power Ballad",
124+
u"Rhythmic Soul",
125+
u"Freestyle",
126+
u"Duet",
127+
u"Punk Rock",
128+
u"Drum Solo",
129+
u"A Cappella",
130+
u"Euro-House",
131+
u"Dance Hall",
132+
u"Goa",
133+
u"Drum & Bass",
134+
u"Club-House",
135+
u"Hardcore",
136+
u"Terror",
137+
u"Indie",
138+
u"BritPop",
139+
u"Afro-Punk",
140+
u"Polsk Punk",
141+
u"Beat",
142+
u"Christian Gangsta Rap",
143+
u"Heavy Metal",
144+
u"Black Metal",
145+
u"Crossover",
146+
u"Contemporary Christian",
147+
u"Christian Rock",
148+
u"Merengue",
149+
u"Salsa",
150+
u"Thrash Metal",
151+
u"Anime",
152+
u"JPop",
153+
u"Synthpop",
154+
u"Abstract",
155+
u"Art Rock",
156+
u"Baroque",
157+
u"Bhangra",
158+
u"Big Beat",
159+
u"Breakbeat",
160+
u"Chillout",
161+
u"Downtempo",
162+
u"Dub",
163+
u"EBM",
164+
u"Eclectic",
165+
u"Electro",
166+
u"Electroclash",
167+
u"Emo",
168+
u"Experimental",
169+
u"Garage",
170+
u"Global",
171+
u"IDM",
172+
u"Illbient",
173+
u"Industro-Goth",
174+
u"Jam Band",
175+
u"Krautrock",
176+
u"Leftfield",
177+
u"Lounge",
178+
u"Math Rock",
179+
u"New Romantic",
180+
u"Nu-Breakz",
181+
u"Post-Punk",
182+
u"Post-Rock",
183+
u"Psytrance",
184+
u"Shoegaze",
185+
u"Space Rock",
186+
u"Trop Rock",
187+
u"World Music",
188+
u"Neoclassical",
189+
u"Audiobook",
190+
u"Audio Theatre",
191+
u"Neue Deutsche Welle",
192+
u"Podcast",
193+
u"Indie Rock",
194+
u"G-Funk",
195+
u"Dubstep",
196+
u"Garage Rock",
197+
u"Psybient",
198+
]
199+
"""The ID3v1 genre list."""

0 commit comments

Comments
 (0)