summaryrefslogtreecommitdiffstats
path: root/src/core/World.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* fixed top gearNikolay Korolev2020-11-111-0/+1
|
* CWorld doneNikolay Korolev2020-11-101-80/+170
|
* Merge branch 'master' into miamiSergeanur2020-10-181-9/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-9/+9
| |
* | weaponsFire-Head2020-08-271-2/+11
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-071-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/RoadBlocks.cpp # src/core/Collision.h # src/core/Pad.cpp # src/core/SurfaceTable.h # src/core/main.cpp # src/core/re3.cpp # src/peds/Population.cpp # src/render/Fluff.cpp # src/render/Shadows.cpp # src/render/Shadows.h # src/render/Sprite2d.cpp # src/weapons/BulletInfo.cpp
| * Squeeze performance option, minor fixeseray orçunus2020-08-031-0/+5
| | | | | | | | Fixes are already in miami
* | Merge branch 'master' into miamiSergeanur2020-07-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/CarAI.cpp # src/control/Phones.cpp # src/control/Phones.h # src/control/Record.cpp # src/control/Restart.cpp # src/control/Script.cpp # src/core/Collision.cpp # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.h # src/core/Streaming.cpp # src/core/TempColModels.cpp # src/core/Wanted.cpp # src/core/Zones.cpp # src/core/config.h # src/core/main.cpp # src/core/re3.cpp # src/entities/Entity.cpp # src/entities/Physical.cpp # src/extras/frontendoption.cpp # src/modelinfo/ModelInfo.cpp # src/modelinfo/PedModelInfo.cpp # src/peds/CivilianPed.cpp # src/peds/CopPed.cpp # src/peds/EmergencyPed.cpp # src/peds/Ped.cpp # src/peds/Ped.h # src/peds/Population.cpp # src/render/Renderer.cpp # src/save/GenericGameStorage.cpp # src/skel/win/win.cpp # src/vehicles/Automobile.cpp # src/vehicles/Boat.cpp # src/vehicles/Boat.h # src/vehicles/Vehicle.cpp
| * Rename LEVEL_NONE to LEVEL_GENERICSergeanur2020-07-131-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-151-1/+1
|\| | | | | | | | | | | | | | | | | | | # 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
| * more cleanupaap2020-06-141-17/+17
| |
| * little CCam cleanup; fix in CWorld sphere testaap2020-06-121-0/+4
| |
* | some more camera stuffaap2020-06-141-17/+17
| |
* | Message box, letterbox and ped attachingeray orçunus2020-06-071-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-031-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/GameLogic.cpp # src/control/PathFind.cpp # src/control/RoadBlocks.cpp # src/control/Script.cpp # src/control/Script.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/core/TempColModels.cpp # src/core/config.h # src/core/re3.cpp # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/modelinfo/VehicleModelInfo.h # src/render/Skidmarks.h # src/render/WaterLevel.cpp # src/save/GenericGameStorage.h # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/DamageManager.cpp # src/vehicles/Vehicle.cpp # src/vehicles/Vehicle.h
| * fixNikolay Korolev2020-05-281-2/+2
| |
| * small fixesaap2020-05-251-14/+14
| |
| * small fixesaap2020-05-191-1/+1
| |
* | CVehicleaap2020-05-251-30/+32
| |
* | Fixes for melees and various thingseray orçunus2020-05-201-3/+2
| |
* | CEntity and friendsaap2020-05-191-10/+14
| |
* | Weapon fixes and thingieseray orçunus2020-05-171-15/+0
| |
* | sync with upstreamNikolay Korolev2020-05-161-1/+5
|\ \
| * | Weapon layer in Pedseray orçunus2020-05-151-1/+5
| | |
* | | ped attractors doneNikolay Korolev2020-05-161-0/+55
|/ /
* | 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
| |
* | RpAnimBlend and frame updatesaap2020-05-101-0/+2
| |
* | CPedModelInfoaap2020-05-101-5/+4
| |
* | CClumpModelInfo; little fixesaap2020-05-101-1/+5
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-061-7/+7
|\| | | | | | | | | # Conflicts: # src/render/Renderer.cpp
| * IsStaticNikolay Korolev2020-05-061-7/+7
| |
| * little cworld bugfixaap2020-05-061-1/+1
| |
* | CSphere and CBox for CColModelaap2020-05-061-3/+5
| |
* | little cworld bugfixaap2020-05-061-1/+1
|/
* merged masteraap2020-05-051-10/+8
|\
| * More use of GetModelIndexSergeanur2020-05-051-10/+8
| |
* | implemented most of streamed collisions and big buildingsaap2020-05-051-2/+2
|/
* SetPosition, final partSergeanur2020-05-051-10/+5
|
* implemented most of vice city path systemaap2020-05-031-2/+2
|
* SetPosition, part 1Sergeanur2020-05-021-2/+2
|
* Adding getters and setters for type and statusSergeanur2020-04-301-7/+7
|
* implemented skinned peds, no cutscene hands yetaap2020-04-241-0/+5
|
* Try to build with mingwFilip Gawin2020-04-201-38/+38
|
* replays bug fixNikolay Korolev2020-04-181-0/+15
|
* Remove patchesSergeanur2020-04-171-43/+14
|
* Fix CWorld::FindObjectsOfTypeInRangeSectorList bugsaml1er2020-04-171-8/+10
|
* Apply clang format to CWorldsaml1er2020-04-171-938/+1031
|
* CWorld fixessaml1er2020-04-171-220/+151
|
* More CWorld fixessaml1er2020-04-171-24/+24
|
* Fix CWorld::RepositionOneObject bugssaml1er2020-04-171-16/+45
|
* CWorld completesaml1er2020-04-171-22/+125
|
* Merge branch 'master' into worldsaml1er2020-04-161-6/+7
|\ | | | | | | | | | | # Conflicts: # src/core/World.cpp # src/core/World.h
| * Merge pull request #440 from Fire-Head/masterNikolay Korolev2020-04-151-0/+1
| |\ | | | | | | CWeapon done, fixes
| | * CWeapon done, ps2 cheats fixFire-Head2020-04-151-0/+1
| | |
| * | Many fixes and cleanuperay orçunus2020-04-151-2/+2
| |/
* / Reverse CWorldsaml1er2020-04-161-18/+828
|/
* Finished CExplosionSergeanur2020-04-091-0/+2
|
* Merge pull request #366 from Nick007J/masteraap2020-03-291-0/+1
|\ | | | | Garage part 1
| * merge with upstreamNikolay Korolev2020-03-291-0/+1
| |\
| * \ Merge branch 'master' into garages_devNikolay Korolev2020-03-281-35/+36
| |\ \
| * | | garages part 1Nikolay Korolev2020-03-281-0/+1
| | | |
* | | | Merge pull request #369 from erorcun/erorcunerorcun2020-03-291-0/+14
|\ \ \ \ | |_|_|/ |/| | | CShotInfo, CWanted done, Frontend fix
| * | | CShotInfo, CWanted done, Frontend fixeray orçunus2020-03-291-0/+14
| | |/ | |/|
* / | CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* namesFire-Head2020-03-281-0/+1
|/ /
* / Finished CCam; various smaller thingsaap2020-03-271-35/+36
|/
* CGame::InitialiseNikolay Korolev2020-03-221-1/+2
|
* CPopulation done, CCopPed and fixeseray orçunus2020-03-111-22/+29
|
* mergeNikolay Korolev2020-02-221-1/+1
|\
| * Merge pull request #328 from erorcun/erorcunerorcun2020-02-171-1/+1
| |\ | | | | | | CPopulation 1
| | * CPopulation 1eray orçunus2020-02-171-1/+1
| | |
* | | script 1000-1154Nikolay Korolev2020-02-161-0/+1
|/ /
* | sync with upstreamNikolay Korolev2020-02-151-3/+2
|\|
| * cMusicManagerSergeanur2020-02-071-3/+2
| |
* | script 900-999Nikolay Korolev2020-02-151-0/+1
| |
* | script 900-999 initNikolay Korolev2020-02-021-0/+1
|/
* script 800-899Nikolay Korolev2020-01-031-2/+6
|
* CPhone, CPlayerInfo, CFire, CWorlderay orçunus2019-12-051-10/+38
|
* mergeNikolay Korolev2019-10-261-0/+2
|\
| * Fixes for aap review (audio8)Filip Gawin2019-10-261-1/+1
| |
| * More audio (to hook and test)Filip Gawin2019-10-261-1/+1
| |
| * CGame::Process() && CGame::ReloadIPLsnmzik2019-10-191-0/+2
| |
* | script 500-599 plus bugfixNikolay Korolev2019-10-211-0/+13
|/
* Full CGameLogicSergeanur2019-10-081-0/+1
|
* fixed launch in space bugNikolay Korolev2019-09-121-1/+1
|
* Little cleanuperay orçunus2019-09-121-15/+15
|
* World and Pedseray orçunus2019-09-121-1/+247
|
* AnimViewer messages, Particle fix, Pedseray orçunus2019-08-171-1/+5
|
* AnimViewer!eray orçunus2019-08-151-0/+18
|
* implemented CHeliaap2019-08-041-1/+1
|
* cargen + some scriptNikolay Korolev2019-07-271-0/+1
|
* more fixes; started CAutomobile::ProcessControlaap2019-07-161-8/+8
|
* Merge branch 'master' into erorcunaap2019-07-161-0/+2
|\
| * Partial RunningScript part2Nikolay Korolev2019-07-141-0/+2
| |
* | Phone, World, Pederay orçunus2019-07-151-10/+143
|/
* Phone start, ped spinning and cop car fix, and some love to CPederay orçunus2019-07-101-0/+78
| | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
* the great reorganizationaap2019-07-071-0/+718
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 23:20:59 +0100