Sergeanur
19dd95a1cb
Merge branch 'miami' into lcs
...
* miami:
Pool fixes + peds not forming circle fix
2021-05-18 08:12:47 +03:00
erorcun
62b8f0f553
Pool fixes + peds not forming circle fix
2021-03-06 19:28:59 +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
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
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
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
Nikolay Korolev
4f36a1fb77
sync
2021-01-18 22:20:44 +03:00
Nikolay Korolev
4703ec5164
sync
2021-01-17 16:03:37 +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
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
erorcun
c4479a0185
Ped: PlayerPed: fixes
2021-01-03 17:33:50 +03:00
Sergeanur
c9c447e7a9
Weapon flags changed from bit fields to bit mask (R* vision)
2020-12-26 14:22:02 +02: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
ac95138c18
More fixes
2020-12-15 04:16:29 +02:00
Sergeanur
f42a01f653
CPed::SetWeaponLockOnTarget
2020-12-14 09:47:07 +02:00
withmorten
4c0744260d
uint8 enums fixed
2020-12-07 01:59:17 +01:00
withmorten
912e71be53
int8 enums fixed
2020-12-07 01:30:38 +01:00
withmorten
e6a7a9353c
uint32 enums fixed
2020-12-07 01:20:14 +01:00
withmorten
9e2ac26a1d
uint32 enums fixed
2020-12-07 01:04:23 +01:00
withmorten
afdf8c25a0
int8 enums fixed
2020-12-07 00:56:12 +01:00
withmorten
4696e3f9c8
uint8 enums fixed
2020-12-07 00:36:40 +01:00
erorcun
ab3e810a95
AnimViewer done, comment cleanup
2020-12-03 05:22:58 +03:00
erorcun
bd8b907d13
PlayerPed and "Redefine controls" menu done, fixes
2020-12-02 14:21:46 +03:00
Sergeanur
fe40f65703
Reorganize CPed functions into their original cpp files
2020-11-20 01:18:37 +02:00
Sergeanur
9e45feb4fa
Reorganize CPed functions into their original cpp files
2020-11-19 21:12:20 +02:00
aap
b82b79fa11
CPed review part2; and reverting some stylistic changes
2020-11-16 09:57:33 +01:00
aap
257f45c3c3
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-11-13 13:14:56 +01:00
aap
8ab0d25b4a
CPed review, part 1
2020-11-13 13:14:22 +01:00
Nikolay Korolev
2e915780aa
some fixes
2020-11-13 13:19:54 +03:00
Sergeanur
7ede8685ec
Ped comments fixes
2020-11-07 14:39:53 +02:00
Nikolay Korolev
5edd9e75da
finished script and replay
2020-11-01 18:21:05 +03:00
eray orçunus
da39624f1c
Pad, BulletInfo, ProjectileInfo, fixes
2020-10-08 00:26:24 +03:00
eray orçunus
f71953077d
Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes
2020-09-30 02:41:42 +03:00
eray orçunus
dbc458a4d7
CPed and CCivilianPed funcs done
2020-09-24 01:54:37 +03:00
erorcun
e9a7ab789d
Merge pull request #701 from erorcun/miami
...
Peds objectives and wait states done, fixes
2020-09-10 03:21:23 +03:00
eray orçunus
93d77f340d
Fixes from miami
2020-09-10 03:14:50 +03:00
eray orçunus
3f402d23ff
Peds objectives and wait states done, fixes
2020-09-05 20:28:50 +03:00
majestic
9f43b1988b
cheats, fixes, cosmetic changes
2020-09-01 09:42:17 -07:00
