summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Boat.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-08-291-2/+2
|\
| * Fix Squalo render out polySergeanur2021-08-291-2/+2
| |
* | Merge branch 'miami' into lcsSergeanur2021-08-201-1/+1
|\| | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioManager.cpp
| * Fix police yelling from empty or destroyed boatsSergeanur2021-08-191-1/+1
| |
* | Merge branch 'miami' into lcsSergeanur2021-07-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten2021-07-101-1/+1
| |
* | Merge branch 'miami' into lcsSergeanur2021-06-301-11/+11
|\| | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/control/Script4.cpp # src/core/Frontend.cpp
| * rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)withmorten2021-06-281-11/+11
| |
* | Merge branch 'miami' into lcsSergeanur2021-06-281-0/+1
|\| | | | | | | | | | | # Conflicts: # src/control/Script5.cpp # src/entities/Entity.cpp
| * Redo ReadSaveBuf + common.h cleanupSergeanur2021-06-281-0/+1
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-02-161-8/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Use original animation names from VCSSergeanur2021-01-271-8/+8
| |
* | Merge branch 'miami' into lcsSergeanur2021-01-251-1/+1
|\| | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.h # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h
| * make building with Codewarrior 7 possiblewithmorten2021-01-241-1/+1
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-231-0/+1
|\| | | | | | | | | # Conflicts: # src/modelinfo/BaseModelInfo.cpp
| * Includes overhaul, fix some compiler warningserorcun2021-01-231-0/+1
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-6/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-4/+2
| |
| * m_nWantedLevel -> GetWantedLevel()withmorten2021-01-221-2/+2
| |
| * some free cam fixes for controllerwithmorten2021-01-181-1/+8
| |
* | some free cam fixes for controllerwithmorten2021-01-181-1/+8
| |
* | Merge pull request #962 from aap/lcsaap2021-01-181-1/+1
|\ \ | | | | | | initial work on vehicles
| * | initial work on vehiclesaap2021-01-181-1/+1
| |/
* | Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcsFire-Head2021-01-121-5/+5
|\|
| * fix fixaap2021-01-091-1/+1
| |
| * boat fixaap2021-01-091-5/+5
| |
* | lcs particleFire-Head2021-01-121-1/+2
|/
* PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixesSergeanur2020-12-181-3/+3
|
* skimmer shadowmajestic2020-12-011-1/+2
|
* Original enum nameSergeanur2020-11-241-3/+3
|
* urgh, merge and changes to RW layer in one commit.aap2020-11-111-2/+2
|\
| * Sfx audio logicFilip Gawin2020-11-061-2/+2
| |
* | fixed boats for new rendereraap2020-11-041-0/+20
|/
* RevertSergeanur2020-11-011-1/+1
|
* Fix virtual SetModelIndex call in CBoat ctorSergeanur2020-11-011-1/+1
|
* Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-10-181-1/+1
|\
| * Merge branch 'master' into miamiSergeanur2020-10-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * Setter for bIsStatic (became virtual in SA)Sergeanur2020-10-181-1/+1
| | |
| | * changed a sound enumaap2020-08-201-1/+1
| | |
| | * Rename LEVEL_NONE to LEVEL_GENERICSergeanur2020-07-131-1/+1
| | |
| | * fixes to CBoataap2020-07-011-26/+26
| | |
* | | saves part 1Nikolay Korolev2020-10-171-3/+3
|/ /
* | Pad, BulletInfo, ProjectileInfo, fixeseray orçunus2020-10-071-2/+9
| |
* | VC replaysNikolay Korolev2020-09-261-0/+4
| |
* | fixed sound enumaap2020-08-201-1/+1
| |
* | CPlane doneaap2020-07-191-1/+1
| |
* | CBoat and friendsaap2020-07-011-278/+681
| |
* | Merge branch 'miami' into miamierorcun2020-06-161-2/+2
|\ \
| * | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-151-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.cpp # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/render/Fluff.cpp # src/render/Hud.cpp
| | * fixed boat wakeaap2020-06-141-0/+2
| | |
| | * fixes for CPhysical and friendsaap2020-05-221-1/+1
| | |
* | | fixed condition in CBoat::ProcessControl and changed enummajestic2020-06-141-9/+49
|/ /
* | CBike doneaap2020-06-071-1/+1
| |
* | VC WaterFire-Head2020-05-271-4/+4
| |
* | VC CParticle doneFire-Head2020-05-271-2/+3
| |
* | Menu borders and weapon fixeseray orçunus2020-05-241-1/+1
| |
* | CPhysicalaap2020-05-221-1/+1
| |
* | script revisionNikolay Korolev2020-05-191-0/+9
| |
* | Weapon fixes and thingieseray orçunus2020-05-171-0/+68
| |
* | Merge branch 'master' into miamiSergeanur2020-05-141-0/+4
|\| | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| * some fixesNikolay Korolev2020-05-141-0/+4
| |
* | Merge branch 'master' into miamiSergeanur2020-05-121-0/+1
|\| | | | | | | | | | | | | | | | | | | | | # 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/+1
| |
* | fix boatsNikolay Korolev2020-05-101-4/+4
| |
* | fix boatNikolay Korolev2020-05-101-1/+1
| |
* | sync with upstreamNikolay Korolev2020-05-101-4/+4
|\ \
| * | CClumpModelInfo; little fixesaap2020-05-101-4/+4
| | |
* | | more car controlNikolay Korolev2020-05-101-4/+7
|/ /
* | new curves + boat fixNikolay Korolev2020-05-091-1/+1
| |
* | VC vehicles just barely working nowaap2020-05-071-2/+2
| |
* | cleaned up MIAMI ifdefsaap2020-05-051-5/+0
| |
* | Revert "Remove Miami stuff"Sergeanur2020-05-051-0/+2
|/ | | | This reverts commit 9960c411933f9a804eb5f6840d75ad00fd255252.
* Remove Miami stuffSergeanur2020-05-051-2/+0
|
* merged masteraap2020-05-051-1/+1
|\
| * More use of GetModelIndexSergeanur2020-05-051-1/+1
| |
* | implemented most of streamed collisions and big buildingsaap2020-05-051-0/+2
|/
* Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-021-3/+3
|\
| * SetPosition, part 2Sergeanur2020-05-021-3/+3
| |
* | changed saving compatibilityNikolay Korolev2020-05-021-0/+23
|/
* Adding getters and setters for type and statusSergeanur2020-04-301-5/+5
|
* Fix compilation errorSergeanur2020-04-261-4/+4
|
* Initial GLFW supporteray orçunus2020-04-261-4/+4
|
* ps2 particles, sampman oal startedFire-Head2020-04-231-3/+52
|
* Try to build with mingwFilip Gawin2020-04-201-7/+7
|
* Remove patchesSergeanur2020-04-171-22/+1
|
* rem refsFire-Head2020-04-171-5/+5
|
* More refs removedSergeanur2020-04-161-5/+5
|
* finished CBoataap2020-04-131-31/+610
|
* CObject completesaml1er2020-04-101-1/+1
|
* fixed questionable RW usage; changed radar mask to PS2 techinqueaap2020-04-091-39/+15
|
* remove include <new> from common.haap2020-03-281-0/+2
|
* Fix boat componentSergeanur2020-01-311-1/+1
|
* Partial CBoatSergeanur2020-01-241-6/+242
|
* Running script part 3Nikolay Korolev2019-07-251-1/+1
|
* updateFire-Head2019-07-241-6/+5
|
* Merge branch 'master' into masterFire_Head2019-07-111-3/+7
|\
| * cleaned up patching of virtual functions; started CAutomobileaap2019-07-081-2/+8
| |
* | WaterLevel doneFire-Head2019-07-111-0/+63
|/
* the great reorganizationaap2019-07-071-0/+14