summaryrefslogtreecommitdiffstats
path: root/src/core/main.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-07-081-1/+1
|\ | | | | | | | | | | # Conflicts: # README.md # premake5.lua
| * fix screenshot namewithmorten2021-07-031-1/+1
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-06-261-1/+1
|\| | | | | | | | | | | | | # Conflicts: # README.md # premake5.lua # src/render/Particle.cpp
| * fix screenshot name spacewithmorten2021-06-261-1/+1
| |
* | Merge remote-tracking branch 'GitHub/miami' into lcsSergeanur2021-06-241-2/+5
|\|
| * High FPS FixesSergeanur2021-06-241-2/+5
| |
| * Fix some timer callsSergeanur2021-06-241-1/+1
| |
* | Fix some timer callsSergeanur2021-06-241-1/+1
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-04-091-0/+9
|\| | | | | | | | | # Conflicts: # src/modelinfo/PedModelInfo.cpp
| * fix new rendereraap2021-02-281-0/+9
| |
* | Merge branch 'miami' into lcsSergeanur2021-02-261-2/+21
|\| | | | | | | | | | | | | | | | | | | | | # 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
| * add NoMovies ini option, rename gDrawVersionText, always save ini after loadingwithmorten2021-02-181-2/+5
| |
| * add debug render groupsaap2021-02-181-0/+16
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-02-161-4/+72
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * clean up debug menuaap2021-02-131-1/+1
| |
| * fixerorcun2021-02-121-1/+0
| |
| * Cmake version for hashFilip Gawin2021-02-121-5/+3
| |
| * Remove version text, add toggleable debug info(with commit hash!)erorcun2021-02-121-2/+55
| |
| * Fix RW34Sergeanur2021-02-121-1/+1
| |
| * enable screenshots with F12aap2021-02-121-0/+13
| |
| * Fix some UBserorcun2021-01-281-0/+5
| |
* | CColModelaap2021-02-091-0/+1
| |
* | Merge branch 'miami' into lcsSergeanur2021-01-251-2/+19
|\| | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.h # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h
| * make building with Codewarrior 7 possiblewithmorten2021-01-241-2/+19
| |
* | CVehicleModelInfoaap2021-01-241-0/+3
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-2/+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-221-4/+0
| |
* | Merge pull request #963 from Nick007J/lcsaap2021-01-221-1/+1
|\ \ | | | | | | all LCS script commands
| * | syncNikolay Korolev2021-01-171-1/+1
| | |
* | | Merge pull request #975 from aap/lcsaap2021-01-221-22/+26
|\ \ \ | | | | | | | | loadscreens, not accurate
| * | | loadscreens, not accurateaap2021-01-221-22/+26
| |/ /
* | | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-2/+2
|\ \ \ | |/ / |/| / | |/ | | | | | | | | * origin/miami: fuck bletch fixed anisotropic filtering; updated librw fix
| * fixed anisotropic filtering; updated librwaap2021-01-211-2/+2
| |
* | Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcsFire-Head2021-01-131-0/+4
|\ \
| * | Merge branch 'miami' into lcsSergeanur2021-01-131-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * some loose endsaap2021-01-131-0/+4
| | |
| | * update librwaap2021-01-101-1/+1
| | |
* | | Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcsFire-Head2021-01-121-5/+10
|\| |
| * | Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgrSergeanur2021-01-121-0/+4
| |\ \ | | | | | | | | CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
| | * | CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bitSergeanur2021-01-111-0/+4
| | | |
| * | | some useless codeaap2021-01-111-2/+2
| |/ /
| * | env map renderingaap2021-01-101-2/+3
| | |
| * | moved new renderer; implemented leeds building renderingaap2021-01-091-1/+1
| | |
* | | rem gMakeResourcesFire-Head2021-01-121-1/+0
| | |
* | | lcs particleFire-Head2021-01-121-1/+2
|/ /
* | fix phonesaap2021-01-081-1/+1
| |
* | timecycle; some renderingaap2021-01-081-1/+1
|/
* Pad2 fixSergeanur2021-01-021-2/+2
|
* CVarConsoleSergeanur2021-01-021-1/+13
|
* fix custom pipes mem leakaap2020-12-291-15/+1
|
* Dynamically add pipelines options, only if neo.txd existserorcun2020-12-271-8/+0
|
* fix backface cullingaap2020-12-271-0/+2
|
* fix mblur stencilaap2020-12-261-0/+4
|
* push/pop memidsaap2020-12-211-6/+21
|
* main.cpp mostly checked against ps2 nowaap2020-12-201-22/+25
|
* ps2 fixesaap2020-12-201-155/+212
|
* some PS2 thingsaap2020-12-201-0/+5
|
* merge attemptNikolay Korolev2020-12-191-107/+290
|\
| * PreAllocateRwObjectsaap2020-12-171-0/+57
| |
| * AnimViewer fixes, commentary from miamierorcun2020-12-091-15/+11
| |
| * bit more GTA_VERSION and GTA_PS2aap2020-12-041-6/+12
| |
| * added GTA_SCENE_EDITNikolay Korolev2020-12-021-0/+2
| |
| * some more GTA_VERSIONs and CGame tidy-up (not much actual memory moving yet)aap2020-12-011-0/+1
| |
| * added a few registered pointers and memory debugaap2020-11-301-2/+6
| |
| * start using CMemoryHeapaap2020-11-261-102/+227
| |
| * memory heap starting to workaap2020-11-251-1/+1
| |
| * neo screen dropletsaap2020-11-191-1/+16
| |
| * Fix mouse lock/high-dpierorcun2020-11-161-2/+2
| |
| * changes to RW layer so loading foreign files worksaap2020-11-111-0/+4
| |
| * Font: Hud: Use orig. text dimensions, fix right-align calculationserorcun2020-11-091-6/+6
| |
| * Revert "Font: Fix text dimensions"erorcun2020-11-081-1/+1
| | | | | | | | This reverts commit 6729de49b16da9a1be3c95b146ba053bf214c91c.
| * Merge pull request #789 from erorcun/mastererorcun2020-11-021-0/+8
| |\ | | | | | | rewrite CFO + postfx/pipeline options
| | * rewrite CFO + postfx/pipeline optionserorcun2020-10-281-0/+8
| | |
| * | fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL, add extra defines for menu and game version textwithmorten2020-10-291-0/+3
| |/
| * Font: Fix text dimensionserorcun2020-10-251-1/+1
| |
| * clean up timebar ifdefsaap2020-10-251-43/+8
| |
| * Fix OpenGL Z-writeSergeanur2020-09-251-1/+3
| |
| * Merge branch 'master' of github.com:gtamodding/re3aap2020-08-181-0/+38
| |\
| * | neo pipelinesaap2020-08-181-2/+25
| | |
* | | little cleanup and synch on templates and configaap2020-12-181-0/+2
| | |
* | | another fix for new rendereraap2020-12-131-4/+4
| | |
* | | some rendering thingsaap2020-12-131-9/+11
| | |
* | | Frontend cleanup, .INI, CFO, scrollable pageserorcun2020-12-091-0/+8
| | |
* | | AnimViewer done, comment cleanuperorcun2020-12-031-16/+14
| | |
* | | Xbox message screen, disabled by defaulterorcun2020-11-231-1/+6
| | |
* | | Merge pull request #825 from aap/miamiaap2020-11-221-1/+16
|\ \ \ | | | | | | | | neo screen droplets
| * | | neo screen dropletsaap2020-11-191-1/+16
| | | |
* | | | Fix mouse lock/high-dpierorcun2020-11-181-6/+6
|/ / /
* | | ped fix for new rendereraap2020-11-111-2/+2
| | |
* | | move stuff into defineaap2020-11-071-1/+1
| | |
* | | more fixes to new rendereraap2020-11-041-4/+5
| | |
* | | fixed boats for new rendereraap2020-11-041-9/+13
| | |
* | | new LCS-style rendereraap2020-11-031-0/+134
| | |
* | | Merge pull request #792 from withmorten/masteraap2020-10-311-0/+3
| | | | | | | | | | | | | | | | | | fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ... # Conflicts: # src/core/Frontend.cpp
* | | clean up timebar ifdefsaap2020-10-251-37/+7
| | |
* | | Timer, mainerorcun2020-10-231-57/+47
| | |
* | | CSpecialFX and some other classesRoman Masanin2020-10-091-1/+1
| | |
* | | Fix OpenGL Z-writeSergeanur2020-09-251-0/+3
| | | | | | | | | | | | | | | # Conflicts: # src/core/main.cpp
* | | CGame done, Peds, fixeseray orçunus2020-08-301-19/+9
| | |
* | | CStreaming done, hopefullyaap2020-08-201-24/+4
| | |
* | | rw stuff done & other small thingsaap2020-08-201-0/+6
| | |
* | | neo pipelines; postfx fixaap2020-08-191-2/+25
| | |
* | | 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