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
|
776e8ff2ee
|
Fix some timer calls
|
2021-06-24 21:45:48 +03:00 |
|
Sergeanur
|
fad64667a7
|
Fix some timer calls
|
2021-06-24 21:34:33 +03:00 |
|
Sergeanur
|
fdb6428c6b
|
Merge branch 'miami' into lcs
# Conflicts:
# src/audio/AudioLogic.cpp
|
2021-05-12 03:29:36 +03:00 |
|
Sergeanur
|
2fc431d1bb
|
Complete sfx enum, rename some sounds + fixes of missing ped comments
|
2021-05-12 03:26: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 |
|
erorcun
|
2cad49940e
|
Use our synonyms for attack anims again
|
2021-02-07 21:13:54 +03:00 |
|
Sergeanur
|
97351ad2c2
|
Use original animation names from VCS
|
2021-01-27 18:50:24 +02: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 |
|
aap
|
49d5c02d69
|
anims done. ped fight hacked to compile
|
2021-01-08 23:43:52 +01:00 |
|
Nikolay Korolev
|
2d072325ad
|
fix
|
2021-01-04 21:03:19 +03:00 |
|
aap
|
6579645934
|
Merge pull request #916 from Sergeanur/VC/VarConsole
CVarConsole
|
2021-01-03 17:01:17 +01:00 |
|
erorcun
|
c4479a0185
|
Ped: PlayerPed: fixes
|
2021-01-03 17:33:50 +03:00 |
|
Sergeanur
|
42e4a068bb
|
CVarConsole
|
2021-01-02 13:32:25 +02: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 |
|
aap
|
88b0134e72
|
option for PC controls
|
2020-12-21 20:48:28 +01:00 |
|
erorcun
|
05fb47bdb0
|
Fix wrong call on free cam (now it's faster)
|
2020-12-21 02:36:09 +03:00 |
|
erorcun
|
ca4602d788
|
Fix free cam aiming 2
|
2020-12-20 21:53:06 +03:00 |
|
Nikolay Korolev
|
8d1996833b
|
merge attempt
|
2020-12-19 03:21:04 +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 |
|
Sergeanur
|
e9a5670348
|
PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes
|
2020-12-18 02:57:54 +02:00 |
|
erorcun
|
12d16ddc06
|
Fixes and style changes
|
2020-12-16 23:28:25 +03:00 |
|
Sergeanur
|
f76dfaee82
|
Use SetPedState
|
2020-12-15 05:11:02 +02:00 |
|
Sergeanur
|
ac95138c18
|
More fixes
|
2020-12-15 04:16:29 +02:00 |
|
Sergeanur
|
f42a01f653
|
CPed::SetWeaponLockOnTarget
|
2020-12-14 09:47:07 +02:00 |
|
erorcun
|
3038fba9ca
|
Sync Frontend, Peds with miami 2
|
2020-12-12 18:20:21 +03:00 |
|
erorcun
|
bd8b907d13
|
PlayerPed and "Redefine controls" menu done, fixes
|
2020-12-02 14:21:46 +03:00 |
|
aap
|
8ab0d25b4a
|
CPed review, part 1
|
2020-11-13 13:14:22 +01:00 |
|
Sergeanur
|
a2e0373d22
|
Pickups fix
|
2020-11-08 15:00:54 +02:00 |
|
Nikolay Korolev
|
720abca826
|
finished save/load
|
2020-10-17 20:45:07 +03:00 |
|
Nikolay Korolev
|
1195f3db7b
|
saves part 1
|
2020-10-17 18:50:16 +03:00 |
|
eray orçunus
|
980dd1b5a1
|
2 new opcodes
|
2020-08-16 17:10:59 +03:00 |
|
eray orçunus
|
f40f44b14e
|
Peds, Hud, CFO 1/2, fixes - including zone names
|
2020-07-22 15:19:22 +03:00 |
|
eray orçunus
|
67a3c7d2ee
|
VC fighting, Peds, many fixes including ghost bikes
|
2020-07-09 17:01:07 +03:00 |
|
eray orçunus
|
15548758ac
|
Bettah car enter canceling, fix CFO crash, ped objs. renaming
|
2020-07-03 16:51:33 +03:00 |
|
eray orçunus
|
f3ed6659c3
|
CWanted, anim fix, ped objs renaming, remove III beta features
|
2020-06-22 04:20:56 +03:00 |
|
eray orçunus
|
cc60ad1946
|
ducking & anim fix
|
2020-06-20 20:26:27 +03:00 |
|
eray orçunus
|
2d2833f2e4
|
more weapon fixes
|
2020-06-20 17:30:28 +03:00 |
|
eray orçunus
|
0625954bb7
|
Ducking, shooting vehicle occupants and weapon fixes
|
2020-06-20 16:23:32 +03:00 |
|
eray orçunus
|
c4e129509b
|
Peds & fixes continues
|
2020-06-15 23:43:20 +03:00 |
|
Sergeanur
|
1c01899799
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Garages.cpp
# src/core/Frontend.cpp
# src/peds/PlayerPed.cpp
# src/render/Hud.cpp
# src/vehicles/Train.cpp
|
2020-06-07 04:15:10 +03:00 |
|
Nikolay Korolev
|
3f26250d73
|
fixing some uninitialized stuff
|
2020-06-06 13:31:09 +03:00 |
|
eray orçunus
|
016ebc0b00
|
fixes, mostly from miami
|
2020-06-04 06:03:12 +03:00 |
|
eray orçunus
|
5dc410a999
|
Peds, eSound and PedState enum, fixes
|
2020-06-03 17:01:11 +03:00 |
|
eray orçunus
|
d930a25d94
|
DrawStandardMenus, VC menu array and minor fixes
|
2020-06-01 18:32:34 +03:00 |
|
eray orçunus
|
529cec5653
|
R to freeroam, idle anims, weapon and cam enum fix
|
2020-05-29 22:05:33 +03:00 |
|