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 |
|
withmorten
|
6f103a3b82
|
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
|
2021-07-10 02:06:43 +02: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 |
|
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 |
|
withmorten
|
29fb996b00
|
make building with Codewarrior 7 possible
|
2021-01-24 17:08:34 +01:00 |
|
Sergeanur
|
904090cbb6
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/modelinfo/BaseModelInfo.cpp
|
2021-01-23 15:14:15 +02:00 |
|
erorcun
|
f85b5e99ed
|
Includes overhaul, fix some compiler warnings
|
2021-01-23 03:23:16 +03: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 |
|
withmorten
|
d1317f8fa6
|
m_nWantedLevel -> GetWantedLevel()
|
2021-01-22 00:20:51 +01:00 |
|
withmorten
|
b5c09965a9
|
some free cam fixes for controller
|
2021-01-18 20:10:13 +01:00 |
|
withmorten
|
df4e22e3d0
|
some free cam fixes for controller
|
2021-01-18 17:25:31 +01:00 |
|
aap
|
7a730384ef
|
Merge pull request #962 from aap/lcs
initial work on vehicles
|
2021-01-18 14:11:55 +01:00 |
|
aap
|
a672860c40
|
initial work on vehicles
|
2021-01-18 10:59:19 +01:00 |
|
Fire-Head
|
3e6016dc6e
|
Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs
|
2021-01-13 00:11:15 +03:00 |
|
Fire-Head
|
3648ef4687
|
lcs particle
|
2021-01-13 00:07:24 +03:00 |
|
aap
|
434bc01f0b
|
fix fix
|
2021-01-09 16:17:47 +01:00 |
|
aap
|
f6f0cb708e
|
boat fix
|
2021-01-09 16:13:38 +01: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 |
|
majestic
|
cd23695116
|
skimmer shadow
|
2020-11-30 23:52:35 -08:00 |
|
Sergeanur
|
8f5e60f787
|
Original enum name
|
2020-11-24 17:16:39 +02:00 |
|
aap
|
48d0653331
|
urgh, merge and changes to RW layer in one commit.
|
2020-11-11 09:38:33 +01:00 |
|
Filip Gawin
|
e24513d2ad
|
Sfx audio logic
|
2020-11-06 18:42:52 +01:00 |
|
aap
|
244b91ee80
|
fixed boats for new renderer
|
2020-11-04 16:22:15 +01:00 |
|
Sergeanur
|
db84afd263
|
Revert
|
2020-11-01 12:31:37 +02:00 |
|
Sergeanur
|
d370c2076d
|
Fix virtual SetModelIndex call in CBoat ctor
|
2020-11-01 09:20:37 +02:00 |
|
Nikolay Korolev
|
d7789661cd
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-10-18 17:30:51 +03: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
|
1195f3db7b
|
saves part 1
|
2020-10-17 18:50:16 +03:00 |
|
eray orçunus
|
da39624f1c
|
Pad, BulletInfo, ProjectileInfo, fixes
|
2020-10-08 00:26:24 +03:00 |
|
Nikolay Korolev
|
f7d5021ac5
|
VC replays
|
2020-09-26 21:10:23 +03:00 |
|
aap
|
a9a1bf5056
|
changed a sound enum
|
2020-08-20 13:21:08 +02:00 |
|
aap
|
7da4f7fc35
|
fixed sound enum
|
2020-08-20 13:20:48 +02:00 |
|
aap
|
e74b569115
|
CPlane done
|
2020-07-19 00:56:30 +02:00 |
|
Sergeanur
|
841fa5155c
|
Rename LEVEL_NONE to LEVEL_GENERIC
|
2020-07-13 17:43:09 +03:00 |
|
aap
|
2141247e08
|
CBoat and friends
|
2020-07-01 18:04:02 +02:00 |
|
aap
|
575f35f2c4
|
fixes to CBoat
|
2020-07-01 18:03:59 +02:00 |
|
erorcun
|
d322a8033e
|
Merge branch 'miami' into miami
|
2020-06-16 23:02:21 +03:00 |
|
Sergeanur
|
655eaa36ce
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/Script.cpp
# src/core/Cam.cpp
# src/core/Camera.cpp
# src/core/Camera.h
# src/render/Fluff.cpp
# src/render/Hud.cpp
|
2020-06-15 17:44:47 +03:00 |
|
majestic
|
015921522d
|
fixed condition in CBoat::ProcessControl and changed enum
|
2020-06-14 07:53:45 -07:00 |
|
aap
|
b77d044729
|
fixed boat wake
|
2020-06-14 09:50:00 +02:00 |
|
aap
|
5711159e68
|
CBike done
|
2020-06-07 00:01:59 +02:00 |
|
Fire-Head
|
63d0bdc863
|
VC Water
|
2020-05-27 21:50:01 +03:00 |
|
Fire-Head
|
6a32981ba5
|
VC CParticle done
|
2020-05-27 02:16:31 +03:00 |
|