summaryrefslogtreecommitdiffstats
path: root/src/control/Garages.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-3/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * get rid of most --MIAMI commentswithmorten2021-01-221-2/+0
| |
| * m_nWantedLevel -> GetWantedLevel()withmorten2021-01-221-1/+1
| |
* | syncNikolay Korolev2021-01-201-4/+8
|\ \
| * | Merge branch 'miami' into lcsSergeanur2021-01-201-4/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.cpp # src/control/Script4.cpp # src/render/Weather.cpp # src/render/Weather.h # src/vehicles/Automobile.cpp
| | * Get rid of bitfields in CPoolSergeanur2021-01-201-4/+4
| | | | | | | | | | | | | | | # Conflicts: # src/core/templates.h
| | * add the bad crack "features" behind SECUROM definewithmorten2021-01-141-0/+4
| | |
* | | syncNikolay Korolev2021-01-181-35/+128
|/ /
* / more scriptNikolay Korolev2021-01-091-3/+3
|/
* Fix garage messages positionSergeanur2021-01-071-5/+1
|
* CVarConsoleSergeanur2021-01-021-0/+8
|
* merge master to miamiNikolay Korolev2021-01-011-1/+5
|\
| * Small type use fixesSergeanur2020-12-251-1/+1
| |
| * Merge branch 'master' of https://github.com/GTAmodding/re3Fire-Head2020-12-191-6/+4
| |\
| * \ Merge branch 'master' of https://github.com/GTAmodding/re3Fire-Head2020-12-071-101/+115
| |\ \
| * | | ps2 hud, restore original codeFire-Head2020-12-071-6/+32
| | | |
* | | | fixed some bugs (saves might be broken though)Nikolay Korolev2020-12-311-4/+4
| | | |
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-12-251-1/+1
|\ \ \ \
| * | | | Small type use fixesSergeanur2020-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/control/Garages.cpp # src/vehicles/Cranes.cpp
* | | | | fix garageNikolay Korolev2020-12-251-0/+3
|/ / / /
* | | | merge attemptNikolay Korolev2020-12-191-30/+28
|\ \ \ \ | | |_|/ | |/| |
| * | | removed obsolete ifdef (since we have GTA_REPLAY)Nikolay Korolev2020-12-121-2/+0
| | | |
| * | | int8 enums fixedwithmorten2020-12-071-4/+4
| | |/ | |/|
| * | fixed parenthesisNikolay2020-12-061-2/+2
| | |
| * | small garages revision + small template stuffNikolay Korolev2020-11-301-88/+102
| | |
| * | fix garagesNikolay Korolev2020-11-271-5/+5
| | |
| * | Font: Hud: Use orig. text dimensions, fix right-align calculationserorcun2020-11-091-1/+1
| | |
| * | Revert "Font: Fix text dimensions"erorcun2020-11-081-1/+1
| |/ | | | | | | This reverts commit 6729de49b16da9a1be3c95b146ba053bf214c91c.
| * Font: Fix text dimensionserorcun2020-10-251-1/+1
| |
| * Fix some sanitizer errors, improve POSIX streamereray orçunus2020-10-041-1/+1
| |
| * silentpatch fixesNikolay Korolev2020-09-261-0/+6
| |
* | fixed garages + minor fixesNikolay Korolev2020-12-121-3/+35
| |
* | Merge pull request #869 from Nick007J/miamiaap2020-12-091-138/+202
|\ \ | | | | | | garages revision + fixes
| * | quick fixNikolay Korolev2020-12-061-1/+2
| | |
| * | garages revision + some fixesNikolay Korolev2020-12-061-140/+201
| | |
* | | Merge pull request #872 from withmorten/sized-enums-miamierorcun2020-12-091-3/+3
|\ \ \ | | | | | | | | Get rid of sized enums 2: Electric Boogaloo
| * | | int8 enums fixedwithmorten2020-12-071-3/+3
| |/ /
* | | Pool fixes from masterSergeanur2020-12-081-2/+2
| | |
* | | FixesSergeanur2020-12-081-2/+0
|/ /
* | Font: Hud: Use orig. text dimensions, fix right-align calculationserorcun2020-11-081-1/+1
| |
* | small fixNikolay Korolev2020-10-111-4/+4
| |
* | Control updatesNikolay Korolev2020-10-111-6/+6
| |
* | Fix some sanitizer errors, improve POSIX streamereray orçunus2020-10-081-1/+1
| |
* | some SilentPatch fixesshfil2020-09-301-0/+6
| | | | | | | | | | | | # Conflicts: # src/core/Camera.cpp # src/weapons/Weapon.cpp
* | Merge branch 'master' into miamiSergeanur2020-08-191-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # gamefiles/TEXT/american.gxt # src/control/Garages.cpp # src/control/Record.cpp # src/control/Script.cpp # src/core/Collision.cpp # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Streaming.cpp # src/core/config.h # src/core/re3.cpp # src/modelinfo/ModelInfo.cpp # src/render/Renderer.cpp # src/save/GenericGameStorage.cpp # utils/gxt/american.txt
| * Fix small logic mistake in CGarage::RemoveCarsBlockingDoorNotInsideJack Powell2020-08-181-1/+1
| |
| * fixed bugfixNikolay Korolev2020-08-181-1/+2
| |
| * 90% fixes, 10% skel refactoringeray orçunus2020-07-241-0/+3
| |
| * Bettah car enter canceling, fix CFO crash, ped objs. renamingeray orçunus2020-07-031-1/+1
| |
| * Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixeseray orçunus2020-07-021-1/+1
| |
| * Revert "FONT_BANK renamed to FONT_STANDARD"Fire-Head2020-06-071-1/+1
| | | | | | | | This reverts commit 552205dfbaea70628df56a4966d269a81a97d28e.
* | 90% fixes, 10% skel refactoringeray orçunus2020-07-241-0/+3
| |
* | Noskillx's PR + fix .set loadingeray orçunus2020-07-061-0/+1
| |
* | fixes from master, menu helper texteray orçunus2020-07-041-1/+1
| |
* | ice cream attractor + bike resprayNikolay Korolev2020-07-031-2/+2
| |
* | CWanted, anim fix, ped objs renaming, remove III beta featureseray orçunus2020-06-221-1/+1
| |
* | bikes in garages + bugfixNikolay Korolev2020-06-171-2/+9
| |
* | 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
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-261-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/control/Garages.cpp # src/core/SurfaceTable.cpp # src/core/SurfaceTable.h # src/core/World.cpp # src/core/main.cpp # src/modelinfo/PedModelInfo.cpp # src/peds/Ped.cpp # src/render/Timecycle.cpp # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/Heli.cpp # src/vehicles/Vehicle.cpp # src/weapons/Weapon.cpp # src/weapons/WeaponInfo.h
| * fixed NE bugNikolay Korolev2020-05-251-1/+8
| |
* | how did saving even work in original III?Nikolay Korolev2020-05-241-18/+6
| |
* | full script basic supportNikolay Korolev2020-05-171-1/+1
| |
* | Merge branch 'master' into miamiSergeanur2020-05-121-0/+3
|\| | | | | | | | | | | | | | | | | | | | | # 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/+7
| |
| * garages fixNikolay Korolev2020-05-121-2/+2
| |
| * fix garagesNikolay Korolev2020-05-121-1/+1
| |
* | fix garagesNikolay Korolev2020-05-121-15/+17
| |
* | fix garagesNikolay Korolev2020-05-121-1/+1
| |
* | garages + scriptNikolay Korolev2020-05-111-467/+338
| |
* | some changesNikolay Korolev2020-05-111-6/+24
| |
* | some updates for scriptNikolay Korolev2020-05-101-17/+8
| |
* | VC vehicles just barely working nowaap2020-05-071-8/+3
| |
* | getting the vice city map to workaap2020-05-051-4/+1
|/
* Switching pad modes and cheats when player is switching between controller and kb&mSergeanur2020-05-021-2/+7
|
* SetPosition, part 2Sergeanur2020-05-021-18/+18
|
* SetPosition, part 1Sergeanur2020-05-021-2/+2
|
* Adding getters and setters for type and statusSergeanur2020-04-301-4/+4
|
* FixesSergeanur2020-04-271-1/+1
|
* Merge branch 'master' into MoreLanguagesSergeanur2020-04-261-72/+70
|\ | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Frontend.cpp # src/core/MenuScreens.h # src/render/Font.cpp # src/render/Font.h # src/text/Messages.cpp # src/text/Text.cpp
| * Try to build with mingwFilip Gawin2020-04-201-38/+38
| |
| * Remove patchesSergeanur2020-04-171-8/+1
| |
| * Some refs removed, little fixes and teleporteray orçunus2020-04-161-22/+23
| |
| * Merge pull request #440 from Fire-Head/masterNikolay Korolev2020-04-151-1/+1
| |\ | | | | | | CWeapon done, fixes
| | * CWeapon done, ps2 cheats fixFire-Head2020-04-151-1/+1
| | |
| * | Many fixes and cleanuperay orçunus2020-04-151-3/+7
| | |
* | | Merge branch 'master' into MoreLanguagesSergeanur2020-04-141-20/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Frontend.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Hud.h # src/text/Messages.cpp # src/text/Text.cpp
| * | fix garagesNikolay Korolev2020-04-131-1/+1
| |/
| * bug fixNikolay Korolev2020-04-081-2/+2
| |
| * stats fixNikolay Korolev2020-04-061-1/+1
| |
| * Cranes doneNikolay Korolev2020-04-061-16/+25
| |
* | Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-04-051-2/+3
|\|
| * shoreside garage fixNikolay Korolev2020-04-051-2/+3
| |
* | Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-04-051-7/+5
|\|
| * vehicles missing functions + fixesNikolay Korolev2020-04-011-7/+5
| |
* | JapaneseSergeanur2020-04-051-1/+1
|/
* review fixesNikolay Korolev2020-03-311-116/+64
|
* fixNikolay Korolev2020-03-311-1/+1
|
* added forgotten functionNikolay Korolev2020-03-301-1/+4
|
* bug fixes, reorganisationNikolay Korolev2020-03-301-14/+14
|
* finished garagesNikolay Korolev2020-03-301-41/+543
|
* more garagesNikolay Korolev2020-03-291-115/+603
|
* fixesNikolay Korolev2020-03-281-40/+36
|
* fixesNikolay Korolev2020-03-281-74/+131
|
* garage update part 2Nikolay Korolev2020-03-281-119/+624
|
* garages part 1Nikolay Korolev2020-03-281-18/+682
|
* ProcessButtonPresses and fixeseray orçunus2020-03-211-2/+2
|
* Add Load/Save functionsWes Hampson2020-03-111-0/+2
|
* script 1000-1154Nikolay Korolev2020-02-161-0/+1
|
* sync with upstreamNikolay Korolev2020-02-151-1/+1
|\
| * Some fixes and some cosmetic thingseray orçunus2020-02-021-2/+2
| |
* | script 900-999Nikolay Korolev2020-02-151-2/+31
|/
* script 800-899Nikolay Korolev2020-01-031-1/+24
|
* some not fully tested stuffNikolay Korolev2020-01-011-0/+1
|
* script 600-699Nikolay Korolev2019-10-271-0/+9
|
* mergeNikolay Korolev2019-10-261-1/+4
|\
| * CGame::Process() && CGame::ReloadIPLsnmzik2019-10-191-1/+4
| |
* | script 500-599 plus bugfixNikolay Korolev2019-10-211-0/+3
|/
* Full CGameLogicSergeanur2019-10-081-0/+1
|
* CGarages::PrintMessages drawing fixesSergeanur2019-10-061-11/+11
|
* Peds, a fix and a tad of VCeray orçunus2019-09-171-1/+2
|
* More more more audioFilip Gawin2019-08-271-3/+3
|
* more CCarCtrlNikolay Korolev2019-08-111-0/+1
|
* cargen + some scriptNikolay Korolev2019-07-271-0/+5
|
* renamed some variables and added files; more CAutomobile::ProcessControlaap2019-07-171-0/+2
|
* Initial commit for Frontend._AG2019-06-251-7/+7
| | | | | | Bug fixes: fix #40, fix #39, fix #38, fix #37, fix #21. Code organization and cleanup...
* Code clean up._AG2019-06-201-3/+5
|
* Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h._AG2019-06-201-8/+8
|
* first part of CFileLoaderaap2019-06-171-0/+1
|
* Update HUD stuff, bug and format fixes._AG2019-06-171-1/+63
| | | | | Added environment variables to premake5.lua. Update README.md
* implemented some higher level functions; added lots of stubs; switched top and bottom in CRectaap2019-05-301-0/+44