Sergeanur 35c41208f5 Merge branch 'master' into miami ...

# Conflicts:
#	src/animation/AnimManager.cpp
#	src/control/CarCtrl.cpp
#	src/control/Curves.cpp
#	src/core/templates.h

2020-05-10 01:26:12 +03:00

..

animation

Merge branch 'master' into miami

2020-05-10 01:26:12 +03:00

audio

peds starting to work

2020-05-09 17:05:26 +02:00

control

Merge branch 'master' into miami

2020-05-10 01:26:12 +03:00

core

Merge branch 'master' into miami

2020-05-10 01:26:12 +03:00

entities

sync with upstream

2020-05-07 16:59:40 +03:00

extras

Place debug menu under ifdef

2020-05-09 16:06:13 +03:00

fakerw

got rid of superfluous enum; update librw

2020-05-07 12:48:57 +02:00

math

implemented most of streamed collisions and big buildings

2020-05-05 13:02:42 +02:00

modelinfo

peds starting to work

2020-05-09 17:05:26 +02:00

objects

peds starting to work

2020-05-09 17:05:26 +02:00

peds

Merge branch 'master' into miami

2020-05-10 01:26:12 +03:00

render

Merge branch 'master' into miami

2020-05-10 01:26:12 +03:00

rw

Merge branch 'master' into miami

2020-05-10 01:26:12 +03:00

save

cleaned up MIAMI ifdefs

2020-05-05 18:06:38 +02:00

skel

Menu map fixes and resizable window on GLFW

2020-05-09 13:58:31 +03:00

text

Fix CMessages::InsertStringInString

2020-05-03 01:40:37 +03:00

vehicles

new curves + boat fix

2020-05-09 22:11:40 +03:00

weapons

named anim assoc flags

2020-05-09 09:51:31 +02:00