mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 01:37:00 +00:00
Merge commit 'origin/master' into 320
Conflicts: src/game/Player.cpp src/game/Totem.cpp
This commit is contained in:
commit
4c709772c1
61 changed files with 912 additions and 454 deletions
|
|
@ -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?
|
||||
};
|
||||
*/
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue