Sergeanur 8697eebbc2 Merge branch 'miami' into VC/Pickups ...

# Conflicts:
#	src/control/Pickups.cpp

2020-10-18 17:17:11 +03:00

..

animation

VC replays

2020-09-26 21:10:23 +03:00

audio

Merge branch 'master' into miami

2020-10-18 17:15:49 +03:00

control

Merge branch 'miami' into VC/Pickups

2020-10-18 17:17:11 +03:00

core

Merge branch 'master' into miami

2020-10-18 17:15:49 +03:00

entities

Merge branch 'master' into miami

2020-10-18 17:15:49 +03:00

extras

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

2020-10-11 01:18:08 +03:00

fakerw

synch fakerw with reVC; update librw

2020-07-29 09:50:06 +02:00

math

Merge branch 'master' into miami

2020-10-18 17:15:49 +03:00

modelinfo

Partial Pickups

2020-10-17 08:23:01 +03:00

objects

Merge branch 'miami' into VC/Pickups

2020-10-18 17:17:11 +03:00

peds

Merge branch 'master' into miami

2020-10-18 17:15:49 +03:00

render

Merge branch 'master' into miami

2020-10-18 17:15:49 +03:00

rw

Radar, WaterCannon, win/glfw skels

2020-10-17 17:35:26 +03:00

save

Merge branch 'master' into VC/TextFinish

2020-10-11 10:34:47 +03:00

skel

Minor things

2020-10-18 13:53:17 +03:00

text

UnicodeMakeUpperCase move + arg fix

2020-10-11 10:39:04 +03:00

vehicles

Merge branch 'master' into miami

2020-10-18 17:15:49 +03:00

weapons

Merge branch 'master' into miami

2020-10-18 17:15:49 +03:00