Skip to content

Commit a9ec64d

Browse files
TeamSpen210TeamSpen210
committed
Merge pull request #28 from TeamSpen210/dev
Release some bugfixes
2 parents 3c44374 + eea3ff2 commit a9ec64d

14 files changed

+8847
-3896
lines changed

‎Readme.html

-988
This file was deleted.

‎portal2_dlc2/BEE2/items/clean_collection.beec

+6,308
Large diffs are not rendered by default.

‎quotes.html

-2,217
This file was deleted.

‎sdk_content/maps/instances/p2editor_clean/elevator_entrance_quiet.vmf

+5-101
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
versioninfo
22
{
33
"editorversion" "400"
4-
"editorbuild" "5685"
5-
"mapversion" "889"
4+
"editorbuild" "6432"
5+
"mapversion" "891"
66
"formatversion" "100"
77
"prefab" "0"
88
}
@@ -38,7 +38,7 @@ viewsettings
3838
world
3939
{
4040
"id" "1"
41-
"mapversion" "889"
41+
"mapversion" "891"
4242
"classname" "worldspawn"
4343
"detailmaterial" "detail/detailsprites"
4444
"detailvbsp" "detail.vbsp"
@@ -122,82 +122,6 @@ world
122122
}
123123
}
124124
solid
125-
{
126-
"id" "124957"
127-
side
128-
{
129-
"id" "24209"
130-
"plane" "(-2560 2048 1536) (1024 2048 1536) (1024 -2048 1536)"
131-
"material" "TOOLS/TOOLSSKIP"
132-
"uaxis" "[1 0 0 0] 0.25"
133-
"vaxis" "[0 -1 0 0] 0.25"
134-
"rotation" "0"
135-
"lightmapscale" "16"
136-
"smoothing_groups" "0"
137-
}
138-
side
139-
{
140-
"id" "24210"
141-
"plane" "(-2560 -2048 -1536) (1024 -2048 -1536) (1024 2048 -1536)"
142-
"material" "TOOLS/TOOLSSKIP"
143-
"uaxis" "[1 0 0 0] 0.25"
144-
"vaxis" "[0 -1 0 0] 0.25"
145-
"rotation" "0"
146-
"lightmapscale" "16"
147-
"smoothing_groups" "0"
148-
}
149-
side
150-
{
151-
"id" "24211"
152-
"plane" "(-2560 2048 1536) (-2560 -2048 1536) (-2560 -2048 -1536)"
153-
"material" "TOOLS/TOOLSSKIP"
154-
"uaxis" "[0 1 0 0] 0.25"
155-
"vaxis" "[0 0 -1 0] 0.25"
156-
"rotation" "0"
157-
"lightmapscale" "16"
158-
"smoothing_groups" "0"
159-
}
160-
side
161-
{
162-
"id" "24212"
163-
"plane" "(1024 2048 -1536) (1024 -2048 -1536) (1024 -2048 1536)"
164-
"material" "TOOLS/TOOLSSKIP"
165-
"uaxis" "[0 1 0 0] 0.25"
166-
"vaxis" "[0 0 -1 0] 0.25"
167-
"rotation" "0"
168-
"lightmapscale" "16"
169-
"smoothing_groups" "0"
170-
}
171-
side
172-
{
173-
"id" "24213"
174-
"plane" "(1024 2048 1536) (-2560 2048 1536) (-2560 2048 -1536)"
175-
"material" "TOOLS/TOOLSSKIP"
176-
"uaxis" "[1 0 0 0] 0.25"
177-
"vaxis" "[0 0 -1 0] 0.25"
178-
"rotation" "0"
179-
"lightmapscale" "16"
180-
"smoothing_groups" "0"
181-
}
182-
side
183-
{
184-
"id" "24214"
185-
"plane" "(1024 -2048 -1536) (-2560 -2048 -1536) (-2560 -2048 1536)"
186-
"material" "TOOLS/TOOLSSKIP"
187-
"uaxis" "[1 0 0 0] 0.25"
188-
"vaxis" "[0 0 -1 0] 0.25"
189-
"rotation" "0"
190-
"lightmapscale" "16"
191-
"smoothing_groups" "0"
192-
}
193-
editor
194-
{
195-
"color" "0 201 238"
196-
"visgroupshown" "1"
197-
"visgroupautoshown" "1"
198-
}
199-
}
200-
solid
201125
{
202126
"id" "123361"
203127
side
@@ -20712,26 +20636,6 @@ entity
2071220636
}
2071320637
}
2071420638
entity
20715-
{
20716-
"id" "36316"
20717-
"classname" "logic_auto"
20718-
"file" "instances/p2editor_clean/global_ents.vmf"
20719-
"spawnflags" "1"
20720-
connections
20721-
{
20722-
"OnMapSpawn" "global_entsinstance:environment_testchamber;Trigger0-1"
20723-
}
20724-
"origin" "-1760 1200 568"
20725-
editor
20726-
{
20727-
"color" "220 220 220"
20728-
"groupid" "36312"
20729-
"visgroupshown" "1"
20730-
"visgroupautoshown" "1"
20731-
"logicalpos" "[0 500]"
20732-
}
20733-
}
20734-
entity
2073520639
{
2073620640
"id" "93390"
2073720641
"classname" "func_detail"
@@ -24444,8 +24348,8 @@ cameras
2444424348
"activecamera" "0"
2444524349
camera
2444624350
{
24447-
"position" "[495.612 1059.05 586.658]"
24448-
"look" "[479.995 1010.99 548.846]"
24351+
"position" "[750.886 -2834.53 1013.78]"
24352+
"look" "[735.685 -2786.61 975.619]"
2444924353
}
2445024354
camera
2445124355
{

‎sdk_content/maps/instances/p2editor_clean/global_ents.vmf

+11-55
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ versioninfo
22
{
33
"editorversion" "400"
44
"editorbuild" "6432"
5-
"mapversion" "230"
5+
"mapversion" "233"
66
"formatversion" "100"
77
"prefab" "0"
88
}
@@ -56,7 +56,7 @@ viewsettings
5656
world
5757
{
5858
"id" "1"
59-
"mapversion" "230"
59+
"mapversion" "233"
6060
"classname" "worldspawn"
6161
"detailmaterial" "detail/detailsprites"
6262
"detailvbsp" "detail.vbsp"
@@ -2893,8 +2893,8 @@ world
28932893
entity
28942894
{
28952895
"id" "7976"
2896-
"classname" "filter_activator_class"
2897-
"filterclass" "prop_energy_ball"
2896+
"classname" "filter_combineball_type"
2897+
"balltype" "3"
28982898
"Negated" "0"
28992899
"targetname" "@filter_pellet"
29002900
"origin" "-176 -16 16"
@@ -2908,55 +2908,6 @@ entity
29082908
}
29092909
}
29102910
entity
2911-
{
2912-
"id" "7623"
2913-
"classname" "filter_activator_class"
2914-
"filterclass" "RocketSentry_Missile"
2915-
"Negated" "Allow entities that match criteria"
2916-
"targetname" "@filter_rockets"
2917-
"origin" "-80 64 16"
2918-
editor
2919-
{
2920-
"color" "220 30 220"
2921-
"visgroupshown" "1"
2922-
"visgroupautoshown" "1"
2923-
"logicalpos" "[0 0]"
2924-
}
2925-
}
2926-
entity
2927-
{
2928-
"id" "7625"
2929-
"classname" "point_template"
2930-
"spawnflags" "2"
2931-
"targetname" "@RocketSentry_Missile_Template"
2932-
"Template01" "@RocketSentry_Missile"
2933-
"origin" "-64 64 16"
2934-
editor
2935-
{
2936-
"color" "220 30 220"
2937-
"visgroupshown" "1"
2938-
"visgroupautoshown" "1"
2939-
"logicalpos" "[0 1000]"
2940-
}
2941-
}
2942-
entity
2943-
{
2944-
"id" "7627"
2945-
"classname" "rocket_turret_projectile"
2946-
"angles" "0 0 0"
2947-
"renderamt" "255"
2948-
"rendercolor" "255 255 255"
2949-
"targetname" "@RocketSentry_Missile"
2950-
"origin" "-64 64 16"
2951-
editor
2952-
{
2953-
"color" "220 30 220"
2954-
"visgroupshown" "1"
2955-
"visgroupautoshown" "1"
2956-
"logicalpos" "[0 1500]"
2957-
}
2958-
}
2959-
entity
29602911
{
29612912
"id" "7251"
29622913
"classname" "ambient_generic"
@@ -2969,6 +2920,7 @@ entity
29692920
"lforate" "0"
29702921
"lfotype" "0"
29712922
"message" "VFX.NeuroToxinLp"
2923+
"null" "-----------------------"
29722924
"pitch" "100"
29732925
"pitchstart" "100"
29742926
"preset" "0"
@@ -3280,6 +3232,7 @@ hidden
32803232
"classname" "ambient_generic"
32813233
"health" "10"
32823234
"message" "Sphere.BlipSmall"
3235+
"null" "-----------------------"
32833236
"pitch" "100"
32843237
"pitchstart" "100"
32853238
"radius" "1250"
@@ -4647,6 +4600,8 @@ entity
46474600
"PerformanceMode" "0"
46484601
"physdamagescale" "0.1"
46494602
"pressuredelay" "0"
4603+
"renderamt" "255"
4604+
"rendercolor" "255 255 255"
46504605
"shadowcastdist" "0"
46514606
"shadowdepthnocache" "0"
46524607
"skin" "0"
@@ -6454,6 +6409,7 @@ entity
64546409
"classname" "ambient_generic"
64556410
"health" "10"
64566411
"message" "music.pti_b1_001"
6412+
"null" "-----------------------"
64576413
"pitch" "100"
64586414
"pitchstart" "100"
64596415
"radius" "1250"
@@ -6697,8 +6653,8 @@ cameras
66976653
"activecamera" "0"
66986654
camera
66996655
{
6700-
"position" "[-163.922 3.27829 88.7318]"
6701-
"look" "[-171.96 -15.8512 29.1466]"
6656+
"position" "[-112.266 23.4089 58.3569]"
6657+
"look" "[-74.7204 57.2151 20.5612]"
67026658
}
67036659
camera
67046660
{

0 commit comments

Comments
 (0)