summaryrefslogtreecommitdiff
path: root/src/control/Pickups.cpp
AgeCommit message (Collapse)Author
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
2020-10-17Partial PickupsSergeanur
2020-10-14Pickup fixSergeanur
2020-07-30new opcodes, buyable properties, minor fixeseray orçunus
2020-07-29Merge branch 'master' into miamiSergeanur
# Conflicts: # src/animation/RpAnimBlend.cpp # src/audio/oal/stream.cpp # src/audio/sampman.h # src/control/Pickups.cpp # src/core/Collision.cpp # src/core/Collision.h # src/core/FileLoader.cpp # src/core/FileMgr.cpp # src/core/FileMgr.h # src/core/Streaming.cpp # src/core/Streaming.h # src/core/SurfaceTable.h # src/modelinfo/VehicleModelInfo.h # src/peds/Ped.cpp # src/rw/RwHelper.cpp # src/rw/RwHelper.h # src/skel/glfw/glfw.cpp # src/skel/platform.h # src/text/Text.cpp # src/text/Text.h # src/vehicles/CarGen.cpp # src/vehicles/Heli.cpp
2020-07-29The real pickup reflection fixSergeanur
2020-07-06Noskillx's PR + fix .set loadingeray orçunus
2020-06-16fix crash-VC pickup scalingeray orçunus
2020-06-16some cutscene opcodes and heli gunseray orçunus
2020-06-14some camera codeaap
2020-06-07Revert "FONT_BANK renamed to FONT_STANDARD"Fire-Head
This reverts commit 552205dfbaea70628df56a4966d269a81a97d28e.
2020-06-07Merge branch 'master' into miamiSergeanur
# Conflicts: # src/control/Garages.cpp # src/core/Frontend.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Train.cpp
2020-06-07FONT_BANK renamed to FONT_STANDARDSergeanur
2020-05-27crash fixNikolay Korolev
2020-05-23Compatibility with VC weapon.dat + new shotgunseray orçunus
2020-05-20Pickup and audio fixeray orçunus
2020-05-20Fixes for melees and various thingseray orçunus
2020-05-20Merge pull request #569 from aap/miamiaap
CEntity and friends