summaryrefslogtreecommitdiffstats
path: root/src/core/Game.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* CStreaming done, hopefullyaap2020-08-201-4/+1
|
* Merge pull request #693 from majesticCoding/miamiaap2020-08-201-0/+4
|\ | | | | stable CScriptPaths
| * stable CScriptPathsmajestic2020-08-201-0/+4
| |
* | Merge remote-tracking branch 'origin/miami' into miamiSergeanur2020-08-191-0/+5
|\| | | | | | | | | # Conflicts: # src/core/config.h
| * neo pipelines; postfx fixaap2020-08-191-0/+5
| |
* | Merge branch 'master' into miamiSergeanur2020-08-191-4/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * remove CFOeray orçunus2020-08-161-5/+0
| |
| * extended postfx and sniper hud fixaap2020-08-131-0/+4
| |
* | implemented extended postfxaap2020-08-111-0/+4
| |
* | CWindModifiersmajestic2020-08-101-0/+2
|\ \
| * | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-071-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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/+3
| | | | | | | | | | | | Fixes are already in miami
* | | CWindModifiersmajestic2020-08-091-0/+2
|/ /
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-07-291-4/+4
|\|
| * rename shitaap2020-07-291-4/+4
| |
* | Merge branch 'master' into miamiSergeanur2020-07-291-4/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/RpAnimBlend.cpp # src/audio/oal/stream.cpp # src/audio/sampman.h # src/control/Pickups.cpp # src/core/Collision.cpp # src/core/Collision.h # src/core/FileLoader.cpp # src/core/FileMgr.cpp # src/core/FileMgr.h # src/core/Streaming.cpp # src/core/Streaming.h # src/core/SurfaceTable.h # src/modelinfo/VehicleModelInfo.h # src/peds/Ped.cpp # src/rw/RwHelper.cpp # src/rw/RwHelper.h # src/skel/glfw/glfw.cpp # src/skel/platform.h # src/text/Text.cpp # src/text/Text.h # src/vehicles/CarGen.cpp # src/vehicles/Heli.cpp
| * Dual pass rendering for RW 3.3Sergeanur2020-07-291-4/+14
| |
| * Fix/change some Windows defineeray orçunus2020-07-251-1/+1
| |
* | CCopPed, except spike trapseray orçunus2020-07-281-0/+9
| |
* | 64-bit on Windowseray orçunus2020-07-241-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-07-221-0/+6
|\| | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # src/core/Frontend.cpp # src/core/Frontend.h # src/peds/Ped.cpp # src/peds/Ped.h # src/render/Renderer.cpp # src/vehicles/Plane.cpp
| * Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcherSergeanur2020-07-221-0/+6
| |
* | Merge branch 'master' into miamiSergeanur2020-07-131-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-2/+2
| |
* | Noskillx's PR + fix .set loadingeray orçunus2020-07-061-7/+4
| |
* | Merge pull request #647 from Fire-Head/miamiaap2020-07-041-1/+2
|\ \ | | | | | | miami CParticleObject
| * | miami pobjFire-Head2020-07-031-1/+2
| | |
* | | remove TheText.Load() from CGame::InitialiseSergeanur2020-06-301-1/+0
|/ /
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-291-4/+78
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/soundlist.h # src/control/Script.cpp # src/control/ScriptCommands.h # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Pad.cpp # src/core/Pad.h # src/core/config.h # src/entities/Entity.cpp # src/render/Credits.cpp # src/render/Fluff.cpp # src/render/Hud.cpp # src/render/MBlur.cpp # src/render/Timecycle.cpp # src/skel/glfw/glfw.cpp # src/skel/win/win.cpp # src/text/Text.cpp
| * Merge branch 'master' into ps2menuFire_Head2020-06-291-2/+4
| |\
| * | mips overdoseFire-Head2020-06-271-4/+169
| | |
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-031-2/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | Frontend customization functions, freecam toggle, minor thingseray orçunus2020-05-281-2/+4
| |/
* | DrawStandardMenus, VC menu array and minor fixeseray orçunus2020-06-011-17/+2
| |
* | game logicNikolay Korolev2020-05-311-0/+1
| |
* | VC WaterFire-Head2020-05-271-1/+8
| |
* | Merge pull request #583 from erorcun/miamiaap2020-05-241-9/+10
|\ \ | | | | | | Menu borders and weapon fixes
| * | Menu borders and weapon fixeseray orçunus2020-05-241-9/+10
| | |
* | | set piecesNikolay Korolev2020-05-231-0/+4
|/ /
* | Merge pull request #579 from Xinerki/miamierorcun2020-05-221-1/+1
|\ \ | | | | | | InitAfterFocusLoss compile fix
| * | InitAfterFocusLoss compile fixXin2020-05-221-1/+1
| | |
* | | Merge pull request #574 from Xinerki/miamierorcun2020-05-221-0/+16
|\| | | | | | | | many additions
| * | scuffed InitAfterFocusLoss implementationXinerki2020-05-211-0/+16
| | |
* | | VC CMenuManager struct, ctor etc.eray orçunus2020-05-221-6/+6
|/ /
* | finished CFileLoader; some COcclusion stubsaap2020-05-191-0/+2
| |
* | Weapon layer in Pedseray orçunus2020-05-151-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-121-1/+1
|\| | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp
| * Linux build supporteray orçunus2020-05-111-1/+1
| |
* | CClouds; disabled object clipping for SA camaap2020-05-121-0/+7
| |
* | Merge branch 'master' into miamiSergeanur2020-05-111-16/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Merge pull request #509 from Fire-Head/mastererorcun2020-05-111-16/+3
| |\ | | | | | | OpenAL update
| | * oal updFire-Head2020-05-041-16/+3
| | |
* | | Merge branch 'master' into miamiSergeanur2020-05-101-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h
| * | Place debug menu under ifdefSergeanur2020-05-091-1/+2
| | |
| * | Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULLSergeanur2020-05-051-6/+0
| | |
* | | new zone stuffaap2020-05-061-3/+0
| | |
* | | getting the vice city map to workaap2020-05-051-2/+2
| | |
* | | cleaned up MIAMI ifdefsaap2020-05-051-21/+0
| | |
* | | Revert "Remove Miami stuff"Sergeanur2020-05-051-0/+11
|/ / | | | | | | This reverts commit 9960c411933f9a804eb5f6840d75ad00fd255252.
* | Remove Miami stuffSergeanur2020-05-051-11/+0
| |
* | implemented most of streamed collisions and big buildingsaap2020-05-051-16/+10
| |
* | GTA_ZONECULL defineaap2020-05-031-0/+6
| |
* | FixesSergeanur2020-04-271-1/+1
|/
* Initial GLFW supporteray orçunus2020-04-261-1/+1
|
* implemented debugmenuaap2020-04-241-1/+1
|
* Crossplatform work continueseray orçunus2020-04-221-2/+0
|
* Merge pull request #477 from ShFil119/mingwshfil2020-04-201-1/+1
|\ | | | | Try to make code working on more platforms
| * Try to build with mingwFilip Gawin2020-04-201-1/+1
| |
* | update librw (matfx)aap2020-04-201-0/+8
| |
* | Add polish lang supportFire-Head2020-04-191-0/+1
|/
* Revert "Part one"Filip Gawin2020-04-181-1/+1
| | | | This reverts commit 63951d9b957b30a110f42a03edb4833cbbaf380e.
* Part oneFilip Gawin2020-04-171-1/+1
|
* Remove patchesSergeanur2020-04-171-18/+1
|
* rem refsFire-Head2020-04-171-9/+13
|
* first fake RW implementation workingaap2020-04-161-0/+4
|
* scene initNikolay Korolev2020-04-121-1/+1
|
* PS2 Cheats, restored R*namesFire-Head2020-04-091-1/+1
|
* (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowModeFire-Head2020-04-091-6/+14
|
* Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-03-301-49/+398
|\
| * fixed PS2 buildNikolay Korolev2020-03-291-0/+2
| |
| * style & cosmetic fixesFire-Head2020-03-291-8/+0
| |
| * style & cosmetic fixesFire-Head2020-03-291-14/+14
| |
| * CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* namesFire-Head2020-03-281-45/+400
| |
* | Add russian lang supportSergeanur2020-03-301-0/+3
|/
* CCopPed done and #include cleanuperay orçunus2020-03-281-0/+2
|
* CGame::InitialiseNikolay Korolev2020-03-221-1/+156
|
* AccidentManagerSergeanur2020-01-111-1/+1
|
* Fixes&Pedseray orçunus2019-10-251-0/+3
|
* CGame::FinalShutdownSergeanur2019-10-211-2/+15
|
* typo fixnmzik2019-10-191-1/+1
|
* getter and enum fixnmzik2019-10-191-2/+2
|
* CGame::Process() && CGame::ReloadIPLsnmzik2019-10-191-1/+151
|
* More audio pedFilip Gawin2019-08-271-1/+1
|
* shadows doneFire-Head2019-07-241-1/+16
|
* the great reorganizationaap2019-07-071-0/+23