summaryrefslogtreecommitdiffstats
path: root/src/objects (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-05-101-6/+6
|\ | | | | | | | | # Conflicts: # src/core/World.cpp
| * Use some GetMatrix/SetMatrix logic based on SASergeanur2021-05-101-6/+6
| | | | | | | | | | | | | | | | | | | | # 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
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-04-091-0/+3
|\| | | | | | | | | # Conflicts: # src/modelinfo/PedModelInfo.cpp
| * Fixeserorcun2021-02-281-0/+3
| |
* | Merge branch 'miami' into lcsSergeanur2021-02-261-0/+6
|\| | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # premake5.lua # src/audio/MusicManager.cpp # src/core/main.cpp # src/core/re3.cpp # src/extras/postfx.cpp # src/render/Font.cpp
| * A saner way to remove Stingers, may fix Physical crasherorcun2021-02-201-0/+6
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-02-161-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-3/+3
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-223-6/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-223-6/+0
| |
* | Merge pull request #976 from Fire-Head/lcsaap2021-01-222-2/+14
|\ \ | | | | | | Lcs pobj
| * | Update ParticleObject.hFire_Head2021-01-221-2/+2
| | |
| * | lcs pobjFire-Head2021-01-222-2/+14
| | |
* | | syncNikolay Korolev2021-01-181-0/+1
|/ /
* | Merge branch 'miami' into lcsSergeanur2021-01-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * miami: Fix backface culling of cutscene objects more renames anim velocity union rename m_vehEnterType -> m_vehDoor Port cmake improvements to miami some loose ends move TODO to Readme Fix build without FIX_BUGS, divide to 0 fixes
| * Fix backface culling of cutscene objectsSergeanur2021-01-131-2/+2
| |
| * anim velocity unionaap2021-01-131-1/+1
| |
* | CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bitSergeanur2021-01-111-2/+5
|/
* Merge pull request #869 from Nick007J/miamiaap2020-12-091-1/+1
|\ | | | | garages revision + fixes
| * sync with upstreamNikolay Korolev2020-12-082-150/+449
| |\
| * | pool stuff fixNikolay Korolev2020-12-061-1/+1
| | |
* | | fix CObject::DeleteAllTempObjectsInAreaaap2020-12-081-2/+1
| |/ |/|
* | Implement DAMAGE_EFFECT_SMASH_VEGPALM and code style fixesWalied K. Yassen2020-12-071-35/+83
| |
* | Fix the code style issuesWalied K. Yassen2020-11-302-95/+110
| |
* | Implement the missing damage effects and fix the existing onesWalied K. Yassen2020-11-302-144/+326
| |
* | Implement MI_BEACHBALL behavioursWalied K. Yassen2020-11-291-4/+49
| |
* | Fix MI_RCBOMB gravity force and treat MI_PETROLPUMP2 as explosiveWalied K. Yassen2020-11-291-1/+9
| |
* | Fix CObject::DeleteAllTempObjectsInArea not considering the given pointWalied K. Yassen2020-11-291-1/+2
|/
* neo screen dropletsaap2020-11-192-0/+8
|
* pragma twiceSergeanur2020-11-161-2/+0
|
* Possibly fix pickup money textSergeanur2020-11-081-2/+2
|
* CObject::Rendermajestic2020-11-011-2/+104
|
* Merge pull request #779 from Sergeanur/VC/Pickupserorcun2020-10-241-1/+1
|\ | | | | Pickups Done
| * Rename CObject flagSergeanur2020-10-211-1/+1
| |
* | ObjectDataSergeanur2020-10-231-4/+69
|/
* Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-10-181-8/+8
|\
| * Merge branch 'master' into miamiSergeanur2020-10-181-8/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-8/+8
| | |
| | * fixes for CPhysical and friendsaap2020-05-221-8/+1
| | |
* | | object field renamedNikolay Korolev2020-10-181-1/+1
| | |
* | | saves part 1Nikolay Korolev2020-10-171-1/+2
|/ /
* | Fix sniper and water creatures bug, mark some fileseray orçunus2020-10-095-7/+24
| |
* | More stinger fixSergeanur2020-09-021-2/+4
| |
* | Stinger fixesSergeanur2020-09-021-33/+30
| |
* | Enable Stingereray orçunus2020-09-012-10/+11
| |
* | Rename varsSergeanur2020-09-011-5/+4
| |
* | Rename statesSergeanur2020-08-312-12/+12
| |
* | vars renameSergeanur2020-08-311-6/+6
| |
* | use SetOrientationSergeanur2020-08-311-10/+3
| |
* | Stinger doneSergeanur2020-08-312-0/+280
| |
* | rem pobj assertFire-Head2020-08-091-2/+0
| |
* | Merge pull request #670 from Fire-Head/miamiaap2020-08-072-18/+99
|\ \ | | | | | | Miami Shadows
| * | NULL -> nilFire-Head2020-07-311-5/+5
| | |
| * | miami shadowsFire-Head2020-07-292-19/+100
| | |
* | | CEscalators donemajestic2020-08-041-0/+1
| | |
* | | Merge pull request #647 from Fire-Head/miamiaap2020-07-042-454/+442
|\| | | | | | | | miami CParticleObject
| * | NULL->nilFire-Head2020-07-032-91/+91
| | |
| * | miami pobjFire-Head2020-07-032-380/+368
| | |
* | | Peds & fixeseray orçunus2020-07-041-1/+1
|/ /
* | CPhysicalaap2020-05-222-18/+17
| |
* | Fixes for melees and various thingseray orçunus2020-05-201-5/+5
| |
* | CEntity and friendsaap2020-05-192-3/+11
| |
* | script revisionNikolay Korolev2020-05-192-0/+17
| |
* | Merge branch 'master' into miamiSergeanur2020-05-161-4/+5
|\|
| * Remove unused audio enumSergeanur2020-05-161-4/+5
| |
* | Merge branch 'master' into miamiSergeanur2020-05-141-2/+2
|\| | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| * Revert to memcpyFilip Gawin2020-05-131-2/+2
| |
* | Merge branch 'master' into miamiSergeanur2020-05-121-1/+9
|\| | | | | | | | | | | | | | | | | | | | | # 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-1/+9
| |
| * fixed bug in cutscene headaap2020-05-121-1/+9
| |
* | Merge branch 'master' into miamiSergeanur2020-05-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimBlendAssociation.h # src/animation/AnimBlendClumpData.h # src/animation/AnimManager.h # src/animation/FrameUpdate.cpp # src/control/AutoPilot.h # src/control/PathFind.h # src/core/PlayerInfo.h # src/entities/Building.h # src/entities/Dummy.h # src/entities/Entity.h # src/entities/Physical.h # src/entities/Treadable.h # src/modelinfo/BaseModelInfo.h # src/modelinfo/ClumpModelInfo.cpp # src/modelinfo/ClumpModelInfo.h # src/modelinfo/PedModelInfo.h # src/modelinfo/SimpleModelInfo.h # src/modelinfo/TimeModelInfo.h # src/modelinfo/VehicleModelInfo.h # src/objects/CutsceneHead.h # src/objects/CutsceneObject.h # src/objects/DummyObject.h # src/objects/Object.h # src/peds/DummyPed.h # src/peds/PedIK.cpp # src/rw/VisibilityPlugins.cpp # src/vehicles/Automobile.h # src/vehicles/Boat.h # src/vehicles/Heli.h # src/vehicles/Plane.h # src/vehicles/Train.h # src/vehicles/Vehicle.h
| * Fixed typos and made all assert functions optionalbigbossbro082020-05-105-9/+5
| |
| * defined out asserts.bigbossbro082020-05-102-0/+6
| |
| * sorted out object collision enumsaap2020-05-062-18/+27
| |
| * got rid of superfluous enumaap2020-05-062-20/+8
| |
* | peds starting to workaap2020-05-092-61/+0
| |
* | removed cutscene headsaap2020-05-092-214/+0
| |
* | car control and friendsNikolay Korolev2020-05-072-2/+0
| |
* | fixed object collision stuff at least somewhataap2020-05-061-2/+18
| |
* | sorted out object collision enumsaap2020-05-062-18/+27
| |
* | got rid of superfluous enumaap2020-05-062-20/+8
| |
* | setting some areas so objects dont disappearaap2020-05-062-0/+2
|/
* Make CBaseModelInfo fields protectedSergeanur2020-05-051-1/+1
|
* More use of GetModelIndexSergeanur2020-05-053-8/+8
|
* SetPosition, part 2Sergeanur2020-05-021-2/+2
|
* Adding getters and setters for type and statusSergeanur2020-04-302-2/+2
|
* Changing prefixes for some audio fieldsSergeanur2020-04-281-0/+1
|
* implemented skinned peds, no cutscene hands yetaap2020-04-244-11/+174
|
* ps2 particles, sampman oal startedFire-Head2020-04-231-0/+148
|
* Try to build with mingwFilip Gawin2020-04-202-4/+5
|
* Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-192-4/+3
|
* Revert "Part one"Filip Gawin2020-04-181-1/+1
| | | | This reverts commit 63951d9b957b30a110f42a03edb4833cbbaf380e.
* Merge branch 'master' of https://github.com/GTAmodding/re3Filip Gawin2020-04-182-5/+3
|\
| * Remove padding fieldsSergeanur2020-04-182-5/+3
| |
* | Part oneFilip Gawin2020-04-171-1/+1
|/
* Remove patchesSergeanur2020-04-177-151/+7
|
* Merge remote-tracking branch 'Fire-Head/master' into StandaloneSergeanur2020-04-174-12/+12
|\ | | | | | | | | # Conflicts: # src/render/Coronas.cpp
| * rem refsFire-Head2020-04-174-12/+12
| |
* | Reverse CWorldsaml1er2020-04-162-3/+3
|/
* Merge pull request #399 from saml1er/masterNikolay Korolev2020-04-122-20/+302
|\ | | | | CObject complete
| * CObject fixessaml1er2020-04-111-13/+13
| |
| * Addendum to previous commitsaml1er2020-04-101-2/+1
| |
| * Refactor CObject::ObjectDamage switch statementsaml1er2020-04-101-105/+102
| |
| * Fix cast in CObject::ObjectDamagesaml1er2020-04-101-1/+1
| |
| * Refactor CObject::ObjectDamagesaml1er2020-04-102-142/+141
| |
| * Fix Object.h and Object.cpp indentationsaml1er2020-04-102-235/+235
| |
| * CObject completesaml1er2020-04-102-13/+300
| |
* | fuck you git, i fixed this alreadyaap2020-04-101-1/+1
|/
* fixed questionable RW usage; changed radar mask to PS2 techinqueaap2020-04-092-2/+2
|
* Glass doneFire-Head2020-04-012-4/+4
|
* CCopPed done and #include cleanuperay orçunus2020-03-282-1/+2
|
* remove include <new> from common.haap2020-03-283-0/+6
|
* Fixes for Serge's reviewFilip Gawin2020-03-221-1/+1
|
* CPopulation done, CCopPed and fixeseray orçunus2020-03-112-2/+6
|
* CPopulation 3 and fixeseray orçunus2020-02-272-1/+42
|
* script 900-999Nikolay Korolev2020-02-151-1/+1
|
* Fix Projectile Air ResistanceSergeanur2020-01-311-1/+1
|
* Fixing Projectile codeSergeanur2020-01-073-1/+16
|
* bug fixesNikolay Korolev2020-01-012-0/+4
|
* making particleobject compile on vs2015aap2019-12-281-1/+1
|
* Frontend, Peds & logic and overflow fixeseray orçunus2019-11-121-1/+2
|
* Logic fix in CParticleObject::UpdateAllSergeanur2019-10-121-2/+2
|
* CPickupsSergeanur2019-10-032-3/+7
|
* AnimViewer messages, Particle fix, Pedseray orçunus2019-08-171-4/+4
|
* CParticleObject done, cDMAudio doneFire-Head2019-08-152-17/+1193
|
* Running script part 3Nikolay Korolev2019-07-252-0/+12
|
* fixed buoyancy; implemented CAutomobile::ProcessBuoyancyaap2019-07-242-6/+8
|
* CAutomobile ctor, car spawner, fixesaap2019-07-191-1/+1
|
* more CAutomobileaap2019-07-092-0/+2
|
* more CAutomobileaap2019-07-082-1/+9
|
* cleaned up patching of virtual functions; started CAutomobileaap2019-07-0812-45/+71
|
* the great reorganizationaap2019-07-0714-0/+682
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:35:29 +0100