Merge commit 'origin/master' into 320

Conflicts:
	src/game/Player.cpp
	src/game/Totem.cpp
This commit is contained in:
tomrus88 2009-07-21 08:22:30 +04:00
commit 4c709772c1
61 changed files with 912 additions and 454 deletions

View file

@ -661,7 +661,7 @@ struct CinematicCameraEntry
float start_x; // 3
float start_y; // 4
float start_z; // 5
float unk6; // 6 speed?
float unk6; // 6 speed?
};
*/