Sergeanur cb4b4d584c Merge branch 'miami' into lcs ... # Conflicts: # src/control/Script.cpp # src/control/Script3.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp		2021-01-12 12:55:07 +02:00
..
animation	script	2021-01-09 20:33:21 +03:00
audio	anims done. ped fight hacked to compile	2021-01-08 23:43:52 +01:00
buildings	buildings directory	2020-12-20 12:40:59 +02:00
collision	sync with upstream	2021-01-07 18:38:40 +03:00
control	Merge branch 'miami' into lcs	2021-01-12 12:55:07 +02:00
core	Merge branch 'miami' into lcs	2021-01-12 12:55:07 +02:00
entities	streaming fixes	2021-01-09 11:43:58 +01:00
extras	some useless code	2021-01-11 20:20:08 +01:00
fakerw	Entity/Physical proof-read 1	2021-01-04 13:41:41 +03:00
leeds/base	Possibly fix linux build	2021-01-09 13:24:09 +02:00
math	merge master to miami	2021-01-01 14:53:20 +03:00
modelinfo	Remove fake firetruck ID	2021-01-09 13:43:09 +02:00
objects	Merge pull request #869 from Nick007J/miami	2020-12-09 09:55:50 +01:00
peds	Merge branch 'miami' into lcs	2021-01-12 12:55:07 +02:00
render	Merge branch 'miami' into lcs	2021-01-12 12:55:07 +02:00
rw	timecycle; some rendering	2021-01-08 13:34:49 +01:00
save	merge attempt	2020-12-19 03:21:04 +03:00
skel	Change window name	2021-01-09 14:21:46 +02:00
text	script	2021-01-09 20:33:21 +03:00
vehicles	Merge branch 'miami' into lcs	2021-01-12 12:55:07 +02:00
weapons	Fix UB in ProjectileInfo.cpp	2020-12-31 16:34:50 +01:00
CMakeLists.txt	fixed cmakelists	2020-12-19 16:21:33 +03:00