Sergeanur 33abd1b4e7 Merge branch 'miami' into lcs ...

# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/audio/sampman_oal.cpp

2021-09-02 21:00:15 +03:00

..

animation

modelinfo bits

2021-08-24 19:16:17 +02:00

audio

Merge branch 'miami' into lcs

2021-09-02 21:00:15 +03:00

buildings

Pool fixes

2021-06-26 00:27:20 +03:00

collision

Merge branch 'miami' into lcs

2021-08-11 09:36:58 +03:00

control

script revision p2

2021-08-30 02:46:28 +03:00

core

merge

2021-08-29 19:40:10 +03:00

entities

lcs specific hack

2021-08-07 20:03:45 +03:00

extras

fix opengl; update librw

2021-08-17 12:58:39 +02:00

fakerw

Merge branch 'miami' into lcs

2021-08-11 09:36:58 +03:00

leeds

fix compile

2021-08-30 11:44:11 +03:00

math

work on CAutomobile

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

modelinfo

script revision p2

2021-08-30 02:46:28 +03:00

objects

Merge branch 'miami' into lcs

2021-07-12 04:13:22 +03:00

peds

merge

2021-08-29 19:40:10 +03:00

renderer

Merge branch 'miami' into lcs

2021-09-01 17:09:12 +03:00

rw

Merge remote-tracking branch 'aap/lcs' into lcs

2021-08-12 11:45:25 +03:00

save

Merge branch 'miami' into lcs

2021-08-11 09:36:58 +03:00

skel

Merge branch 'miami' into lcs

2021-08-19 11:47:03 +03:00

text

revision

2021-08-23 11:00:09 +03:00

vehicles

merge

2021-08-29 19:40:10 +03:00

weapons

Fix impossible bullets & turn speed on heavy guns

2021-08-16 21:06:06 +03:00

CMakeLists.txt

Merge branch 'miami' into lcs

2021-08-19 11:47:03 +03:00