mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-26 22:13:43 +00:00
Code Issues Projects Releases Wiki Activity
3969 commits 3 branches 0 tags 63 MiB
Commit graph

158 commits

Author SHA1 Message Date
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
b508458f37
small fix 2020-11-16 15:13:30 +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
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
eray orçunus
f3ed6659c3 CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
Nikolay Korolev
3900366a6b debug fix 2020-06-12 22:39:33 +03:00
Nikolay Korolev
17dd26e1ca heli AI fix 2020-06-12 22:38:37 +03:00
Nikolay Korolev
2de3c6d67b some fixes to heli AI (not all yet) 2020-06-08 02:34:53 +03:00
Nikolay Korolev
b498ad800c Merge remote-tracking branch 'upstream/miami' into miami 2020-06-08 02:04:58 +03:00
Nikolay Korolev
d48749f797 fixed attached ped 2020-06-08 02:04:37 +03:00
eray orçunus
94e9101ce0 more fixes 2020-06-08 01:51:11 +03:00
Nikolay Korolev
af564d865c fixes 2020-06-08 01:16:21 +03:00
eray orçunus
a77b181e32 CarCtrl fixes 2020-06-08 00:59:43 +03:00
Nikolay Korolev
d325a3d247 basic bike support in traffic, script and car gen; some heli AI 2020-06-05 11:22:15 +03:00
Sergeanur
0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
 2020-05-26 17:24:47 +03:00
Nikolay Korolev
38d2854226 fixed FIX_BUGS 2020-05-26 00:18:04 +03:00
aap
7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
Nikolay Korolev
cda3752838 comments 2020-05-24 13:48:17 +03:00
Nikolay Korolev
607175f02a set pieces 2020-05-23 20:06:52 +03:00
Nikolay Korolev
0085ed894f script revision 2020-05-20 23:47:44 +03:00
Nikolay Korolev
a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00
Nikolay Korolev
e3291b0cb1 gangs, script and replay fixes 2020-05-16 17:00:40 +03:00
Sergeanur
24875f34d0 Merge branch 'master' into miami 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
 2020-05-14 17:05:42 +03:00
Nikolay Korolev
509d57edcb car control and cranes fixes 2020-05-13 13:29:17 +03:00
Sergeanur
7c2b9478d5 Merge branch 'master' into miami 
# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
 2020-05-13 00:55:52 +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
Nikolay Korolev
8fae2dcc26 garages + script 2020-05-11 21:04:35 +03:00
eray orçunus
8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00