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
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
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
erorcun
c4328afce7
Even more fixes & shorten quit screen
2021-01-29 19:16:26 +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
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
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
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
aap
ebdf08a514
first commit for LCS
2021-01-08 01:41:40 +01:00
Nikolay Korolev
9fd93e8e57
merge master to miami
2021-01-01 14:53:20 +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
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
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
erorcun
6b33765891
Car entering cancel test
2020-12-21 02:44:12 +03:00
erorcun
9b9545b92a
Car entering cancel test
2020-12-21 02:06:00 +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
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
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
Sergeanur
ac95138c18
More fixes
2020-12-15 04:16:29 +02:00
Sergeanur
ab3e258f19
SetPedState fixes
2020-12-15 03:25:05 +02:00
aap
4f3be49728
Merge pull request #868 from erorcun/miami
...
Frontend cleanup, .INI, CFO, scrollable pages
2020-12-12 10:43:06 +01:00
erorcun
b473adcf80
Frontend cleanup, .INI, CFO, scrollable pages
2020-12-09 06:32:33 +03:00
Nikolay Korolev
406f646949
pool stuff fix
2020-12-06 21:28:40 +03:00
erorcun
ab3e810a95
AnimViewer done, comment cleanup
2020-12-03 05:22:58 +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
Sergeanur
9e45feb4fa
Reorganize CPed functions into their original cpp files
2020-11-19 21:12:20 +02:00
aap
91f9c7938e
CPed review part1,2 re3
2020-11-18 12:38:47 +01:00
aap
19d9430314
fix flag
2020-11-16 22:57:37 +01:00
aap
b82b79fa11
CPed review part2; and reverting some stylistic changes
2020-11-16 09:57:33 +01:00
