Sergeanur
1558788df1
Fix IsSphereVisible calls
2021-06-24 21:45:48 +03:00
aap
e014bb5359
CEntity done; C(Vu)Vector fixes and cleanup
2021-06-24 21:45:21 +03:00
majestic
f34365dfc0
some fixes for CPed
2021-06-24 21:44:40 +03:00
Sergeanur
1fa0116f5f
Use bool8 in audio code
2021-06-24 21:44:36 +03:00
Sergeanur
c7821635fd
Wait states ported (scripted animations)
2021-06-24 21:42:10 +03:00
Sergeanur
fad64667a7
Fix some timer calls
2021-06-24 21:34:33 +03:00
Sergeanur
f2c8522daa
Fix IsSphereVisible calls
2021-06-24 21:34:33 +03:00
aap
93e9929925
CEntity and C(Vu)Vector fixes and cleanup
2021-06-24 21:34:33 +03:00
majestic
42e655b4cc
some fixes for CPed
2021-06-24 21:34:32 +03:00
Sergeanur
5bcdb933a7
Use bool8 in audio code
2021-06-24 21:34:32 +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
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
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
Sergeanur
519218572a
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# src/modelinfo/PedModelInfo.cpp
2021-04-09 04:31:46 +03:00
erorcun
62b8f0f553
Pool fixes + peds not forming circle fix
2021-03-06 19:28:59 +03:00
erorcun
97008905b6
Fix FPEs
2021-03-02 03:38:41 +03:00
erorcun
a311f643f9
Fixes
2021-02-28 15:50:51 +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
Nikolay Korolev
7c74c01741
fixed attractors
2021-02-11 13:35:56 +03:00
erorcun
775db94a96
Ped jump teleport/kill fix
2021-02-10 15:26:42 +03:00
erorcun
b464bb7fd4
Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanim
2021-02-08 13:23:19 +03:00
erorcun
2cad49940e
Use our synonyms for attack anims again
2021-02-07 21:13:54 +03:00
withmorten
4281730b16
fix UB and potential crashes when doing ice cream
2021-02-02 11:27:30 +01:00
erorcun
c4328afce7
Even more fixes & shorten quit screen
2021-01-29 19:16:26 +03:00
erorcun
810bad9fd8
Fix some UBs
2021-01-29 01:44:33 +03: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
9d4053419b
Merge pull request #977 from withmorten/miami-cw
...
make building with Codewarrior 7 possible
2021-01-25 14:06:53 +01:00
Sergeanur
0ad1426950
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# src/control/Script.cpp
2021-01-24 22:22:16 +02:00
erorcun
071e503856
Ped: car enter anim. fix
2021-01-24 20:12:36 +03: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
Nikolay Korolev
50cde66067
fix
2021-01-22 00:14:30 +03:00
Nikolay Korolev
061fd25c61
fixes
2021-01-19 02:38:02 +03:00
Nikolay Korolev
c09297997e
script full
2021-01-18 22:19:30 +03:00
Nikolay Korolev
e5af1edcb9
script until 1497
2021-01-17 16:02:19 +03:00
Nikolay Korolev
c28ed42617
script6
2021-01-16 18:16:35 +03:00
Nikolay Korolev
708d5831e4
Script5.cpp
2021-01-16 13:26:46 +03: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
aap
ac3ba5b4a6
more renames
2021-01-13 13:41:31 +01:00
aap
2804ad2363
anim velocity union
2021-01-13 13:06:38 +01:00
aap
e3a261d29c
rename m_vehEnterType -> m_vehDoor
2021-01-13 13:01:20 +01:00
Sergeanur
cb4b4d584c
Merge branch 'miami' into lcs
...
# Conflicts:
# src/control/Script.cpp
# src/control/Script3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
2021-01-12 12:55:07 +02:00
withmorten
4a8a1af885
fix CPed struct, GetWantedLevel
2021-01-11 18:43:04 +01:00
Nikolay Korolev
625376f0d3
500-599
2021-01-11 17:14:56 +03:00
Nikolay Korolev
53a99cb9ee
script2
2021-01-11 02:35:03 +03:00
aap
49d5c02d69
anims done. ped fight hacked to compile
2021-01-08 23:43:52 +01:00
Sergeanur
95260371cb
Train anims in enum
2021-01-08 18:25:35 +02:00
Sergeanur
c6c55d0130
Train anims in enum
2021-01-08 18:24:53 +02:00
aap
d820df0dbe
small cleanup
2021-01-08 01:44:19 +01:00
aap
ebdf08a514
first commit for LCS
2021-01-08 01:41:40 +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
aap
57677b7b55
slightly better variable name
2021-01-02 20:30:16 +01:00
Sergeanur
42e4a068bb
CVarConsole
2021-01-02 13:32:25 +02:00
Sergeanur
c3f49386ca
Fix wrong sound when bumping peds
2021-01-01 15:11:12 +02:00
Nikolay Korolev
9fd93e8e57
merge master to miami
2021-01-01 14:53:20 +03:00
Sergeanur
7eb96d5373
Add bike leftovers
2020-12-28 13:44:20 +02:00
erorcun
dc96a49dfd
Ped: WeaponInfo: little fixes and renamings
2020-12-28 04:02:24 +03:00
erorcun
7b2f17826a
Ped: Real weapon fix
2020-12-28 03:52:23 +03:00
erorcun
d3f2f4f6ac
Ped: WeaponInfo: little fixes and renamings
2020-12-28 03:25:26 +03:00
erorcun
904746054c
Fix peds running to see dead peds in water
2020-12-27 17:33:32 +03:00
erorcun
8b9e9a07a0
Fix peds running to see dead peds in water
2020-12-27 17:05:37 +03:00
erorcun
36e64dbd22
signed/unsigned fixes, and some other fixes
2020-12-27 05:23:37 +03:00
Sergeanur
c9c447e7a9
Weapon flags changed from bit fields to bit mask (R* vision)
2020-12-26 14:22:02 +02:00
Sergeanur
d459ef8820
Weapon flags changed from bit fields to bit mask (R* vision)
2020-12-26 14:21:45 +02:00
Sergeanur
99a3fe0a13
Fix not being able to hit lying peds with melee weapon
2020-12-26 10:04:26 +02:00
Sergeanur
e00b8a93bf
Fix use of strncmp
2020-12-25 15:18:48 +02:00
Sergeanur
b12eef1d56
Fix use of strncmp
2020-12-25 15:18:13 +02:00
erorcun
3b85457020
Merge pull request #894 from erorcun/miami
...
signed/unsigned fixes, and some other fixes
2020-12-25 12:56:31 +03:00
erorcun
a50244dc16
signed/unsigned fixes, and some other fixes
2020-12-25 12:54:41 +03:00
Sergeanur
6a2edcea46
Small type use fixes
...
# Conflicts:
# src/audio/AudioLogic.cpp
# src/control/Garages.cpp
# src/vehicles/Cranes.cpp
2020-12-25 09:03:13 +02:00
Sergeanur
de31bdc89f
Small type use fixes
2020-12-25 08:59:32 +02:00
Nikolay Korolev
8cc3f867a6
fixed double explosion
2020-12-24 17:44:59 +03:00
aap
309a4613a4
option for PC controls
2020-12-21 20:48:40 +01:00
aap
88b0134e72
option for PC controls
2020-12-21 20:48:28 +01:00
aap
f251803f55
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-12-21 12:34:36 +01:00
aap
fb97335d9f
push/pop memids
2020-12-21 12:34:29 +01:00
erorcun
6b33765891
Car entering cancel test
2020-12-21 02:44:12 +03:00
erorcun
05fb47bdb0
Fix wrong call on free cam (now it's faster)
2020-12-21 02:36:09 +03:00
erorcun
9b9545b92a
Car entering cancel test
2020-12-21 02:06:00 +03:00
erorcun
26aed6611e
fix auto duck cancel bug
2020-12-21 01:15:40 +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
aap
c17ccc50ab
get rid of all PED_SKIN defines
2020-12-18 17:27:18 +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
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
8f2abc6750
fix
2020-12-15 05:11:45 +02:00
Sergeanur
f76dfaee82
Use SetPedState
2020-12-15 05:11:02 +02:00
Sergeanur
e970e5f246
Use SetMoveState
2020-12-15 04:25:12 +02:00