Sergeanur
|
800ab92960
|
Merge branch 'miami' into lcs
# Conflicts:
# premake5.lua
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.cpp
|
2021-08-25 09:07:41 +03:00 |
|
Sergeanur
|
9c40489589
|
Merge branch 'miami' into lcs
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.cpp
|
2021-08-20 14:34:11 +03:00 |
|
aap
|
aed313d81c
|
CAutomobile done
|
2021-08-20 10:33:02 +02:00 |
|
aap
|
c8623cfe09
|
CAutomobile fixes
|
2021-08-20 10:30:31 +02:00 |
|
Sergeanur
|
a9798d0645
|
Fix police yelling from empty or destroyed boats
|
2021-08-19 12:03:27 +03:00 |
|
aap
|
7374fbf54c
|
fixed car handling!!!!!!!
|
2021-08-17 09:46:11 +02:00 |
|
Sergeanur
|
d7e764d519
|
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/AudioLogic.cpp
# src/core/config.h
# 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-08-16 10:09:39 +03:00 |
|
aap
|
77f692c669
|
some CAutomobile fixes
|
2021-08-16 00:26:01 +02:00 |
|
aap
|
f4894952fc
|
Merge branch 'lcs' of github.com:GTAmodding/re3 into lcs
|
2021-08-16 00:25:14 +02:00 |
|
aap
|
2f92ccecb1
|
work on CAutomobile
|
2021-08-16 00:19:09 +02:00 |
|
Nikolay Korolev
|
8e2ed40f66
|
small revision
|
2021-08-16 01:03:08 +03:00 |
|
Nikolay Korolev
|
eadf0496bf
|
fixed heli buoyancy
|
2021-08-14 23:31:32 +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 |
|