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 |
|
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 |
|
Sergeanur
|
519218572a
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/modelinfo/PedModelInfo.cpp
|
2021-04-09 04:31:46 +03:00 |
|
Sergeanur
|
c5303c2ea4
|
Fix muzzleflash rotation
|
2021-02-26 20:31:26 +02: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 |
|
aap
|
996772faf2
|
add debug render groups
|
2021-02-18 12:21:52 +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 |
|
Sergeanur
|
97351ad2c2
|
Use original animation names from VCS
|
2021-01-27 18:50:24 +02: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 |
|
aap
|
a202e67349
|
CPedModelInfo and CTempColModels
|
2021-01-24 17:14:16 +01: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 |
|
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 |
|
Fire-Head
|
8989b5ea39
|
Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs
|
2021-01-15 19:13:05 +03:00 |
|
withmorten
|
d5ce8b1ea3
|
add the bad crack "features" behind SECUROM define
|
2021-01-14 23:16:42 +01:00 |
|
aap
|
7994b80dcf
|
fixed weapon LOS check
|
2021-01-13 20:10:04 +01:00 |
|
Fire-Head
|
3648ef4687
|
lcs particle
|
2021-01-13 00:07:24 +03:00 |
|
shfil
|
d11325cf0f
|
Fix UB in ProjectileInfo.cpp
|
2020-12-31 16:34:50 +01:00 |
|
aap
|
d89d3db126
|
fix UB
|
2020-12-31 16:14:51 +01:00 |
|
erorcun
|
d3f2f4f6ac
|
Ped: WeaponInfo: little fixes and renamings
|
2020-12-28 03:25:26 +03:00 |
|
Sergeanur
|
c9c447e7a9
|
Weapon flags changed from bit fields to bit mask (R* vision)
|
2020-12-26 14:22:02 +02:00 |
|
erorcun
|
a50244dc16
|
signed/unsigned fixes, and some other fixes
|
2020-12-25 12:54:41 +03:00 |
|
Sergeanur
|
cfda5eb148
|
PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes
|
2020-12-18 02:58:09 +02:00 |
|
Nikolay Korolev
|
016ff5b4aa
|
sync with upstream
|
2020-12-08 12:00:24 +03: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 |
|
erorcun
|
774aa1570f
|
Merge pull request #853 from erorcun/miami
PlayerPed and "Redefine controls" menu done, fixes
|
2020-12-02 14:35:06 +03:00 |
|
erorcun
|
bd8b907d13
|
PlayerPed and "Redefine controls" menu done, fixes
|
2020-12-02 14:21:46 +03:00 |
|
Sergeanur
|
43d5831394
|
cAudioManager::ProcessPedOneShots + fixes
|
2020-12-01 23:38:36 +02:00 |
|
Sergeanur
|
164f16c85b
|
Some TODOs done in Peds code
|
2020-11-25 19:39:57 +02:00 |
|
Sergeanur
|
fe40f65703
|
Reorganize CPed functions into their original cpp files
|
2020-11-20 01:18:37 +02:00 |
|
aap
|
90b624a3e0
|
Merge pull request #812 from Nick007J/miami
CWorld done + top gear fix
|
2020-11-12 11:40:19 +01:00 |
|
aap
|
0115b0827b
|
fix wrong blend mode (original bug)
|
2020-11-11 19:10:22 +01:00 |
|
Nikolay Korolev
|
ef2089cafb
|
CWorld done
|
2020-11-11 00:08:32 +03:00 |
|
majestic
|
6a89fe401a
|
Fluff done, FireInstantHit fix
|
2020-10-23 07:51:24 -07:00 |
|
Sergeanur
|
0d20f1c364
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/control/RoadBlocks.cpp
# src/entities/Entity.h
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/render/Renderer.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/CarGen.cpp
# src/weapons/BulletInfo.cpp
# src/weapons/Weapon.cpp
|
2020-10-18 17:15:49 +03:00 |
|
Sergeanur
|
b91f6a4550
|
Setter for bIsStatic (became virtual in SA)
|
2020-10-18 16:40:06 +03:00 |
|
Nikolay Korolev
|
c4d4821327
|
Control updates
|
2020-10-11 12:56:33 +03:00 |
|
eray orçunus
|
570ccb7db1
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into new
|
2020-10-08 22:45:37 +03:00 |
|
erorcun
|
b97f86deea
|
Merge pull request #750 from erorcun/miami
Pad, BulletInfo, ProjectileInfo, fixes
|
2020-10-08 21:39:11 +03:00 |
|
eray orçunus
|
fec01aeff1
|
Fix some sanitizer errors, improve POSIX streamer
|
2020-10-08 17:58:18 +03:00 |
|
eray orçunus
|
da39624f1c
|
Pad, BulletInfo, ProjectileInfo, fixes
|
2020-10-08 00:26:24 +03:00 |
|
Roman Masanin
|
a6a1de5006
|
rename var
|
2020-10-05 19:05:13 +03:00 |
|
Roman Masanin
|
4fd93fea51
|
fix mistakes
|
2020-10-05 17:24:57 +03:00 |
|
Roman Masanin
|
e3273d7268
|
CExplosion done
|
2020-10-05 16:14:48 +03:00 |
|