summaryrefslogtreecommitdiff
path: root/src/control/Pickups.cpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* script revision p2Nikolay Korolev2021-08-301-2/+4
* mergeNikolay Korolev2021-08-081-0/+1
|\
| * mergeNikolay Korolev2021-08-081-0/+1
| |\
| | * finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten2021-07-101-1/+32
| | * Revert "Revert "Redo ReadSaveBuf + common.h cleanup""•••This reverts commit af7573ddbe38e0aaa485877e7ccb2e704b0f5a7f. withmorten2021-06-261-4/+5
| | * Revert "Redo ReadSaveBuf + common.h cleanup"•••This reverts commit 2b67aba94cb6448fb24c869559465eddf2bad069. erorcun2021-06-261-5/+4
| | * Redo ReadSaveBuf + common.h cleanupSergeanur2021-06-251-4/+5
| | * Use some GetMatrix/SetMatrix logic based on SA + CutsceneHead fixSergeanur2021-06-241-3/+15
| | * add debug render groupsaap2021-02-181-0/+4
| | * Revert "First batch of fixes (CallAndMessage)"•••This reverts commit 7a3b80a9b7f414967fe59f89ab0fe5416735babe. Filip Gawin2021-01-311-8/+1
| | * First batch of fixes (CallAndMessage)Filip Gawin2021-01-311-1/+8
| | * m_nWantedLevel -> GetWantedLevel()withmorten2021-01-221-2/+2
* | | Merge branch 'miami' into lcs•••# Conflicts: # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # src/audio/AudioManager.h # src/control/Garages.cpp # src/control/Garages.h # src/control/Script5.cpp # src/core/config.h # utils/gxt/american.txt # utils/gxt/spanish.txt Sergeanur2021-07-121-2/+56
|\| |
| * | finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten2021-07-101-2/+56
* | | Merge branch 'miami' into lcs•••# Conflicts: # src/control/Script5.cpp # src/entities/Entity.cpp Sergeanur2021-06-281-4/+5
|\| |
| * | Redo ReadSaveBuf + common.h cleanupSergeanur2021-06-281-4/+5
* | | Merge branch 'miami' into lcs•••# Conflicts: # src/core/World.cpp Sergeanur2021-05-101-3/+15
|\| |
| * | 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 Sergeanur2021-05-101-3/+15
* | | 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 Sergeanur2021-02-161-3/+4
|\| |
| * | Fix repeating pickup sound on revenue pickupSergeanur2021-02-101-3/+4
* | | 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 Sergeanur2021-01-221-7/+2
|\| |
| * | get rid of most --MIAMI commentswithmorten2021-01-221-5/+0
| * | m_nWantedLevel -> GetWantedLevel()withmorten2021-01-221-2/+2
* | | syncNikolay Korolev2021-01-181-1/+17
|/ /
* | fix pickup coronasFire-Head2021-01-101-2/+4
* | Fix pickup textSergeanur2021-01-071-6/+2
* | merge master to miamiNikolay Korolev2021-01-011-0/+4
|\|
| * Merge branch 'master' of https://github.com/GTAmodding/re3Fire-Head2020-12-191-1/+1
| |\
| * \ Merge branch 'master' of https://github.com/GTAmodding/re3Fire-Head2020-12-071-3/+85
| |\ \
| * | | ps2 hud, restore original codeFire-Head2020-12-071-0/+4
* | | | merge attemptNikolay Korolev2020-12-191-1/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | uint8 enums fixedwithmorten2020-12-071-1/+1
| | |/ | |/|
| * | Add GTA_REPLAYSergeanur2020-12-011-2/+2
| * | small garages revision + small template stuffNikolay Korolev2020-11-301-1/+1
| * | Reorganize CPed functions into their original cpp filesSergeanur2020-11-191-0/+82
| |/
| * Pickup fixesSergeanur2020-10-211-21/+33
* | Merge pull request #872 from withmorten/sized-enums-miami•••Get rid of sized enums 2: Electric Boogalooerorcun2020-12-091-1/+1
|\ \
| * | uint8 enums fixedwithmorten2020-12-071-1/+1
* | | Pool fixes from masterSergeanur2020-12-081-2/+2
|/ /
* | Add GTA_REPLAY•••# Conflicts: # src/control/Replay.cpp # src/control/Replay.h Sergeanur2020-12-011-2/+2
* | Some TODOs done in Peds codeSergeanur2020-11-251-10/+4
* | Reorganize CPed functions into their original cpp filesSergeanur2020-11-201-0/+99
* | Update src/control/Pickups.cpp•••Co-authored-by: Sergeanur <s.anureev@yandex.ua>Nikolay2020-11-111-1/+1
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-11-111-4/+5
|\ \
| * | Pickup fixSergeanur2020-11-081-1/+1
| * | Pickups fixSergeanur2020-11-081-3/+4
* | | CWorld doneNikolay Korolev2020-11-111-0/+14
|/ /
* | Fix undefined colorId for pickupsSergeanur2020-10-261-2/+4
* | Rename CObject flagSergeanur2020-10-211-3/+3
* | Pickups DoneSergeanur2020-10-211-102/+187
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-18 01:28:02 +0000