mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-18 04:49:22 +00:00
Code Issues Projects Releases Wiki Activity
5432 commits 3 branches 0 tags 63 MiB
Commit graph

634 commits

Author SHA1 Message Date
Nikolay Korolev
8e2ed40f66 small revision 2021-08-16 01:03:08 +03:00
Sergeanur
ec22576e49 Merge remote-tracking branch 'aap/lcs' into lcs 
# Conflicts:
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
 2021-08-12 11:45:25 +03:00
Nikolay Korolev
cb35f78511 lil fix 2021-08-12 01:30:26 +03:00
Sergeanur
2c79080e1b Merge branch 'miami' into lcs 
# Conflicts:
#	src/core/Radar.cpp
#	src/core/Radar.h
 2021-08-11 09:36:58 +03:00
Sergeanur
d7a28c4d2b Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls 2021-08-11 08:35:01 +03:00
Nikolay Korolev
c851d9a6ba Merge branch 'miami' into lcs 2021-08-09 00:08:42 +03:00
Barracuda6
42ad9c4378 Comment out text following #endif 2021-08-08 18:09:56 +03:00
Nikolay Korolev
668311a444 Merge branch 'master' into miami 2021-08-08 15:44:18 +03:00
Nikolay Korolev
15f770531c fixed tab 2021-08-08 15:42:44 +03:00
Nikolay Korolev
88b4c7b50b merge 2021-08-08 15:34:02 +03:00
Nikolay Korolev
9cc1201892 merge 2021-08-08 13:38:21 +03:00
aap
621f941ff7 CVehicle done 2021-08-04 13:56:29 +02:00
aap
bec1cbc1cb CVehicle fixes and cleanup 2021-08-04 13:54:26 +02:00
aap
4f461bd7be CVehicle fixes and cleanup 2021-08-04 13:54:04 +02:00
aap
3f3e258d77 CVisibilityPlugins, CRenderer, some fixes 2021-07-29 19:59:34 +02:00
Nikolay Korolev
cb7f18f268 fix 2021-07-17 15:49:28 +03:00
Nikolay Korolev
91d958bf27 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-12 10:32:01 +03:00
Nikolay Korolev
bef07b6353 small changes 2021-07-12 10:31:48 +03:00
Sergeanur
55d30a11ec Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	src/audio/AudioManager.h
#	src/control/Garages.cpp
#	src/control/Garages.h
#	src/control/Script5.cpp
#	src/core/config.h
#	utils/gxt/american.txt
#	utils/gxt/spanish.txt
 2021-07-12 04:13:22 +03:00
erorcun
02e84b4b97
 		Merge pull request #1150 from withmorten/miami-saves 
miami: finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
 2021-07-12 01:07:32 +03:00
Nikolay Korolev
776d46aacb Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-11 10:23:59 +03:00
withmorten
011aafa043 finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES 2021-07-10 17:30:27 +02:00
withmorten
6f103a3b82 finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES 2021-07-10 02:06:43 +02:00
Sergeanur
71d1b46417 Merge branch 'miami' into lcs 
# Conflicts:
#	utils/gxt/german.txt
 2021-07-10 02:07:14 +03:00
withmorten
ffe199290b fix jittery cars at 15fps 2021-07-09 18:51:27 +02:00
withmorten
37b6d491e7 fix jittery cars at 15fps 2021-07-09 18:50:33 +02:00
Nikolay Korolev
10cc444482 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-07-02 11:28:46 +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
withmorten
cb3b3855b8 rename clamp macro to Clamp to fix compilation with g++11 2021-06-28 13:31:35 +02:00
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
withmorten
f3a931e1c9 Revert "Revert "Redo ReadSaveBuf + common.h cleanup"" 
This reverts commit af7573ddbe.
 2021-06-26 19:14:46 +02:00
erorcun
9b5caa190e Pool fixes 
Mostly for Linux
 2021-06-26 00:27:20 +03:00
erorcun
af7573ddbe Revert "Redo ReadSaveBuf + common.h cleanup" 
This reverts commit 2b67aba94c.
 2021-06-26 00:25:59 +03:00
Sergeanur
2b67aba94c Redo ReadSaveBuf + common.h cleanup 2021-06-25 19:03:51 +03:00
Nikolay Korolev
8a5afd0db2 sync 2021-06-25 10:15:19 +03:00
Sergeanur
1fa0116f5f Use bool8 in audio code 2021-06-24 21:44:36 +03:00
Sergeanur
5bcdb933a7 Use bool8 in audio code 2021-06-24 21:34:32 +03:00
erorcun
618d689dff Pool fixes + peds not forming circle fix 2021-06-24 21:34:28 +03:00
Sergeanur
786e101acf Use bool8 in audio code 2021-06-24 21:32:43 +03:00
Sergeanur
6537dfe7f1 Use some GetMatrix/SetMatrix logic based on SA + CutsceneHead fix 2021-06-24 21:32:43 +03:00
erorcun
8488dc791a Pointless fixes 2021-06-24 21:32:39 +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
Sergeanur
3596897961 Merge pull request 'Pool fixes + peds not forming circle fix' (#4) from erorcun/re3:miami into miami 
Reviewed-on: https://git.jacksmininetwork.co.uk/re/re3/pulls/4
 2021-05-18 04:33:47 +00:00
Sergeanur
8f54093de1 Merge branch 'miami' into lcs 
# Conflicts:
#	src/core/World.cpp
 2021-05-10 02:48:56 +03:00
Sergeanur
3dda658e42 Use some GetMatrix/SetMatrix logic based on SA 
# Conflicts:
#	src/control/Pickups.cpp
#	src/control/RoadBlocks.cpp
#	src/core/World.cpp
#	src/entities/Entity.cpp
#	src/objects/CutsceneHead.cpp
#	src/objects/Object.cpp
 2021-05-10 02:45:04 +03:00
Sergeanur
519218572a Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
 2021-04-09 04:31:46 +03:00
erorcun
62b8f0f553 Pool fixes + peds not forming circle fix 2021-03-06 19:28:59 +03:00
erorcun
a311f643f9 Fixes 2021-02-28 15:50:51 +03:00