Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Changes conditionals from "DrawBlips" and "ShowRadarTrace", "ShowRadarTraceWithHeight" to allow blips to be rendered during scripted sequences when "MENU_MAP" is enabled.
|
|
|
|
This reverts commit af7573ddbe38e0aaa485877e7ccb2e704b0f5a7f.
|
|
This reverts commit 2b67aba94cb6448fb24c869559465eddf2bad069.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit 7a3b80a9b7f414967fe59f89ab0fe5416735babe.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# src/core/Camera.cpp
# src/weapons/Weapon.cpp
|
|
|
|
from miami
|
|
|
|
|
|
|
|
many additions
|
|
|
|
|
|
|
|
|
|
|
|
|