Sergeanur 655eaa36ce Merge remote-tracking branch 'origin/master' into miami ...

# Conflicts:
#	src/control/Script.cpp
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/render/Fluff.cpp
#	src/render/Hud.cpp

2020-06-15 17:44:47 +03:00

..

animation

cleaned up and updated animviewer; fixed animation bug

2020-06-08 13:01:23 +02:00

audio

fixes

2020-06-08 16:22:49 +03:00

control

Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami

2020-06-15 00:26:27 +03:00

core

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

2020-06-15 17:44:47 +03:00

entities

more script commands

2020-06-07 15:49:25 +03:00

extras

frontend options fix

2020-05-29 20:29:18 +03:00

fakerw

librw update

2020-05-27 20:42:15 +02:00

math

Merge branch 'master' into miami

2020-06-07 04:15:10 +03:00

modelinfo

some more camera stuff

2020-06-14 23:15:56 +02:00

objects

fixes for CPhysical and friends

2020-05-22 14:34:44 +02:00

peds

Merge pull request #631 from erorcun/miami

2020-06-14 22:59:02 +03:00

render

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

2020-06-15 17:44:47 +03:00

rw

Revert "FONT_BANK renamed to FONT_STANDARD"

2020-06-07 05:03:06 +03:00

save

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

2020-06-03 01:24:08 +03:00

skel

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

2020-06-03 01:24:08 +03:00

text

VC CMenuManager struct, ctor etc.

2020-05-22 03:48:12 +03:00

vehicles

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

2020-06-15 17:44:47 +03:00

weapons

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

2020-06-15 17:44:47 +03:00