Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts
Conflicts: apps/openmw-mp/Script/Functions/Actors.cpp apps/openmw-mp/Script/Functions/Actors.hpp apps/openmw-mp/Script/Functions/Cells.cpppull/417/merge
Before Width: | Height: | Size: 820 B |
Before Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 7.0 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 562 B |
Before Width: | Height: | Size: 520 B |
Before Width: | Height: | Size: 615 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 364 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 473 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 326 B |
Before Width: | Height: | Size: 460 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 444 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 418 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 323 B |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 787 B |
After Width: | Height: | Size: 761 B |
After Width: | Height: | Size: 750 B |
After Width: | Height: | Size: 783 B |
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 223 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 588 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 369 B |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 421 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 463 B |
Before Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 386 B |
After Width: | Height: | Size: 306 B |
After Width: | Height: | Size: 288 B |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 362 B |
After Width: | Height: | Size: 221 B |
Before Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 306 B |
After Width: | Height: | Size: 282 B |
After Width: | Height: | Size: 294 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 381 B |
After Width: | Height: | Size: 986 B |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 422 B |
Before Width: | Height: | Size: 7.2 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 389 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 299 B |
Before Width: | Height: | Size: 7.9 KiB |
After Width: | Height: | Size: 282 B |
Before Width: | Height: | Size: 2.3 KiB |
After Width: | Height: | Size: 338 B |
Before Width: | Height: | Size: 676 B |
Before Width: | Height: | Size: 655 B |