Nikolay Korolev
747705d430
lcs specific hack
2021-08-07 20:03:45 +03:00
aap
0338d4c393
CPhysical almost done
2021-08-02 20:05:39 +02:00
aap
3f3e258d77
CVisibilityPlugins, CRenderer, some fixes
2021-07-29 19:59:34 +02:00
Nikolay Korolev
91d958bf27
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-12 10:32:01 +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
erorcun
9f0a96ac89
Physical: division by zero fix
2021-07-10 23:27:00 +03:00
withmorten
6f103a3b82
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
2021-07-10 02:06:43 +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
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
Nikolay Korolev
8a5afd0db2
sync
2021-06-25 10:15:19 +03:00
Sergeanur
7e7a2b74cd
Fixes
2021-06-25 01:16:03 +03:00
aap
29d47da61e
CEntity and C(Vu)Vector fixes and cleanup
2021-06-24 21:45:45 +03:00
aap
e014bb5359
CEntity done; C(Vu)Vector fixes and cleanup
2021-06-24 21:45:21 +03:00
aap
93e9929925
CEntity and C(Vu)Vector fixes and cleanup
2021-06-24 21:34:33 +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
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
erorcun
62b8f0f553
Pool fixes + peds not forming circle fix
2021-03-06 19:28:59 +03:00
Nikolay Korolev
9b9ffc4b13
ferries
2021-02-07 23:29:49 +03:00
Sergeanur
9647901ba0
Merge branch 'miami' into lcs
...
# Conflicts:
# src/control/Script.h
# src/modelinfo/SimpleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.cpp
# src/rw/VisibilityPlugins.cpp
# src/rw/VisibilityPlugins.h
2021-01-25 19:35:03 +02:00
withmorten
29fb996b00
make building with Codewarrior 7 possible
2021-01-24 17:08:34 +01: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
c8236d0dd2
Merge pull request #976 from Fire-Head/lcs
...
Lcs pobj
2021-01-22 01:12:03 +01:00
Fire-Head
37b9ba5bd7
lcs pobj
2021-01-22 02:59:08 +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
Sergeanur
3b52b683e3
Sync matrix with master
2021-01-20 19:20:11 +02:00
aap
a672860c40
initial work on vehicles
2021-01-18 10:59:19 +01:00
aap
913a001375
vehicle fixes
2021-01-17 10:00:41 +01:00
Sergeanur
ff057838ec
Merge branch 'miami' into lcs
...
* miami:
Fix backface culling of cutscene objects
more renames
anim velocity union
rename m_vehEnterType -> m_vehDoor
Port cmake improvements to miami
some loose ends
move TODO to Readme
Fix build without FIX_BUGS, divide to 0 fixes
2021-01-13 14:56:25 +02:00
erorcun
542a5393ac
Fix build without FIX_BUGS, divide to 0 fixes
2021-01-13 03:08:50 +03:00
aap
225b8953fd
streaming fixes
2021-01-09 11:43:58 +01:00
Sergeanur
faa9e6441b
Use original names
2021-01-08 21:53:11 +02:00
Sergeanur
09c213738b
Fix CEntity::UpdateRwFrame
2021-01-04 22:27:51 +02:00
erorcun
22e8202d27
Entity/Physical proof-read 1
2021-01-04 13:41:41 +03:00
Sergeanur
b9e97ab79d
Reorder CEntity functions into their original order
2020-12-29 13:55:26 +02:00
Sergeanur
be92b57b54
buildings directory
...
# Conflicts:
# premake5.lua
2020-12-20 12:40:59 +02:00
Nikolay Korolev
8d1996833b
merge attempt
2020-12-19 03:21:04 +03:00
aap
c17ccc50ab
get rid of all PED_SKIN defines
2020-12-18 17:27:18 +01:00
aap
ccbbde549e
Merge pull request #869 from Nick007J/miami
...
garages revision + fixes
2020-12-09 09:55:50 +01:00
withmorten
4c0744260d
uint8 enums fixed
2020-12-07 01:59:17 +01:00
withmorten
4696e3f9c8
uint8 enums fixed
2020-12-07 00:36:40 +01:00
Nikolay Korolev
406f646949
pool stuff fix
2020-12-06 21:28:40 +03:00
aap
d5bc382cb5
GTA_VERSION define and some config.h cleanup
2020-11-29 21:29:48 +01:00
