summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-miamierorcun2020-12-091-1/+1
|\ \ | | | | | | Get rid of sized enums 2: Electric Boogaloo
| * | uint8 enums fixedwithmorten2020-12-071-1/+1
| | |
* | | Pool fixes from masterSergeanur2020-12-081-2/+2
|/ /
* | Add GTA_REPLAYSergeanur2020-12-011-2/+2
| | | | | | | | | | | | # Conflicts: # src/control/Replay.cpp # src/control/Replay.h
* | 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.cppNikolay2020-11-111-1/+1
| | | | | | Co-authored-by: Sergeanur <s.anureev@yandex.ua>
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-11-101-4/+5
|\ \
| * | Pickup fixSergeanur2020-11-081-1/+1
| | |
| * | Pickups fixSergeanur2020-11-081-3/+4
| | |
* | | CWorld doneNikolay Korolev2020-11-101-0/+14
|/ /
* | Fix undefined colorId for pickupsSergeanur2020-10-261-2/+4
| |
* | Rename CObject flagSergeanur2020-10-211-3/+3
| |
* | Pickups DoneSergeanur2020-10-211-102/+187
| |
* | Merge branch 'miami' into VC/PickupsSergeanur2020-10-181-3/+2
|\ \ | | | | | | | | | | | | # Conflicts: # src/control/Pickups.cpp
| * | Merge branch 'master' into miamiSergeanur2020-10-181-11/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * Fix pickup fix :PSergeanur2020-10-171-3/+3
| | |
| | * Pickup fixesSergeanur2020-10-171-7/+6
| | |
| | * Pickup fixSergeanur2020-10-141-4/+4
| | |
* | | Pickup arrays doneSergeanur2020-10-171-9/+21
| | |
* | | Pickup save/loadSergeanur2020-10-171-5/+17
| | |
* | | Small inner fixSergeanur2020-10-171-2/+8
| | |
* | | More Pickup stuffSergeanur2020-10-171-140/+225
| | |
* | | Partial PickupsSergeanur2020-10-171-289/+148
|/ /
* | new opcodes, buyable properties, minor fixeseray orçunus2020-07-301-3/+103
| |
* | Merge branch 'master' into miamiSergeanur2020-07-291-24/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * The real pickup reflection fixSergeanur2020-07-291-24/+9
| |
| * Revert "FONT_BANK renamed to FONT_STANDARD"Fire-Head2020-06-071-1/+1
| | | | | | | | This reverts commit 552205dfbaea70628df56a4966d269a81a97d28e.
* | Noskillx's PR + fix .set loadingeray orçunus2020-07-061-2/+2
| |
* | fix crash-VC pickup scalingeray orçunus2020-06-161-6/+9
| |
* | some cutscene opcodes and heli gunseray orçunus2020-06-161-29/+43
| |
* | some camera codeaap2020-06-141-0/+2
| |
* | Merge branch 'master' into miamiSergeanur2020-06-071-1/+1
|\| | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/Frontend.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Train.cpp
| * FONT_BANK renamed to FONT_STANDARDSergeanur2020-06-071-1/+1
| |
* | crash fixNikolay Korolev2020-05-271-0/+3
| |
* | Compatibility with VC weapon.dat + new shotgunseray orçunus2020-05-231-37/+14
| |
* | Pickup and audio fixeray orçunus2020-05-201-0/+1
| |
* | Fixes for melees and various thingseray orçunus2020-05-201-0/+19
| |
* | Merge pull request #569 from aap/miamiaap2020-05-201-73/+0
|\ \ | | | | | | CEntity and friends
| * | CEntity and friendsaap2020-05-191-73/+0
| | |
* | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-05-191-6/+6
|\| |
| * | sync with upstreamNikolay Korolev2020-05-171-10/+0
| | |
| * | sync with upstreamNikolay Korolev2020-05-171-49/+71
| |\ \
| * | | full script basic supportNikolay Korolev2020-05-171-0/+10
| | | |
| * | | more script stuffNikolay Korolev2020-05-161-6/+6
| | | |
* | | | Melee weapons(half-working), Ped and Hud bitseray orçunus2020-05-191-4/+18
| |/ / |/| |
* | | Weapon fixes and thingieseray orçunus2020-05-171-49/+71
|/ /
* | Merge branch 'master' into miamiSergeanur2020-05-121-0/+2
|\| | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/FileLoader.cpp # src/core/Streaming.cpp # src/core/Zones.cpp # src/core/Zones.h # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp
| * Fix linux warningsFilip Gawin2020-05-121-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-121-6/+6
|\| | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp
| * Linux build supporteray orçunus2020-05-111-6/+6
| |
* | more scriptNikolay Korolev2020-05-121-1/+1
|/
* More use of GetModelIndexSergeanur2020-05-051-1/+1
|
* SetPosition, part 2Sergeanur2020-05-021-4/+4
|
* SetPosition, part 1Sergeanur2020-05-021-7/+7
|
* Merge pull request #480 from Fire-Head/masterFire_Head2020-04-201-0/+28
|\ | | | | camerapickup ps2 code
| * camerapickup ps2 codeFire-Head2020-04-201-0/+28
| |
* | Fix CPickups::GenerateNewOne loopSergeanur2020-04-191-1/+1
|/
* Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-191-4/+4
|
* Remove patchesSergeanur2020-04-171-45/+1
|
* rem refsFire-Head2020-04-171-8/+8
|
* added missing breakSergeanur2020-04-131-0/+1
|
* Fix compilation errorSergeanur2020-04-131-7/+7
|
* CPacManPickupsSergeanur2020-04-131-28/+430
|
* CObject completesaml1er2020-04-101-5/+5
|
* normalized line endings to LFaap2020-04-091-1049/+1049
|
* vehicles missing functions + fixesNikolay Korolev2020-04-011-16/+13
|
* CCopPed done and #include cleanuperay orçunus2020-03-281-0/+3
|
* Cleanup audio code + fixes for reviewFilip Gawin2020-03-221-16/+18
|
* Remove unneeded double to float castsFilip Gawin2020-03-221-3/+3
|
* Fixes for Serge's reviewFilip Gawin2020-03-221-1/+1
|
* some not fully tested stuffNikolay Korolev2020-01-011-1/+14
|
* Audio fixesSergeanur2019-10-271-1/+1
|
* Merge pull request #246 from Sergeanur/PoolsSergeanur2019-10-211-2/+2
|\ | | | | Some CPool and CPools funcs, restoring original logic of pool lookup loops
| * Some CPool and CPools funcs, restoring original logic of pool lookup loopsSergeanur2019-10-161-2/+2
| |
* | CGame::Process() && CGame::ReloadIPLsnmzik2019-10-191-0/+1
| |
* | Gangs save and missed sound enumsSergeanur2019-10-171-1/+1
|/
* Fixed floating package pickupsSergeanur2019-10-121-0/+1
|
* Typo fixSergeanur2019-10-121-1/+1
|
* Merge pull request #229 from Sergeanur/SaveLoadTemplatesSergeanur2019-10-111-27/+21
|\ | | | | Added read/write template functions for save data
| * Added read/write template functions for save data, small Load/Save arguments unificationSergeanur2019-10-081-27/+21
| |
* | CMoneyMessages moved to SpecialFX.cppSergeanur2019-10-101-1/+1
|/
* Fix warningsSergeanur2019-10-041-4/+4
|
* Fix formatting mistakesSergeanur2019-10-031-2/+1
|
* Fixed some formattingSergeanur2019-10-031-6/+2
|
* Checks rewrittenSergeanur2019-10-031-88/+95
|
* Drop w'sSergeanur2019-10-031-13/+13
|
* CPickupsSergeanur2019-10-031-20/+1036
|
* RunningScript, part 4, plus some fixesNikolay Korolev2019-08-031-1/+2
|
* The Pedseray orçunus2019-08-021-0/+5
|
* Running script part 3Nikolay Korolev2019-07-251-0/+1
|
* finished CEntityaap2019-06-301-0/+4
|
* More replay stuffNikolay Korolev2019-06-251-0/+2
|
* implemented some higher level functions; added lots of stubs; switched top and bottom in CRectaap2019-05-301-0/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 23:22:37 +0100