Sergeanur 6ad66fb2d7 Merge remote-tracking branch 'origin/master' into miami ...

# Conflicts:
#	src/render/Renderer.cpp

2020-05-06 19:32:57 +03:00

..

animation

SetPosition, part 1

2020-05-02 15:13:09 +03:00

audio

Merge branch 'master' into miami

2020-05-06 18:03:36 +03:00

control

CSphere and CBox for CColModel

2020-05-06 17:56:38 +02:00

core

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

2020-05-06 19:32:57 +03:00

entities

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

2020-05-06 19:32:57 +03:00

extras

implemented debugmenu shutdown

2020-05-01 17:31:29 +02:00

fakerw

updated librw

2020-05-06 09:24:12 +02:00

math

implemented most of streamed collisions and big buildings

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

modelinfo

CSphere and CBox for CColModel

2020-05-06 17:56:38 +02:00

objects

fixed object collision stuff at least somewhat

2020-05-06 17:17:07 +02:00

peds

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

2020-05-06 19:32:57 +03:00

render

IsStatic

2020-05-06 19:17:47 +03:00

rw

implemented most of timecycle and mblur

2020-05-06 00:53:26 +02:00

save

cleaned up MIAMI ifdefs

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

skel

reverting fuckup

2020-05-06 09:59:04 +02:00

text

Fix CMessages::InsertStringInString

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

vehicles

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

2020-05-06 19:32:57 +03:00

weapons

IsStatic

2020-05-06 19:17:47 +03:00