summaryrefslogtreecommitdiffstats
path: root/src/objects/Object.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)withmorten2021-06-281-3/+3
|
* Pool fixes + peds not forming circle fixerorcun2021-06-241-4/+26
|
* 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 pull request #869 from Nick007J/miamiaap2020-12-091-1/+1
|\ | | | | garages revision + fixes
| * sync with upstreamNikolay Korolev2020-12-081-143/+442
| |\
| * | 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-301-94/+109
| |
* | Implement the missing damage effects and fix the existing onesWalied K. Yassen2020-11-301-138/+320
| |
* | 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
|/
* Possibly fix pickup money textSergeanur2020-11-081-2/+2
|
* CObject::Rendermajestic2020-11-011-2/+104
|
* 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
| |
* | Fix sniper and water creatures bug, mark some fileseray orçunus2020-10-091-5/+18
| |
* | CPhysicalaap2020-05-221-1/+5
| |
* | Fixes for melees and various thingseray orçunus2020-05-201-5/+5
| |
* | CEntity and friendsaap2020-05-191-2/+8
| |
* | script revisionNikolay Korolev2020-05-191-0/+15
| |
* | Merge branch 'master' into miamiSergeanur2020-05-161-4/+5
|\|
| * Remove unused audio enumSergeanur2020-05-161-4/+5
| |
| * sorted out object collision enumsaap2020-05-061-8/+8
| |
| * got rid of superfluous enumaap2020-05-061-8/+8
| |
* | sorted out object collision enumsaap2020-05-061-8/+8
| |
* | got rid of superfluous enumaap2020-05-061-8/+8
| |
* | setting some areas so objects dont disappearaap2020-05-061-0/+1
|/
* Make CBaseModelInfo fields protectedSergeanur2020-05-051-1/+1
|
* More use of GetModelIndexSergeanur2020-05-051-6/+6
|
* Adding getters and setters for type and statusSergeanur2020-04-301-1/+1
|
* Try to build with mingwFilip Gawin2020-04-201-2/+2
|
* Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-191-2/+2
|
* Remove patchesSergeanur2020-04-171-35/+1
|
* Merge remote-tracking branch 'Fire-Head/master' into StandaloneSergeanur2020-04-171-2/+2
|\ | | | | | | | | # Conflicts: # src/render/Coronas.cpp
| * rem refsFire-Head2020-04-171-2/+2
| |
* | Reverse CWorldsaml1er2020-04-161-2/+2
|/
* 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-101-142/+140
|
* Fix Object.h and Object.cpp indentationsaml1er2020-04-101-228/+228
|
* CObject completesaml1er2020-04-101-9/+282
|
* Glass doneFire-Head2020-04-011-2/+2
|
* CCopPed done and #include cleanuperay orçunus2020-03-281-0/+1
|
* remove include <new> from common.haap2020-03-281-0/+2
|
* CPopulation 3 and fixeseray orçunus2020-02-271-1/+39
|
* bug fixesNikolay Korolev2020-01-011-0/+2
|
* CPickupsSergeanur2019-10-031-1/+3
|
* Running script part 3Nikolay Korolev2019-07-251-0/+10
|
* more CAutomobileaap2019-07-091-0/+1
|
* more CAutomobileaap2019-07-081-1/+8
|
* cleaned up patching of virtual functions; started CAutomobileaap2019-07-081-2/+9
|
* the great reorganizationaap2019-07-071-0/+93