diff options
| author | Jørgen P. Tjernø <[email protected]> | 2013-12-03 10:39:23 -0800 |
|---|---|---|
| committer | Jørgen P. Tjernø <[email protected]> | 2013-12-03 11:57:22 -0800 |
| commit | b5dc4a85433a908d38d453e98d7d45e22e2a5fc0 (patch) | |
| tree | f186094efa03e9c1144fb5c98161cf3f7b054f90 /sp/game/hl2/scenes/npc/citizen | |
| parent | Specify clobbered registers in POSIX SSE functions (diff) | |
| download | source-sdk-2013-b5dc4a85433a908d38d453e98d7d45e22e2a5fc0.tar.xz source-sdk-2013-b5dc4a85433a908d38d453e98d7d45e22e2a5fc0.zip | |
Line-ending fixes for most of the remaining files.
Fixes line-endings for files with extensions vcd, cc, txt, bat, fxc, inc, lst,
proto, mak, mm, cfg, res, rc, def, vmt, vsh, vbsp, inl, asm, m4, vcproj,
vcxproj, sln, in, java, la, manifest, am, and rad.
Also fixes README, CONTRIBUTING, CONTRIBUTORS, LICENSE, CHANGES, COPYING, and
gitignore.
Finally, fixes executable bits.
Diffstat (limited to 'sp/game/hl2/scenes/npc/citizen')
| -rw-r--r-- | sp/game/hl2/scenes/npc/citizen/busy02.vcd | 140 | ||||
| -rw-r--r-- | sp/game/hl2/scenes/npc/citizen/cit_dropper01.vcd | 90 | ||||
| -rw-r--r-- | sp/game/hl2/scenes/npc/citizen/cit_dropper04.vcd | 88 |
3 files changed, 159 insertions, 159 deletions
diff --git a/sp/game/hl2/scenes/npc/citizen/busy02.vcd b/sp/game/hl2/scenes/npc/citizen/busy02.vcd index 72b5c175..e2cd7178 100644 --- a/sp/game/hl2/scenes/npc/citizen/busy02.vcd +++ b/sp/game/hl2/scenes/npc/citizen/busy02.vcd @@ -1,70 +1,70 @@ -// Choreo version 1
-actor "!target1"
-{
- channel "audio"
- {
- event speak "npc_citizen.busy02"
- {
- time 0.260000 1.473288
- param "npc_citizen.busy02"
- fixedlength
- cctype "cc_master"
- cctoken ""
- }
- }
- channel "Look at"
- {
- event lookat "player"
- {
- time 0.000000 1.673333
- param "!player"
- event_ramp
- {
- 0.6694 0.5607
- 0.7694 0.5682
- 0.8410 0.5574
- 1.2751 0.5717
- 1.4319 0.0368
- }
- }
- }
- channel "Face to"
- {
- event face "face to"
- {
- time 0.006667 1.753333
- param "!player"
- event_ramp
- {
- 0.2960 0.1296
- 1.4197 0.2425
- }
- }
- }
- channel "Move to"
- {
- }
- channel "Posture"
- {
- }
- channel "Gesture"
- {
- }
- channel "Flex anim"
- {
- }
- channel "Trigger"
- {
- }
-}
-
-scalesettings
-{
- "CChoreoView" "100"
- "RampTool" "50"
- "SceneRampTool" "100"
- "ExpressionTool" "38"
- "GestureTool" "100"
-}
-fps 60
-snap off
+// Choreo version 1 +actor "!target1" +{ + channel "audio" + { + event speak "npc_citizen.busy02" + { + time 0.260000 1.473288 + param "npc_citizen.busy02" + fixedlength + cctype "cc_master" + cctoken "" + } + } + channel "Look at" + { + event lookat "player" + { + time 0.000000 1.673333 + param "!player" + event_ramp + { + 0.6694 0.5607 + 0.7694 0.5682 + 0.8410 0.5574 + 1.2751 0.5717 + 1.4319 0.0368 + } + } + } + channel "Face to" + { + event face "face to" + { + time 0.006667 1.753333 + param "!player" + event_ramp + { + 0.2960 0.1296 + 1.4197 0.2425 + } + } + } + channel "Move to" + { + } + channel "Posture" + { + } + channel "Gesture" + { + } + channel "Flex anim" + { + } + channel "Trigger" + { + } +} + +scalesettings +{ + "CChoreoView" "100" + "RampTool" "50" + "SceneRampTool" "100" + "ExpressionTool" "38" + "GestureTool" "100" +} +fps 60 +snap off diff --git a/sp/game/hl2/scenes/npc/citizen/cit_dropper01.vcd b/sp/game/hl2/scenes/npc/citizen/cit_dropper01.vcd index 633cce72..75a9fc35 100644 --- a/sp/game/hl2/scenes/npc/citizen/cit_dropper01.vcd +++ b/sp/game/hl2/scenes/npc/citizen/cit_dropper01.vcd @@ -1,45 +1,45 @@ -// Choreo version 1
-actor "!target1"
-{
- channel "Audio"
- {
- event speak "Hey down there! Supplies!"
- {
- time 0.200000 2.990000
- param "npc_citizen.cit_dropper01"
- fixedlength
- cctype "cc_master"
- cctoken ""
- }
- }
- channel "Look"
- {
- event lookat "LookPlayer"
- {
- time 0.026667 3.266668
- param "!player"
- event_ramp
- {
- 0.1040 0.3664
- 0.1900 0.6431
- 0.4000 0.9324
- 0.6480 1.0000
- 2.5947 1.0000
- 2.8647 0.9198
- 3.0527 0.5252
- }
- }
- }
- faceposermodel "C:\HL2\hl2\models\Humans\Male_01.mdl"
-}
-
-scalesettings
-{
- "CChoreoView" "100"
- "ExpressionTool" "100"
- "RampTool" "100"
- "GestureTool" "100"
- "SceneRampTool" "100"
-}
-fps 60
-snap off
+// Choreo version 1 +actor "!target1" +{ + channel "Audio" + { + event speak "Hey down there! Supplies!" + { + time 0.200000 2.990000 + param "npc_citizen.cit_dropper01" + fixedlength + cctype "cc_master" + cctoken "" + } + } + channel "Look" + { + event lookat "LookPlayer" + { + time 0.026667 3.266668 + param "!player" + event_ramp + { + 0.1040 0.3664 + 0.1900 0.6431 + 0.4000 0.9324 + 0.6480 1.0000 + 2.5947 1.0000 + 2.8647 0.9198 + 3.0527 0.5252 + } + } + } + faceposermodel "C:\HL2\hl2\models\Humans\Male_01.mdl" +} + +scalesettings +{ + "CChoreoView" "100" + "ExpressionTool" "100" + "RampTool" "100" + "GestureTool" "100" + "SceneRampTool" "100" +} +fps 60 +snap off diff --git a/sp/game/hl2/scenes/npc/citizen/cit_dropper04.vcd b/sp/game/hl2/scenes/npc/citizen/cit_dropper04.vcd index 6d9ea101..bc0469f3 100644 --- a/sp/game/hl2/scenes/npc/citizen/cit_dropper04.vcd +++ b/sp/game/hl2/scenes/npc/citizen/cit_dropper04.vcd @@ -1,44 +1,44 @@ -// Choreo version 1
-actor "!target1"
-{
- channel "Audio"
- {
- event speak "Look out below!"
- {
- time 0.160000 1.440000
- param "npc_citizen.cit_dropper04"
- fixedlength
- cctype "cc_master"
- cctoken ""
- }
- }
- channel "Look"
- {
- event lookat "LookPlayer"
- {
- time 0.000000 1.626667
- param "!player"
- event_ramp
- {
- 0.1160 0.6431
- 0.2460 0.9324
- 0.4940 1.0000
- 1.0273 1.0000
- 1.2973 0.9198
- 1.4853 0.5252
- }
- }
- }
- faceposermodel "C:\HL2\hl2\models\Humans\Male_01.mdl"
-}
-
-scalesettings
-{
- "CChoreoView" "100"
- "ExpressionTool" "100"
- "RampTool" "100"
- "GestureTool" "100"
- "SceneRampTool" "100"
-}
-fps 60
-snap off
+// Choreo version 1 +actor "!target1" +{ + channel "Audio" + { + event speak "Look out below!" + { + time 0.160000 1.440000 + param "npc_citizen.cit_dropper04" + fixedlength + cctype "cc_master" + cctoken "" + } + } + channel "Look" + { + event lookat "LookPlayer" + { + time 0.000000 1.626667 + param "!player" + event_ramp + { + 0.1160 0.6431 + 0.2460 0.9324 + 0.4940 1.0000 + 1.0273 1.0000 + 1.2973 0.9198 + 1.4853 0.5252 + } + } + } + faceposermodel "C:\HL2\hl2\models\Humans\Male_01.mdl" +} + +scalesettings +{ + "CChoreoView" "100" + "ExpressionTool" "100" + "RampTool" "100" + "GestureTool" "100" + "SceneRampTool" "100" +} +fps 60 +snap off |