Nikolay Korolev
|
88b4c7b50b
|
merge
|
2021-08-08 15:34:02 +03:00 |
|
Sergeanur
|
f8297df9c5
|
Redo ReadSaveBuf + common.h cleanup
|
2021-06-28 05:12:54 +03:00 |
|
withmorten
|
f3a931e1c9
|
Revert "Revert "Redo ReadSaveBuf + common.h cleanup""
This reverts commit af7573ddbe38e0aaa485877e7ccb2e704b0f5a7f.
|
2021-06-26 19:14:46 +02:00 |
|
erorcun
|
af7573ddbe
|
Revert "Redo ReadSaveBuf + common.h cleanup"
This reverts commit 2b67aba94cb6448fb24c869559465eddf2bad069.
|
2021-06-26 00:25:59 +03:00 |
|
Sergeanur
|
2b67aba94c
|
Redo ReadSaveBuf + common.h cleanup
|
2021-06-25 19:03:51 +03:00 |
|
withmorten
|
feb993e751
|
get rid of most --MIAMI comments
|
2021-01-22 11:43:29 +01:00 |
|
Nikolay
|
2b53f267a7
|
one more fix
# Conflicts:
# src/control/Restart.cpp
|
2020-11-22 23:13:43 +02:00 |
|
Nikolay
|
6a6551f39b
|
small improvement
# Conflicts:
# src/control/Restart.cpp
|
2020-11-22 23:13:23 +02:00 |
|
Nikolay
|
222e7f56ff
|
one more fix
|
2020-11-22 02:31:52 +03:00 |
|
Nikolay
|
d24e1ee592
|
small improvement
|
2020-11-22 02:29:17 +03:00 |
|
Nikolay Korolev
|
c4d4821327
|
Control updates
|
2020-10-11 12:56:33 +03:00 |
|
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 |
|
Sergeanur
|
841fa5155c
|
Rename LEVEL_NONE to LEVEL_GENERIC
|
2020-07-13 17:43:09 +03:00 |
|
aap
|
e0568a19d5
|
new zone stuff
|
2020-05-06 12:23:57 +02:00 |
|
aap
|
68d3ea9c42
|
getting the vice city map to work
|
2020-05-05 23:27:43 +02:00 |
|
aap
|
702da55ec9
|
implemented most of vice city path system
|
2020-05-03 16:09:37 +02: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 |
|
aap
|
34349c4df2
|
normalized line endings to LF
|
2020-04-09 20:50:24 +02:00 |
|
Sergeanur
|
03833f9e11
|
Fixed iteration typo
|
2019-10-12 17:28:38 +03:00 |
|
Sergeanur
|
3768473cd6
|
Full CRestart
|
2019-10-11 01:54:08 +03:00 |
|
Sergeanur
|
69963cea68
|
Full CGameLogic
|
2019-10-08 17:13:23 +03:00 |
|
Nikolay Korolev
|
ebbcd92de2
|
RunningScript, part 4, plus some fixes
|
2019-08-03 16:01:13 +03:00 |
|