1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-13 06:39:16 +00:00
Commit graph

376 commits

Author SHA1 Message Date
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
aap 8a8f2d4e5b
Merge pull request #815 from aap/miami
CPed review part 1
2020-11-16 09:45:47 +01:00
Nikolay Korolev 26c6908d25 car AI revision 2020-11-14 14:21:56 +03: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
erorcun b67ed1988f Peds: Remove redundant lines 2020-11-12 17:36:41 +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
Nikolay Korolev 370d693f9d the driver fix 2020-11-01 15:15:23 +03:00
aap ea5b86774d couple of fixes and cleanup 2020-10-31 14:33:49 +01:00
erorcun 10758088ef
Merge pull request #766 from Fire-Head/miami
Glass
2020-10-18 19:59:11 +03:00
erorcun 497c179245
Merge pull request #772 from Nick007J/miami
Original save/load support + bugfixes
2020-10-18 19:37:49 +03:00
erorcun 20ab7d1739 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-18 19:31:39 +03:00
erorcun 937290db09 Fix attractor even more 2020-10-18 19:31:02 +03:00
erorcun a6aa782d6d Fixes and style changes from miami 2020-10-18 19:16:37 +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
erorcun 1b59b2c9bc Attractor obj. fixes 2020-10-18 16:38:36 +03:00