Sergeanur
|
d0f5464200
|
Merge branch 'master' into miami
# Conflicts:
# src/control/CarAI.cpp
# src/control/Phones.cpp
# src/control/Phones.h
# src/control/Record.cpp
# src/control/Restart.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.h
# src/core/Streaming.cpp
# src/core/TempColModels.cpp
# src/core/Wanted.cpp
# src/core/Zones.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/entities/Entity.cpp
# src/entities/Physical.cpp
# src/extras/frontendoption.cpp
# src/modelinfo/ModelInfo.cpp
# src/modelinfo/PedModelInfo.cpp
# src/peds/CivilianPed.cpp
# src/peds/CopPed.cpp
# src/peds/EmergencyPed.cpp
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/peds/Population.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# src/skel/win/win.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Boat.cpp
# src/vehicles/Boat.h
# src/vehicles/Vehicle.cpp
|
2020-07-13 18:10:17 +03:00 |
|
eray orçunus
|
15548758ac
|
Bettah car enter canceling, fix CFO crash, ped objs. renaming
|
2020-07-03 16:51:33 +03:00 |
|
erorcun
|
eda50bc32b
|
Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)
|
2020-07-01 15:28:43 +03:00 |
|
Sergeanur
|
b26eec5daf
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/soundlist.h
# src/control/Script.cpp
# src/control/ScriptCommands.h
# src/core/Cam.cpp
# src/core/Camera.cpp
# src/core/Camera.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/Pad.cpp
# src/core/Pad.h
# src/core/config.h
# src/entities/Entity.cpp
# src/render/Credits.cpp
# src/render/Fluff.cpp
# src/render/Hud.cpp
# src/render/MBlur.cpp
# src/render/Timecycle.cpp
# src/skel/glfw/glfw.cpp
# src/skel/win/win.cpp
# src/text/Text.cpp
|
2020-06-29 12:56:50 +03:00 |
|
eray orçunus
|
f3ed6659c3
|
CWanted, anim fix, ped objs renaming, remove III beta features
|
2020-06-22 04:20:56 +03:00 |
|
Nikolay Korolev
|
7a71a47f74
|
updated player control names
|
2020-06-21 16:00:17 +03:00 |
|
Sergeanur
|
ec1b91e527
|
Remove unused audio enum
|
2020-05-16 05:06:51 +03:00 |
|
eray orçunus
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
Sergeanur
|
e9b334d7bf
|
More use of GetModelIndex
|
2020-05-05 14:48:35 +03:00 |
|
Sergeanur
|
d23b2c423e
|
SetPosition, part 1
|
2020-05-02 15:13:09 +03:00 |
|
Nikolay Korolev
|
c4cd45d47c
|
replays bug fix
|
2020-04-18 23:50:37 +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 |
|
eray orçunus
|
112685ebac
|
CCopPed done and #include cleanup
|
2020-03-28 18:52:25 +03:00 |
|
eray orçunus
|
dad7782ff0
|
CPhone, CPlayerInfo, CFire, CWorld
|
2019-12-06 00:55:23 +03:00 |
|
eray orçunus
|
680fe0f7e6
|
CCivilianPed done & restore peds running to phone
|
2019-11-26 02:35:05 +03:00 |
|
Sergeanur
|
4844b3a3f8
|
Merge pull request #246 from Sergeanur/Pools
Some CPool and CPools funcs, restoring original logic of pool lookup loops
|
2019-10-21 16:09:44 +03:00 |
|
nmzik
|
f56684d04e
|
CGame::Process() && CGame::ReloadIPLs
|
2019-10-19 01:23:40 +03:00 |
|
Sergeanur
|
5b1ffb0912
|
Some CPool and CPools funcs, restoring original logic of pool lookup loops
|
2019-10-17 00:53:25 +03:00 |
|
Sergeanur
|
101192dd32
|
Added read/write template functions for save data, small Load/Save arguments unification
|
2019-10-08 23:07:11 +03:00 |
|
Nikolay Korolev
|
6fa6837baa
|
fixed phones
|
2019-07-28 15:49:42 +03:00 |
|
eray orçunus
|
8fd63e5ca6
|
Ped & fixes, including peds dive into danger fix
|
2019-07-25 23:37:50 +03:00 |
|
eray orçunus
|
2c138b2b77
|
Phone, World, Ped
|
2019-07-15 15:11:40 +03:00 |
|
eray orçunus
|
4f333d44a0
|
Fix CPhone crash, more functions
|
2019-07-10 23:18:22 +03:00 |
|
eray orçunus
|
86681c6f18
|
Phone start, ped spinning and cop car fix, and some love to CPed
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
|
2019-07-10 15:56:29 +03:00 |
|
aap
|
53023eb65b
|
the great reorganization
|
2019-07-07 13:09:11 +02:00 |
|