Sergeanur dd790b00e5 Merge branch 'miami' into lcs ...

# Conflicts:
#	src/audio/MusicManager.cpp

2021-06-30 21:46:08 +03:00

..

animation

Wait states ported (scripted animations)

2021-06-24 21:42:10 +03:00

audio

Merge branch 'miami' into lcs

2021-06-30 21:46:08 +03:00

buildings

Pool fixes + peds not forming circle fix

2021-06-24 21:34:28 +03:00

collision

Pool fixes + peds not forming circle fix

2021-06-24 21:34:28 +03:00

control

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

core

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

entities

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

extras

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

fakerw

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

2021-02-16 18:08:19 +02:00

leeds

CSimpleModelInfo

2021-01-24 13:47:33 +01:00

math

CEntity done; C(Vu)Vector fixes and cleanup

2021-06-24 21:45:21 +03:00

modelinfo

forgotten field in CBaseModelInfo::Shutdown

2021-06-24 21:46:21 +03:00

objects

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

peds

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

render

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

rw

Make colors in texture conversion dialog more LCSy.

2021-06-25 22:45:21 +02:00

save

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

skel

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

text

Merge branch 'miami' into lcs

2021-02-26 11:07:32 +02:00

vehicles

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

weapons

Merge branch 'miami' into lcs

2021-06-30 21:26:36 +03:00

CMakeLists.txt

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

2021-06-26 14:27:54 +03:00