Merge remote-tracking branch 'origin/master' into miami

# Conflicts:
#	README.md
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/render/Renderer.cpp
#	src/vehicles/Plane.cpp
This commit is contained in:
Sergeanur
2020-07-22 18:29:17 +03:00
9 changed files with 111 additions and 267 deletions

View File

@ -21,8 +21,6 @@ such that we have a working game at all times.
## Preparing the environment for building
Currently only building on VS2015/2017/2019 (Windows) and GCC (Linux) is tested.
- Clone the repo.
- Run `git submodule init` and `git submodule update`.
- Point GTA_III_RE_DIR environment variable to GTA3 root folder.