Sergeanur
|
eaebaa6db3
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/Script5.cpp
# src/entities/Entity.cpp
|
2021-06-28 05:16:21 +03:00 |
|
Sergeanur
|
f8297df9c5
|
Redo ReadSaveBuf + common.h cleanup
|
2021-06-28 05:12:54 +03:00 |
|
erorcun
|
618d689dff
|
Pool fixes + peds not forming circle fix
|
2021-06-24 21:34:28 +03:00 |
|
Sergeanur
|
19dd95a1cb
|
Merge branch 'miami' into lcs
* miami:
Pool fixes + peds not forming circle fix
|
2021-05-18 08:12:47 +03:00 |
|
erorcun
|
62b8f0f553
|
Pool fixes + peds not forming circle fix
|
2021-03-06 19:28:59 +03:00 |
|
Sergeanur
|
cea6b20c09
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/animation/CutsceneMgr.cpp
# src/control/CarCtrl.cpp
# src/control/Script.cpp
# src/control/Script2.cpp
# src/core/Frontend.cpp
# src/core/main.cpp
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/peds/PedAI.cpp
# src/text/Messages.cpp
# src/vehicles/Cranes.cpp
# src/vehicles/Transmission.cpp
|
2021-01-22 15:04:09 +02:00 |
|
withmorten
|
feb993e751
|
get rid of most --MIAMI comments
|
2021-01-22 11:43:29 +01:00 |
|
aap
|
ebdf08a514
|
first commit for LCS
|
2021-01-08 01:41:40 +01:00 |
|
erorcun
|
a50244dc16
|
signed/unsigned fixes, and some other fixes
|
2020-12-25 12:54:41 +03:00 |
|
Nikolay Korolev
|
55c9a81922
|
fixed zone bug
|
2020-11-12 17:32:16 +03:00 |
|
Sergeanur
|
6450fd2692
|
Fix zone saving on 64 bit
|
2020-10-12 22:54:46 +03:00 |
|
Sergeanur
|
dd039677a0
|
Zones saving and loading
|
2020-10-10 23:50:00 +03:00 |
|
aap
|
e0f6459674
|
stupid zone load fix
|
2020-08-30 00:57:00 +02:00 |
|
aap
|
56b80cb0ab
|
fixes to zones and vehicle comp rules
|
2020-08-24 17:21:45 +02:00 |
|
Sergeanur
|
7d8ffa9ebd
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/RoadBlocks.cpp
# src/core/Collision.h
# src/core/Pad.cpp
# src/core/SurfaceTable.h
# src/core/main.cpp
# src/core/re3.cpp
# src/peds/Population.cpp
# src/render/Fluff.cpp
# src/render/Shadows.cpp
# src/render/Shadows.h
# src/render/Sprite2d.cpp
# src/weapons/BulletInfo.cpp
|
2020-08-07 12:34:41 +03:00 |
|
eray orçunus
|
e14252914e
|
Squeeze performance option, minor fixes
Fixes are already in miami
|
2020-08-03 16:00:32 +03:00 |
|
eray orçunus
|
f40f44b14e
|
Peds, Hud, CFO 1/2, fixes - including zone names
|
2020-07-22 15:19:22 +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 |
|
nrb
|
d59862eb5e
|
fixed compiler errors
|
2020-05-24 17:27:12 +02:00 |
|
Nikolay Korolev
|
e967db4a3c
|
fixed annoying bug
|
2020-05-19 21:10:40 +03:00 |
|
Sergeanur
|
33dfaf7da1
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
|
2020-05-13 00:27:15 +03:00 |
|
Filip Gawin
|
c2ac6b3759
|
Fix linux warnings
|
2020-05-12 23:18:54 +02:00 |
|
eray orçunus
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
Nikolay Korolev
|
c11a20cb4f
|
zone info commands + fix
|
2020-05-08 16:16:46 +03:00 |
|
aap
|
c715569d1d
|
CBaseModelInfo done
|
2020-05-07 21:55:54 +02:00 |
|
aap
|
19b21cafcd
|
CZoneInfo mostly done; not its dependencies
|
2020-05-07 17:53:38 +02:00 |
|
Sergeanur
|
c0488d9ecf
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/Script.cpp
# src/core/FileLoader.cpp
# src/core/User.cpp
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/core/Zones.h
# src/entities/Entity.cpp
|
2020-05-06 14:10:52 +03:00 |
|
aap
|
e0568a19d5
|
new zone stuff
|
2020-05-06 12:23:57 +02:00 |
|
aap
|
cbfc45b3f7
|
some work on zones
|
2020-05-06 12:23:26 +02:00 |
|
aap
|
68d3ea9c42
|
getting the vice city map to work
|
2020-05-05 23:27:43 +02:00 |
|
Sergeanur
|
eadb5a16aa
|
Zones save/load
|
2020-04-18 12:24:44 +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 |
|
aap
|
e7c18fc17f
|
removed windows.h for most .cpps
|
2020-03-27 20:53:47 +01:00 |
|
aap
|
53023eb65b
|
the great reorganization
|
2019-07-07 13:09:11 +02:00 |
|