Sergeanur
|
acdc52116e
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/RpAnimBlend.cpp
# src/audio/oal/stream.cpp
# src/audio/sampman.h
# src/control/Pickups.cpp
# src/core/Collision.cpp
# src/core/Collision.h
# src/core/FileLoader.cpp
# src/core/FileMgr.cpp
# src/core/FileMgr.h
# src/core/Streaming.cpp
# src/core/Streaming.h
# src/core/SurfaceTable.h
# src/modelinfo/VehicleModelInfo.h
# src/peds/Ped.cpp
# src/rw/RwHelper.cpp
# src/rw/RwHelper.h
# src/skel/glfw/glfw.cpp
# src/skel/platform.h
# src/text/Text.cpp
# src/text/Text.h
# src/vehicles/CarGen.cpp
# src/vehicles/Heli.cpp
|
2020-07-29 15:34:57 +03:00 |
|
Sergeanur
|
581cb5edfa
|
The real pickup reflection fix
|
2020-07-29 14:56:06 +03:00 |
|
Nikolay Korolev
|
c1c163d78c
|
game logic
|
2020-05-31 20:59:01 +03:00 |
|
eray orçunus
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
Sergeanur
|
599164006a
|
Remove patches
|
2020-04-17 16:31:11 +03:00 |
|
Fire-Head
|
a4922d5cb7
|
rem refs
|
2020-04-17 08:54:14 +03:00 |
|
Sergeanur
|
db92864fe2
|
Fire and PlayerSkin fix
|
2020-03-29 08:51:30 +03:00 |
|
blingu
|
79822e3f7c
|
Update Fire.cpp
|
2020-03-26 17:11:04 +01:00 |
|
blingu
|
853b2d0c78
|
Update Fire.cpp
|
2020-03-26 17:05:01 +01:00 |
|
blingu
|
edc92a7bcc
|
Update Fire.cpp
|
2020-03-26 17:00:58 +01:00 |
|
blingu
|
a66db9efcb
|
Update Fire.cpp
|
2020-03-25 23:01:22 +01:00 |
|
blingu
|
09af0bcaf8
|
Update Fire.cpp
|
2020-03-25 22:54:14 +01:00 |
|
blingu
|
c3841fe5b4
|
m_snTimeInMilliseconds to GetTimeInMilliseconds()
|
2020-03-25 21:24:32 +01:00 |
|
blingu
|
96802f9b95
|
Update Fire.cpp
|
2020-03-25 21:13:06 +01:00 |
|
blingu
|
e22ce9404c
|
Update Fire.cpp
|
2020-03-25 21:07:07 +01:00 |
|
blingu
|
ea9e45fcda
|
Update Fire.cpp
|
2020-03-25 21:00:38 +01:00 |
|
blingu
|
c03bae46ea
|
Update Fire.cpp
|
2020-03-24 18:12:53 +01:00 |
|
Nikolay Korolev
|
402ecd6305
|
fix merge with upstream
|
2020-01-01 02:55:00 +03:00 |
|
Nikolay Korolev
|
5b0cf80a76
|
merge with upstream
|
2020-01-01 02:42:00 +03:00 |
|
Nikolay Korolev
|
80453d3f4d
|
some not fully tested stuff
|
2020-01-01 02:35:54 +03:00 |
|
eray orçunus
|
dad7782ff0
|
CPhone, CPlayerInfo, CFire, CWorld
|
2019-12-06 00:55:23 +03:00 |
|
nmzik
|
f56684d04e
|
CGame::Process() && CGame::ReloadIPLs
|
2019-10-19 01:23:40 +03:00 |
|
Nikolay Korolev
|
368ce0d4e5
|
CCarCtrl
|
2019-09-15 02:28:07 +03:00 |
|
aap
|
9a50a59a3c
|
CAutomobile::FireTruckControl and HydraulicControl
|
2019-07-26 14:27:13 +02:00 |
|
aap
|
a65dd41da7
|
yet more CAutomobile
|
2019-07-09 18:50:35 +02:00 |
|
aap
|
53023eb65b
|
the great reorganization
|
2019-07-07 13:09:11 +02:00 |
|