archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-27 06:22:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
This commit is contained in:
Sergeanur
2021-01-23 15:14:15 +02:00
parent cfac29b0ef b5c4866964
commit 904090cbb6
46 changed files with 155 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/render/WaterCreatures.cpp
View File

@ -1,10 +1,10 @@
#include "common.h"
#include "WaterCreatures.h"
#include "ModelIndices.h"
#include "World.h"
#include "WaterLevel.h"
#include "Camera.h"
#include "PlayerPed.h"
#include "config.h"
#include "General.h"
/*