summaryrefslogtreecommitdiffstats
path: root/src/core/main.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into miamiSergeanur2020-08-151-0/+38
|\ | | | | | | | | | | # Conflicts: # src/control/Darkel.cpp # src/core/main.cpp
| * Original screen grabberSergeanur2020-08-141-0/+38
| |
| * Squeeze performance option, minor fixeseray orçunus2020-08-031-0/+2
| | | | | | | | Fixes are already in miami
* | coronas doneaap2020-08-091-1/+1
| |
* | CCopPed, except spike trapseray orçunus2020-07-281-0/+2
| |
* | Merge pull request #650 from majesticCoding/miamiaap2020-07-201-0/+2
|\ \ | | | | | | COcclusion done, I hope
| * | cosmetic fixesmajestic2020-07-201-0/+2
| | |
* | | Add compatibility with RW 3.4Sergeanur2020-07-181-1/+6
| | |
* | | Merge branch 'master' into miamiSergeanur2020-07-131-2/+15
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Add cutscene borders switch to the menuSergeanur2020-07-111-2/+10
| |
| * keep loading screen, but for a seconderay orçunus2020-07-091-3/+5
| |
| * Disable loading screenSergeanur2020-07-091-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-291-18/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-7/+19
| |\
| | * Revert "FONT_BANK renamed to FONT_STANDARD"Fire-Head2020-06-071-2/+2
| | | | | | | | | | | | This reverts commit 552205dfbaea70628df56a4966d269a81a97d28e.
| * | mips overdoseFire-Head2020-06-271-18/+47
| | |
* | | cleaned up and updated animviewer; fixed animation bugaap2020-06-081-1/+1
| | |
* | | Message box, letterbox and ped attachingeray orçunus2020-06-071-8/+3
| | |
* | | Merge branch 'master' into miamiSergeanur2020-06-071-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/Frontend.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Train.cpp
| * | FONT_BANK renamed to FONT_STANDARDSergeanur2020-06-071-2/+2
| | |
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-031-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | fixed timebar toggleaap2020-06-011-4/+1
| | |
| * | Add files via uploadrollschuh22822020-05-291-0/+8
| | |
| * | Frontend customization functions, freecam toggle, minor thingseray orçunus2020-05-281-1/+0
| | |
| * | all my fixes live in exeseray orçunus2020-05-241-1/+9
| | |
| * | skeleton typosaap2020-05-231-4/+4
| |/
* | VC WaterFire-Head2020-05-271-1/+4
| |
* | Menu borders and weapon fixeseray orçunus2020-05-241-18/+10
| |
* | skeleton typosaap2020-05-231-4/+4
| |
* | Merge pull request #574 from Xinerki/miamierorcun2020-05-221-0/+22
|\ \ | | | | | | many additions
| * | vehicle cheats and debug cheat string displayXinerki2020-05-211-0/+22
| | |
* | | VC CMenuManager struct, ctor etc.eray orçunus2020-05-221-54/+16
|/ /
* | radar spritesaap2020-05-171-1/+0
| |
* | loading screensaap2020-05-171-22/+36
| |
* | Merge branch 'master' into miamiSergeanur2020-05-121-5/+5
|\| | | | | | | | | | | | | | | | | | | | | # 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-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-121-0/+3
|\| | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp
| * remove debug shitaap2020-05-121-3/+0
| |
| * little fixes to CClouds; disabled object clipping for SA camaap2020-05-121-0/+3
| |
| * Linux build supporteray orçunus2020-05-111-0/+3
| |
* | CRendereraap2020-05-111-4/+7
| |
* | Merge branch 'master' into miamiSergeanur2020-05-101-4/+8
|\| | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h
| * Place debug menu under ifdefSergeanur2020-05-091-4/+8
| |
* | getting the vice city map to workaap2020-05-051-1/+1
|/
* few fixesaap2020-04-251-1/+3
|
* implemented debugmenuaap2020-04-241-3/+2
|
* implemented skinned peds, no cutscene hands yetaap2020-04-241-0/+1
|
* Try to build with mingwFilip Gawin2020-04-201-1/+1
|
* Remove patchesSergeanur2020-04-171-26/+1
|
* rem refsFire-Head2020-04-171-11/+6
|
* Default native resolution mode and small camera fixesSergeanur2020-04-151-0/+5
|
* Merge pull request #440 from Fire-Head/masterNikolay Korolev2020-04-151-1/+2
|\ | | | | CWeapon done, fixes
| * CWeapon done, ps2 cheats fixFire-Head2020-04-151-1/+2
| |
* | Merge pull request #429 from Nick007J/masterNikolay Korolev2020-04-151-2/+1
|\ \ | | | | | | Scene edit
| * | scene editNikolay Korolev2020-04-131-2/+1
| | |
* | | Many fixes and cleanuperay orçunus2020-04-151-2/+3
|/ /
* / implemented CTrafficLightsaap2020-04-101-2/+5
|/
* PS2 Cheats, restored R*namesFire-Head2020-04-091-27/+26
|
* cleanupFire-Head2020-04-091-21/+45
|
* (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowModeFire-Head2020-04-091-639/+1264
|
* finished CMotionBlurStreaks, CSpecialFXaap2020-04-071-19/+19
|
* timebarsSergeanur2020-03-311-1/+74
|
* CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* namesFire-Head2020-03-281-2/+1
|
* Finished CCam; various smaller thingsaap2020-03-271-0/+1
|
* merge with upstreamNikolay Korolev2020-03-221-1/+1
|\
| * Fixes for Serge's reviewFilip Gawin2020-03-221-1/+1
| |
| * ConsoleSergeanur2020-03-221-1/+2
| |
* | CGame::InitialiseNikolay Korolev2020-03-221-8/+10
|/
* more stuff + intro fixNikolay Korolev2020-02-241-1/+2
|
* CPlayerPed & CMenuManager (#286)erorcun2020-01-071-13/+43
| | | Make Frontend great again!
* ControllerConfig doneFire-Head2019-10-271-3/+3
| | | | Fix Cam enum
* Aspect ratio fix for player skin menuSergeanur2019-10-071-0/+8
|
* AnimViewer messages, Particle fix, Pedseray orçunus2019-08-171-0/+3
|
* AnimViewer fixeseray orçunus2019-08-151-0/+3
|
* AnimViewer!eray orçunus2019-08-151-1/+31
|
* implemented CTrainaap2019-07-311-0/+1
|
* Merge branch 'master' into masterFire_Head2019-07-241-6/+169
|\
| * updateFire-Head2019-07-241-1/+1
| |
| * shadows doneFire-Head2019-07-241-6/+169
| |
* | implemented col line renderingaap2019-07-191-0/+2
|/
* and of course the last commit didnt fix everythingaap2019-07-101-1/+1
|
* fixed some stuff in frontend, badly broke others; disabled reversed frontend for the momentaap2019-07-101-1/+7
|
* the great reorganizationaap2019-07-071-0/+891
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 12:50:16 +0100