From: Rudolf Polzer Date: Sat, 17 Apr 2010 19:00:32 +0000 (+0200) Subject: fix lots of CRLFs X-Git-Tag: xonotic-v0.1.0preview~647 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b0ede1ff8d4cfdec7342aaa3217322ff6a2fd0b;p=xonotic%2Fxonotic-data.pk3dir.git fix lots of CRLFs --- diff --git a/.gitattributes b/.gitattributes index edd30fd6d..67420ef0a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -95,8 +95,8 @@ makespr32 crlf=input *.mapinfo crlf=input *.m crlf=input *.md3 -crlf -diff -*.md5anim crlf=input -*.md5mesh crlf=input +*.md5anim -crlf +*.md5mesh -crlf *.mdl -crlf -diff *.med crlf=input *.mf crlf=input @@ -124,7 +124,7 @@ PkgInfo crlf=input *.pm crlf=input *.png -crlf -diff POSITIONS -crlf -diff -*.proj crlf=input +*.proj -crlf *.properties crlf=input *.psd -crlf -diff *.py crlf=input diff --git a/models/monsters/zombie.dpm.framegroups b/models/monsters/zombie.dpm.framegroups index 4bd49bd37..3d56cdb2f 100644 --- a/models/monsters/zombie.dpm.framegroups +++ b/models/monsters/zombie.dpm.framegroups @@ -1,31 +1,31 @@ -1 56 30 0 // zombie attackleap 1 -57 41 60 1 // zombie attackrun1 2 -98 41 60 1 // zombie attackrun2 3 -139 41 60 1 // zombie attackrun3 4 -180 41 30 1 // zombie attackstanding1 5 -221 35 30 1 // zombie attackstanding2 6 -256 41 30 1 // zombie attackstanding3 7 -297 21 60 1 // zombie blockend 8 -318 21 60 0 // zombie blockstart 9 -339 96 30 0 // zombie deathback1 10 -435 67 30 0 // zombie deathback2 11 -502 71 30 0 // zombie deathback3 12 -573 61 30 0 // zombie deathfront1 13 -634 66 30 0 // zombie deathfront2 14 -700 96 30 0 // zombie deathfront3 15 -796 96 30 0 // zombie deathleft1 16 -892 71 30 0 // zombie deathleft2 17 -963 66 30 0 // zombie deathright1 18 -1029 86 30 0 // zombie deathright2 19 -1115 121 10 1 // zombie idle 20 -1236 11 30 0 // zombie painback1 21 -1247 11 30 0 // zombie painback2 22 -1258 11 30 0 // zombie painfront1 23 -1269 11 30 0 // zombie painfront2 24 -1280 41 60 1 // zombie runbackwards 25 -1321 41 60 1 // zombie runbackwardsleft 26 -1362 41 60 1 // zombie runbackwardsright 27 -1403 41 60 1 // zombie runforward 28 -1444 41 60 1 // zombie runforwardleft 29 -1485 41 60 1 // zombie runforwardright 30 -1526 61 30 0 // zombie spawn 31 +1 56 30 0 // zombie attackleap 1 +57 41 60 1 // zombie attackrun1 2 +98 41 60 1 // zombie attackrun2 3 +139 41 60 1 // zombie attackrun3 4 +180 41 30 1 // zombie attackstanding1 5 +221 35 30 1 // zombie attackstanding2 6 +256 41 30 1 // zombie attackstanding3 7 +297 21 60 1 // zombie blockend 8 +318 21 60 0 // zombie blockstart 9 +339 96 30 0 // zombie deathback1 10 +435 67 30 0 // zombie deathback2 11 +502 71 30 0 // zombie deathback3 12 +573 61 30 0 // zombie deathfront1 13 +634 66 30 0 // zombie deathfront2 14 +700 96 30 0 // zombie deathfront3 15 +796 96 30 0 // zombie deathleft1 16 +892 71 30 0 // zombie deathleft2 17 +963 66 30 0 // zombie deathright1 18 +1029 86 30 0 // zombie deathright2 19 +1115 121 10 1 // zombie idle 20 +1236 11 30 0 // zombie painback1 21 +1247 11 30 0 // zombie painback2 22 +1258 11 30 0 // zombie painfront1 23 +1269 11 30 0 // zombie painfront2 24 +1280 41 60 1 // zombie runbackwards 25 +1321 41 60 1 // zombie runbackwardsleft 26 +1362 41 60 1 // zombie runbackwardsright 27 +1403 41 60 1 // zombie runforward 28 +1444 41 60 1 // zombie runforwardleft 29 +1485 41 60 1 // zombie runforwardright 30 +1526 61 30 0 // zombie spawn 31 diff --git a/models/turrets/walker_body.md3.framegroups b/models/turrets/walker_body.md3.framegroups index 590155efb..050d79cd8 100644 --- a/models/turrets/walker_body.md3.framegroups +++ b/models/turrets/walker_body.md3.framegroups @@ -1,12 +1,12 @@ -1 1 1 0 // ANIM_NO -35 55 20 1 // ANIM_TURN -5 25 20 1 // ANIM_WALK -5 25 40 1 // ANIM_RUN -35 55 20 1 // ANIM_STRAFE_L -65 85 20 1 // ANIM_STRAFE_R -95 100 20 0 // ANIM_JUMP -100 107 20 0 // ANIM_LAND -90 95 20 0 // ANIM_PAIN -123 140 40 0 // ANIM_MEELE -146 151 20 1 // ANIM_SWIM -5 25 20 1 // ANIM_ROAM +1 1 1 0 // ANIM_NO +35 55 20 1 // ANIM_TURN +5 25 20 1 // ANIM_WALK +5 25 40 1 // ANIM_RUN +35 55 20 1 // ANIM_STRAFE_L +65 85 20 1 // ANIM_STRAFE_R +95 100 20 0 // ANIM_JUMP +100 107 20 0 // ANIM_LAND +90 95 20 0 // ANIM_PAIN +123 140 40 0 // ANIM_MEELE +146 151 20 1 // ANIM_SWIM +5 25 20 1 // ANIM_ROAM diff --git a/models/vehicles/spiderbot.dpm.framegroups b/models/vehicles/spiderbot.dpm.framegroups index 3ea278df3..f9db7221e 100644 --- a/models/vehicles/spiderbot.dpm.framegroups +++ b/models/vehicles/spiderbot.dpm.framegroups @@ -1,6 +1,6 @@ -1 30 20 1 // forward -32 30 20 1 // backward -63 30 20 1 // left -94 30 20 1 // right -125 30 20 0 // jump -0 1 20 0 // idle +1 30 20 1 // forward +32 30 20 1 // backward +63 30 20 1 // left +94 30 20 1 // right +125 30 20 0 // jump +0 1 20 0 // idle