summaryrefslogtreecommitdiff
path: root/src/control/Pickups.cpp
AgeCommit message (Collapse)Author
2021-08-08mergeNikolay Korolev
2021-07-10finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten
2021-07-10finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten
2021-06-28Redo ReadSaveBuf + common.h cleanupSergeanur
2021-06-26Revert "Revert "Redo ReadSaveBuf + common.h cleanup""withmorten
This reverts commit af7573ddbe38e0aaa485877e7ccb2e704b0f5a7f.
2021-06-26Revert "Redo ReadSaveBuf + common.h cleanup"erorcun
This reverts commit 2b67aba94cb6448fb24c869559465eddf2bad069.
2021-06-25Redo ReadSaveBuf + common.h cleanupSergeanur
2021-06-24Use some GetMatrix/SetMatrix logic based on SA + CutsceneHead fixSergeanur
2021-05-10Use some GetMatrix/SetMatrix logic based on SASergeanur
# 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-02-18add debug render groupsaap
2021-02-10Fix repeating pickup sound on revenue pickupSergeanur
2021-01-31Revert "First batch of fixes (CallAndMessage)"Filip Gawin
This reverts commit 7a3b80a9b7f414967fe59f89ab0fe5416735babe.
2021-01-31First batch of fixes (CallAndMessage)Filip Gawin
2021-01-22get rid of most --MIAMI commentswithmorten
2021-01-22m_nWantedLevel -> GetWantedLevel()withmorten
2021-01-22m_nWantedLevel -> GetWantedLevel()withmorten
2021-01-10fix pickup coronasFire-Head
2021-01-07Fix pickup textSergeanur
2021-01-01merge master to miamiNikolay Korolev
2020-12-19Merge branch 'master' of https://github.com/GTAmodding/re3Fire-Head
2020-12-19merge attemptNikolay Korolev
2020-12-09Merge pull request #872 from withmorten/sized-enums-miamierorcun
Get rid of sized enums 2: Electric Boogaloo
2020-12-08Pool fixes from masterSergeanur
2020-12-07Merge branch 'master' of https://github.com/GTAmodding/re3Fire-Head
2020-12-07ps2 hud, restore original codeFire-Head
2020-12-07uint8 enums fixedwithmorten
2020-12-07uint8 enums fixedwithmorten
2020-12-01Add GTA_REPLAYSergeanur
# Conflicts: # src/control/Replay.cpp # src/control/Replay.h
2020-12-01Add GTA_REPLAYSergeanur
2020-11-30small garages revision + small template stuffNikolay Korolev
2020-11-25Some TODOs done in Peds codeSergeanur
2020-11-20Reorganize CPed functions into their original cpp filesSergeanur
2020-11-19Reorganize CPed functions into their original cpp filesSergeanur
2020-11-11Update src/control/Pickups.cppNikolay
Co-authored-by: Sergeanur <s.anureev@yandex.ua>
2020-11-11Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev
2020-11-11CWorld doneNikolay Korolev
2020-11-08Pickup fixSergeanur
2020-11-08Pickups fixSergeanur
2020-10-26Fix undefined colorId for pickupsSergeanur
2020-10-21Rename CObject flagSergeanur
2020-10-21Pickups DoneSergeanur
2020-10-21Pickup fixesSergeanur
2020-10-18Merge branch 'miami' into VC/PickupsSergeanur
# Conflicts: # src/control/Pickups.cpp
2020-10-18Merge branch 'master' into miamiSergeanur
# 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-17Pickup arrays doneSergeanur
2020-10-17Pickup save/loadSergeanur
2020-10-17Small inner fixSergeanur
2020-10-17More Pickup stuffSergeanur
2020-10-17Fix pickup fix :PSergeanur
2020-10-17Pickup fixesSergeanur
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 21:42:56 +0000