Commit 80aef22b authored by Mirio's avatar Mirio

Merge branch 'terencehill/boil_trigger_hurt' into 'master'

Boil: move trigger_hurt down

See merge request !103
parents 08c1a7d0 c92b1b21
......@@ -12453,11 +12453,11 @@ brushDef
{
brushDef
{
( 1712 1168 -256 ) ( 1712 856 -256 ) ( 1032 1168 -256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/trigger 0 0 0
( 1616 1536 -256 ) ( 936 1536 -256 ) ( 1616 1536 -320 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/trigger 0 0 0
( 2048 1136 -256 ) ( 2048 1136 -320 ) ( 2048 824 -256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/trigger 0 0 0
( 1032 856 -384 ) ( 1712 856 -384 ) ( 1032 1168 -384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/trigger 0 0 0
( 1096 952 -320 ) ( 1088 960 -320 ) ( 1096 952 -192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/trigger 0 0 0
( 1712 1168 -518 ) ( 1712 856 -518 ) ( 1032 1168 -518 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/trigger 0 0 0
( 1616 1536 -518 ) ( 936 1536 -518 ) ( 1616 1536 -582 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/trigger 0 0 0
( 2048 1136 -518 ) ( 2048 1136 -582 ) ( 2048 824 -518 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/trigger 0 0 0
( 1032 856 -646 ) ( 1712 856 -646 ) ( 1032 1168 -646 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/trigger 0 0 0
( 1096 952 -582 ) ( 1088 960 -582 ) ( 1096 952 -454 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/trigger 0 0 0
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment