Nikolay Korolev
|
e6b1a0691b
|
lcs bridge
|
2021-08-08 13:08:47 +03:00 |
|
Sergeanur
|
a481b900b9
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/CarCtrl.cpp
# src/modelinfo/MloModelInfo.cpp
# src/modelinfo/MloModelInfo.h
# src/renderer/Renderer.cpp
# src/rw/VisibilityPlugins.cpp
# src/rw/VisibilityPlugins.h
|
2021-07-31 20:43:52 +03:00 |
|
Sergeanur
|
835fa4e74b
|
Make cars and peds to not despawn when you look away
# Conflicts:
# src/control/CarCtrl.cpp
# src/core/config.h
# src/peds/Population.cpp
|
2021-07-31 20:32:13 +03:00 |
|
Sergeanur
|
138abb91f6
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/CarCtrl.cpp
# src/control/Script4.cpp
# src/core/Frontend.cpp
|
2021-06-30 21:26:36 +03:00 |
|
withmorten
|
d17d437de3
|
rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)
|
2021-06-28 13:57:05 +02:00 |
|
Sergeanur
|
3aac4ea62a
|
Fix sin & cos calls
|
2021-06-24 21:45:48 +03:00 |
|
Sergeanur
|
6e4a2947ea
|
Fix sin & cos calls
|
2021-06-24 21:34:33 +03:00 |
|
Sergeanur
|
f6910d35f7
|
Merge branch 'miami' into lcs
# Conflicts:
# README.md
# premake5.lua
# src/audio/MusicManager.cpp
# src/core/main.cpp
# src/core/re3.cpp
# src/extras/postfx.cpp
# src/render/Font.cpp
|
2021-02-26 11:07:32 +02:00 |
|
withmorten
|
60bc816af5
|
nil -> false
|
2021-02-19 16:32:25 +01:00 |
|
Sergeanur
|
e38467ef3a
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# premake5.lua
# src/animation/AnimManager.cpp
# src/animation/AnimationId.h
# src/audio/MusicManager.cpp
# src/audio/audio_enums.h
# src/control/Script7.cpp
# src/core/FileLoader.cpp
# src/core/re3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
# src/extras/postfx.cpp
# src/extras/shaders/colourfilterVC.frag
# src/extras/shaders/colourfilterVC_PS.hlsl
# src/extras/shaders/make_hlsl.cmd
# src/extras/shaders/obj/colourfilterVC_PS.cso
# src/extras/shaders/obj/colourfilterVC_PS.inc
# src/extras/shaders/obj/colourfilterVC_frag.inc
# src/peds/PedFight.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Particle.cpp
# src/render/WaterCannon.cpp
# src/skel/win/gtavc.ico
# src/vehicles/Automobile.cpp
# utils/gxt/american.txt
# utils/gxt/french.txt
# utils/gxt/german.txt
# utils/gxt/italian.txt
# utils/gxt/spanish.txt
|
2021-02-16 18:08:19 +02:00 |
|
Nikolay Korolev
|
09de511c37
|
fixed plane AI
|
2021-02-05 11:31:54 +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 |
|
withmorten
|
d1317f8fa6
|
m_nWantedLevel -> GetWantedLevel()
|
2021-01-22 00:20:51 +01:00 |
|
Nikolay Korolev
|
23831e38e6
|
sync
|
2021-01-20 21:14:12 +03:00 |
|
Sergeanur
|
cc94419a72
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/Script.cpp
# src/control/Script4.cpp
# src/render/Weather.cpp
# src/render/Weather.h
# src/vehicles/Automobile.cpp
|
2021-01-20 19:32:03 +02:00 |
|
Nikolay Korolev
|
4f36a1fb77
|
sync
|
2021-01-18 22:20:44 +03:00 |
|
withmorten
|
d5ce8b1ea3
|
add the bad crack "features" behind SECUROM define
|
2021-01-14 23:16:42 +01:00 |
|
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 |
|
Nikolay Korolev
|
2736c3a9d1
|
fix
|
2021-01-12 12:16:52 +03:00 |
|
Nikolay Korolev
|
c7052b3d6f
|
fuck
|
2021-01-11 20:51:18 +03:00 |
|
Nikolay Korolev
|
575845772f
|
Merge branch 'miami' into lcs-dev
|
2021-01-01 13:21:42 +03:00 |
|
Nikolay Korolev
|
8d1996833b
|
merge attempt
|
2020-12-19 03:21:04 +03:00 |
|
Nikolay Korolev
|
bfe382c315
|
better fix
|
2020-12-12 21:06:14 +03:00 |
|
Nikolay Korolev
|
229b8f304a
|
fixed a bug
|
2020-12-12 20:37:26 +03:00 |
|
Nikolay Korolev
|
82c40b73ca
|
fixed a bug
|
2020-12-12 20:35:17 +03:00 |
|
Nikolay Korolev
|
016ff5b4aa
|
sync with upstream
|
2020-12-08 12:00:24 +03:00 |
|
Sergeanur
|
b13b26b5fb
|
GenerateOneRandomCar cleanup
|
2020-12-08 03:33:56 +02:00 |
|
Sergeanur
|
aae4f3319f
|
Fixes
|
2020-12-08 03:29:08 +02:00 |
|
Nikolay Korolev
|
fe918d41c2
|
garages revision + some fixes
|
2020-12-06 19:30:51 +03:00 |
|
Nikolay Korolev
|
b9b9dabd75
|
lcs car ctrl 2
|
2020-11-16 22:20:56 +03:00 |
|
Nikolay
|
b508458f37
|
small fix
|
2020-11-16 15:13:30 +03:00 |
|
Nikolay Korolev
|
ed5a9d5dc1
|
Merge branch 'miami' into lcs-dev
|
2020-11-16 12:48:28 +03:00 |
|
Nikolay Korolev
|
15b7126243
|
small fix of fix
|
2020-11-16 12:28:20 +03:00 |
|
Nikolay Korolev
|
0ac621588e
|
small fix
|
2020-11-16 12:22:55 +03:00 |
|
Nikolay Korolev
|
7339ebce60
|
lcs car ctrl 1
|
2020-11-16 12:21:50 +03:00 |
|
Nikolay Korolev
|
26c6908d25
|
car AI revision
|
2020-11-14 14:21:56 +03:00 |
|
Nikolay Korolev
|
3048a77a05
|
fix
|
2020-11-13 16:02:06 +03:00 |
|
Nikolay Korolev
|
552f308e9e
|
sync with upstream
|
2020-10-11 12:58:11 +03:00 |
|
Nikolay Korolev
|
c4d4821327
|
Control updates
|
2020-10-11 12:56:33 +03:00 |
|
Sergeanur
|
f1bb09826d
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# gamefiles/TEXT/american.gxt
# premake5.lua
# src/audio/MusicManager.cpp
# src/control/Darkel.cpp
# src/control/Script.cpp
# src/core/FileLoader.cpp
# src/core/Frontend.cpp
# src/core/Game.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/re3.cpp
# src/extras/frontendoption.cpp
# src/extras/frontendoption.h
# src/render/Hud.cpp
# src/skel/glfw/glfw.cpp
# src/vehicles/CarGen.cpp
# src/vehicles/Vehicle.cpp
# src/weapons/WeaponInfo.cpp
# utils/gxt/american.txt
|
2020-10-11 01:18:08 +03:00 |
|
Nikolay Korolev
|
39678ba5ca
|
small fix
|
2020-10-03 16:16:46 +03:00 |
|
Sergeanur
|
38ec1bd50d
|
Move a bunch of math to cpp files + small fixes
|
2020-09-14 21:07:31 +03:00 |
|
Sergeanur
|
bbcf3fd7d2
|
CutsceneMgr done
|
2020-08-24 21:52:16 +03:00 |
|
Nikolay Korolev
|
0fd6fb1ff4
|
fixed a few embarassing mistakes
|
2020-08-23 12:27:24 +03:00 |
|
Sergeanur
|
dab6d6dd6d
|
Merge remote-tracking branch 'origin/miami' into miami
# Conflicts:
# src/core/config.h
|
2020-08-19 23:35:10 +03:00 |
|
Sergeanur
|
827b240078
|
Merge branch 'master' into miami
# Conflicts:
# gamefiles/TEXT/american.gxt
# src/control/Garages.cpp
# src/control/Record.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/re3.cpp
# src/modelinfo/ModelInfo.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# utils/gxt/american.txt
|
2020-08-19 23:34:33 +03:00 |
|
Jack Powell
|
f09abe9ec1
|
Added bug fix to fix mission related crashes
|
2020-08-18 17:14:27 +01:00 |
|
Nikolay Korolev
|
d303c33c2e
|
CarCtrl finished, minor Script things
|
2020-08-16 18:39:11 +03:00 |
|
eray orçunus
|
67a3c7d2ee
|
VC fighting, Peds, many fixes including ghost bikes
|
2020-07-09 17:01:07 +03:00 |
|