summaryrefslogtreecommitdiffstats
path: root/src/core/config.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* make building with Codewarrior 7 possiblewithmorten2021-01-241-0/+87
|
* fix config.hwithmorten2021-01-221-11/+11
|
* m_nWantedLevel -> GetWantedLevel()withmorten2021-01-221-11/+11
|
* fixed anisotropic filtering; updated librwaap2021-01-211-0/+1
|
* Fix build without FIX_BUGS, divide to 0 fixeserorcun2021-01-131-1/+5
|
* Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiFire-Head2021-01-081-2/+1
|\
| * Add multisamplingSergeanur2021-01-081-2/+1
| |
* | sync with re3Fire-Head2021-01-081-0/+5
|/ | | | | | | | -radardisc shadow fix -fix for the dimension where moon is round -correct radar based on the early gta 3 screenshot -proper scaling based on ps2 gta 3 -ini and debugmenu options
* Make opus available alongside other formatsSergeanur2021-01-071-1/+13
|
* minor refactoringNikolay Korolev2021-01-071-0/+5
|
* Implementing our own WAV decoder to replace SndFileSergeanur2021-01-061-0/+1
|
* NO_ISLAND_LOADING ported from re3Sergeanur2020-12-271-1/+1
|
* make screendrops independent of neo.txd; enable new rendering by defaultaap2020-12-261-8/+5
|
* option for PC controlsaap2020-12-211-0/+1
|
* push/pop memidsaap2020-12-211-1/+1
|
* Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-12-191-2/+6
|\
| * fixesNikolay Korolev2020-12-191-4/+0
| |
| * merge attemptNikolay Korolev2020-12-191-2/+10
| |\
| | * Use scrolling if GRAPHICS_MENU_OPTIONS not defined, like miamierorcun2020-12-161-1/+1
| | |
| | * more PS2 stuff; memory movement doneaap2020-12-031-5/+5
| | |
| | * fast fixNikolay Korolev2020-12-021-1/+1
| | |
| | * added GTA_SCENE_EDITNikolay Korolev2020-12-021-0/+1
| | |
| | * Add GTA_REPLAYSergeanur2020-12-011-0/+1
| | |
| | * GTA_VERSION define and some config.h cleanupaap2020-11-291-8/+18
| | |
| | * Make texture conversion work a bit fasterSergeanur2020-11-281-0/+1
| | |
| | * Add multisampling to librwSergeanur2020-11-281-1/+0
| | |
| | * Merge pull request #823 from aap/masteraap2020-11-221-0/+8
| | |\ | | | | | | | | Neo screen droplets
| | | * neo screen dropletsaap2020-11-191-0/+8
| | | |
| | * | no script loggingNikolay2020-11-211-1/+1
| | |/
| | * Infamous XBOX subtitle outlineerorcun2020-11-191-0/+1
| | |
| | * Merge pull request #820 from withmorten/mission-switchererorcun2020-11-171-0/+5
| | |\ | | | | | | | | add mission switcher from miami
| | | * add mission switcher from miamiwithmorten2020-11-161-0/+5
| | | |
| | * | animation compression from PS2aap2020-11-161-0/+1
| | | |
| | * | move config.h define to CUSTOM_FRONTEND_OPTIONSwithmorten2020-11-161-1/+1
| | | |
| | * | Merge branch 'upstream/master'withmorten2020-11-151-11/+16
| | |\|
| | | * Fix build without CFO, NO_ISLAND_LOADING, save postfx/pipeline multserorcun2020-11-071-11/+14
| | | |
| | | * Allow to handle larger files via 64bit variablesFilip Gawin2020-11-061-0/+2
| | | |
| | * | add bInvertLook4Pad from VC (doesn't get saved yet)withmorten2020-11-051-0/+1
| | |/
| | * Button iconsSergeanur2020-11-051-0/+1
| | |
| | * Merge pull request #795 from withmorten/masteraap2020-11-051-0/+2
| | |\ | | | | | | | | enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds
| | | * add ifdef LIBRW guard for pipelines and colourfilterwithmorten2020-11-011-0/+2
| | | |
| | * | Merge pull request #792 from withmorten/masteraap2020-10-311-4/+21
| | |\| | | | | | | | | fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
| | | * NO_MOVIES and DEBUGMENU not for MASTERwithmorten2020-10-291-2/+3
| | | |
| | | * fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL, add extra defines for menu and game version textwithmorten2020-10-291-4/+20
| | | |
| | * | few more fixes to last commitaap2020-10-291-2/+2
| | | |
| | * | implemented extra model flags for backface culling and alpha test from mobileaap2020-10-291-0/+3
| | |/
* | / anim compressionaap2020-12-181-0/+5
|/ /
* | get rid of all PED_SKIN definesaap2020-12-181-1/+0
| |
* | little cleanup and synch on templates and configaap2020-12-181-11/+15
| |
* | Enable our Linux joystick handlingerorcun2020-12-141-1/+1
| |
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamierorcun2020-12-091-0/+6
|\ \
| * | script from other platforms and unused commandsNikolay Korolev2020-12-051-0/+6
| | |
* | | Frontend cleanup, .INI, CFO, scrollable pageserorcun2020-12-091-15/+19
|/ /
* | Add GTA_REPLAYSergeanur2020-12-011-0/+1
| | | | | | | | | | | | # Conflicts: # src/control/Replay.cpp # src/control/Replay.h
* | Make texture conversion work a bit fasterSergeanur2020-12-011-0/+1
| | | | | | | | | | # Conflicts: # src/core/config.h
* | Xbox message screen, disabled by defaulterorcun2020-11-231-0/+1
| |
* | neo screen dropletsaap2020-11-191-0/+8
| |
* | Frontend: Stats, Map, Audio inputs, Radio selectorerorcun2020-11-171-1/+1
| |
* | urgh, merge and changes to RW layer in one commit.aap2020-11-111-0/+2
|\ \
| * | Merge pull request #795 from withmorten/masteraap2020-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds # Conflicts: # premake5.lua # src/core/config.h
* | | new LCS-style rendereraap2020-11-031-0/+1
|/ /
* | Merge pull request #792 from withmorten/masteraap2020-10-311-4/+20
| | | | | | | | | | | | fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ... # Conflicts: # src/core/Frontend.cpp
* | foobar!aap2020-10-311-1/+1
| |
* | couple of fixes and cleanupaap2020-10-311-1/+1
| |
* | Disable loading screenSergeanur2020-10-301-1/+1
| |
* | ObjectDataSergeanur2020-10-231-1/+1
| |
* | Radar, WaterCannon, win/glfw skelseray orçunus2020-10-171-2/+0
| |
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into neweray orçunus2020-10-121-2/+3
|\ \
| * \ Merge pull request #753 from majesticCoding/miamierorcun2020-10-121-0/+1
| |\ \ | | | | | | | | CWaterCreatures
| | * | CWaterCreaturesmajestic2020-10-081-0/+1
| | | |
| * | | Fix forgotten wanted/busted texteray orçunus2020-10-121-1/+0
| | | |
| * | | Merge pull request #758 from erorcun/miamierorcun2020-10-121-1/+2
| |\ \ \ | | | | | | | | | | Hud, Fire, OnscreenBlaBla
| | * | | Hud, Fire, OnscreenBlaBlaeray orçunus2020-10-121-1/+2
| | |/ /
* | / / SampleManagereray orçunus2020-10-121-2/+0
|/ / /
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-10-111-1/+4
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # gamefiles/TEXT/american.gxt # premake5.lua # src/audio/MusicManager.cpp # src/control/Darkel.cpp # src/control/Script.cpp # src/core/FileLoader.cpp # src/core/Frontend.cpp # src/core/Game.cpp # src/core/Streaming.cpp # src/core/config.h # src/core/re3.cpp # src/extras/frontendoption.cpp # src/extras/frontendoption.h # src/render/Hud.cpp # src/skel/glfw/glfw.cpp # src/vehicles/CarGen.cpp # src/vehicles/Vehicle.cpp # src/weapons/WeaponInfo.cpp # utils/gxt/american.txt
| * Load and write our settings in re3.ini & fixeseray orçunus2020-10-021-3/+4
| |
| * Fixes, mouse AUX buttons, joystick detect menueray orçunus2020-09-301-0/+3
| |
| * Fixes: PS2/PS2-like menu, Hud, new sliding text founderay orçunus2020-09-271-1/+1
| |
| * Fixeseray orçunus2020-09-271-2/+2
| |
| * new frontend customizationeray orçunus2020-08-241-1/+1
| |
| * Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcuneray orçunus2020-08-241-0/+1
| |\
| * | Revert "remove CFO"eray orçunus2020-08-191-0/+1
| | | | | | | | | | | | This reverts commit 0418ba597bc53d08d0244188f4623ebadfdd2876.
* | | better flying cars, some refractoring and fixesRoman Masanin2020-10-011-1/+1
| | |
* | | Restore All Cars are Heli cheateray orçunus2020-09-291-3/+2
| | |
* | | wall climb cheat from LCSNikolay Korolev2020-09-111-0/+1
| | |
* | | CGame done, Peds, fixeseray orçunus2020-08-301-1/+0
| | |
* | | Merge branch 'master' into miamiSergeanur2020-08-241-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/CutsceneMgr.cpp # src/audio/AudioLogic.cpp # src/audio/soundlist.h # src/core/ControllerConfig.cpp # src/core/ControllerConfig.h # src/core/Streaming.cpp # src/peds/PedChat.cpp # src/render/Weather.cpp # src/rw/TexRead.cpp # src/vehicles/Automobile.cpp # src/vehicles/Boat.cpp
| * | accidentally enabled extended stuff....aap2020-08-231-2/+2
| | |
| * | weather fixesaap2020-08-231-2/+2
| | |
| * | Add VEHICLE_FIREWEAPON (disabled by default)Sergeanur2020-08-201-0/+1
| |/
| * Merge branch 'master' of github.com:gtamodding/re3aap2020-08-181-3/+9
| |\
| * | neo pipelinesaap2020-08-181-1/+3
| | |
* | | CStreaming done, hopefullyaap2020-08-201-0/+1
| | |
* | | rw stuff done & other small thingsaap2020-08-201-5/+5
| | |
* | | Merge remote-tracking branch 'origin/miami' into miamiSergeanur2020-08-191-0/+1
|\ \ \ | | | | | | | | | | | | | | | | # Conflicts: # src/core/config.h
| * | | neo pipelines; postfx fixaap2020-08-191-0/+1
| | | |
* | | | Merge branch 'master' into miamiSergeanur2020-08-191-2/+9
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-1/+0
| | |
| * | Island loading and PS2 alpha test added to optionsSergeanur2020-08-161-1/+1
| | |
| * | Graphics menu + MSAASergeanur2020-08-161-1/+8
| |/
| * extended postfx and sniper hud fixaap2020-08-131-0/+1
| |
* | implemented extended postfxaap2020-08-111-0/+1
| |
* | static shadows fix, cutscene shadows switchesFire-Head2020-08-081-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-071-2/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Merge pull request #675 from erorcun/masteraap2020-08-071-1/+10
| |\ | | | | | | Squeeze performance option, minor fixes
| | * Squeeze performance option, minor fixeseray orçunus2020-08-031-1/+10
| | | | | | | | | | | | Fixes are already in miami
| * | VU0 collisionaap2020-08-031-1/+5
| |/
* | CEscalators donemajestic2020-08-041-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-07-291-1/+1
|\|
| * rename shitaap2020-07-291-1/+1
| |
* | Merge branch 'master' into miamiSergeanur2020-07-291-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-0/+1
| |
| * collision fixesaap2020-07-271-0/+1
| |
| * Disable cache for openal for nowFilip Gawin2020-07-251-0/+2
| |
| * Add ps2 audio pathsSergeanur2020-07-231-0/+1
| |
* | CCollision done and fixesaap2020-07-271-1/+2
| |
* | Merge pull request #656 from erorcun/miamierorcun2020-07-221-1/+0
|\ \ | | | | | | Peds, Hud, CFO 1/2, fixes - including zone names
| * | Peds, Hud, CFO 1/2, fixes - including zone nameseray orçunus2020-07-221-1/+0
| | |
* | | made NPC heli rotors rotateaap2020-07-211-1/+1
|/ /
* | Merge pull request #650 from majesticCoding/miamiaap2020-07-201-0/+1
|\ \ | | | | | | COcclusion done, I hope
| * | cosmetic fixesmajestic2020-07-201-0/+1
| | |
* | | Merge branch 'master' into miamiSergeanur2020-07-171-0/+3
|\ \ \ | | |/ | |/| | | | | | | | | | # Conflicts: # src/control/Record.cpp # src/vehicles/Automobile.cpp
| * | Add audio cache for faster initializationSergeanur2020-07-171-0/+3
| | |
* | | Merge branch 'master' into miamiSergeanur2020-07-131-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-0/+1
| | |
| * | enable island loading for noweray orçunus2020-07-101-1/+1
| | |
| * | Disable loading screenSergeanur2020-07-091-1/+2
| | |
| * | Remove island loadingSergeanur2020-07-091-0/+1
| | |
| * | reenabled script loggingNikolay Korolev2020-07-031-1/+1
| | |
| * | Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixeseray orçunus2020-07-021-1/+1
| | |
| * | Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)erorcun2020-07-011-2/+2
| | |
* | | Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixeseray orçunus2020-07-061-1/+0
| |/ |/|
* | fixes from master, menu helper texteray orçunus2020-07-041-1/+1
| |
* | script logging for miamiNikolay Korolev2020-07-011-1/+1
| |
* | cleanupaap2020-06-291-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-291-6/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * menu fixesFire-Head2020-06-291-9/+18
| |
| * script logging fixesNikolay Korolev2020-06-281-0/+4
| |
| * script loggingNikolay Korolev2020-06-211-0/+2
| |
| * some PS2 cam code; fix for arrest camaap2020-06-201-0/+1
| |
* | CWanted, anim fix, ped objs renaming, remove III beta featureseray orçunus2020-06-221-1/+0
| |
* | Peds, mission switcher & fixeseray orçunus2020-06-141-2/+1
| |
* | script fixNikolay Korolev2020-06-131-1/+1
| |
* | miamification of some audio structsSergeanur2020-06-081-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-031-2/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Add files via uploadrollschuh22822020-05-291-2/+2
| |
| * config reorganizationeray orçunus2020-05-281-4/+5
| |
| * Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcuneray orçunus2020-05-281-0/+2
| |\
| | * mission replayNikolay Korolev2020-05-261-0/+2
| | |
| * | Frontend customization functions, freecam toggle, minor thingseray orçunus2020-05-281-0/+1
| |/
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-011-2/+2
|\ \
| * \ Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-06-011-1/+4
| |\ \
| * | | gahhhaap2020-05-311-1/+1
| | | |
| * | | some CAutomobileaap2020-05-311-1/+1
| | | |
* | | | DrawStandardMenus, VC menu array and minor fixeseray orçunus2020-06-011-11/+16
| |/ / |/| |
* | | game logicNikolay Korolev2020-05-311-1/+3
| | |
* | | roadblocksNikolay Korolev2020-05-301-0/+1
|/ /
* | seagulls, shipsFire-Head2020-05-271-1/+2
| |
* | VC WaterFire-Head2020-05-271-0/+2
| |
* | VC CParticle doneFire-Head2020-05-271-1/+1
| |
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-231-5/+0
|\ \
| * | Merge branch 'master' into miamiSergeanur2020-05-231-5/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/control/Script.cpp # src/core/SurfaceTable.cpp # src/core/config.h # src/entities/Physical.cpp # src/entities/Physical.h # src/objects/Object.h # src/skel/skeleton.h # src/vehicles/Vehicle.h
| | * OpenAL configsSergeanur2020-05-221-5/+0
| | |
| | * little cleanup of handlingmgraap2020-05-191-2/+0
| | |
* | | set piecesNikolay Korolev2020-05-231-0/+2
|/ /
* | Merge pull request #574 from Xinerki/miamierorcun2020-05-221-0/+3
|\ \ | | | | | | many additions
| * | make reloadables optionalXinerki2020-05-211-0/+3
| | |
* | | VC CMenuManager struct, ctor etc.eray orçunus2020-05-221-1/+0
|/ /
* | Fixes for melees and various thingseray orçunus2020-05-201-1/+1
| |
* | HandlingMgraap2020-05-191-2/+0
| |
* | finished CFileLoader; some COcclusion stubsaap2020-05-191-0/+2
| |
* | CTextSergeanur2020-05-181-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-121-4/+7
|\| | | | | | | | | | | | | | | | | # 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-4/+7
| |
* | Merge pull request #535 from Nick007J/miamiaap2020-05-111-1/+1
|\ \ | | | | | | garages, carctrl, script
| * \ sync with upstreamNikolay Korolev2020-05-111-1/+2
| |\ \
| * | | garages + scriptNikolay Korolev2020-05-111-1/+1
| | | |
* | | | Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-05-111-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into miamiSergeanur2020-05-111-1/+2
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-1/+2
| | |\ | | | | | | | | OpenAL update
| | | * openal-soft addedFire-Head2020-05-041-2/+2
| | | |
| | | * oal updFire-Head2020-05-041-1/+2
| | | |
* | | | CVisibilityPluginsaap2020-05-111-1/+3
|/ / /
* | | Merge branch 'master' into miamiSergeanur2020-05-101-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h
| * | Place debug menu under ifdefSergeanur2020-05-091-0/+1
| | |
| * | more small fixesaap2020-05-081-0/+3
| | |
| * | Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULLSergeanur2020-05-051-6/+0
| | |
* | | peds starting to workaap2020-05-091-2/+2
| | |
* | | most of animation system done; little stuff here and thereaap2020-05-081-0/+3
| | |
* | | CBaseModelInfo doneaap2020-05-071-3/+3
| | |
* | | VC vehicles just barely working nowaap2020-05-071-1/+1
| | |
* | | checked some of streaming for VC changesaap2020-05-061-3/+3
| | |
* | | new zone stuffaap2020-05-061-6/+5
| | |
* | | implemented most of timecycle and mbluraap2020-05-061-1/+1
| | |
* | | getting the vice city map to workaap2020-05-051-1/+1
| | |
* | | some miami limitsaap2020-05-051-18/+17
| | |
* | | cleaned up MIAMI ifdefsaap2020-05-051-22/+0
| | |
* | | Revert "Remove Miami stuff"Sergeanur2020-05-051-0/+17
|/ / | | | | | | This reverts commit 9960c411933f9a804eb5f6840d75ad00fd255252.
* | Remove Miami stuffSergeanur2020-05-051-17/+0
| |
* | implemented most of streamed collisions and big buildingsaap2020-05-051-0/+6
| |
* | GTA_ZONECULL defineaap2020-05-031-0/+1
| |
* | GTA_BRIDGE and GTA_TRAIN definesaap2020-05-031-0/+5
| |
* | implemented most of vice city path systemaap2020-05-031-0/+11
| |
* | Merge pull request #504 from Sergeanur/PadInputSwitchSergeanur2020-05-021-0/+1
|\ \ | | | | | | Switching pad modes and cheats when player is switching between controller and kb&m
| * | Switching pad modes and cheats when player is switching between controller and kb&mSergeanur2020-05-021-0/+1
| | |
* | | Revert "Disable PED_SKIN for now"Sergeanur2020-05-021-1/+1
| | | | | | | | | | | | This reverts commit d51bf48dcd5756a4c81e8faf61f495c02684c209.
* | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-021-1/+1
|\| |
| * | Disable PED_SKIN for nowSergeanur2020-05-021-1/+1
| | |
* | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-011-0/+1
|\| |
| * | implemented improved video modes for win.cppaap2020-04-291-0/+1
| |/
* | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-271-1/+1
|\|
| * little support for gl3 textures; txd.img enabled againaap2020-04-271-1/+1
| |
* | sync with upstreamNikolay Korolev2020-04-261-0/+2
|\|
| * Merge pull request #489 from Nick007J/masterNikolay Korolev2020-04-261-0/+2
| |\ | | | | | | 1.1 patch stuff + flying controls
| * | A few fixesSergeanur2020-04-261-1/+3
| | |
| * | Initial GLFW supporteray orçunus2020-04-261-1/+1
| | |
* | | pools compatibilityNikolay Korolev2020-04-261-0/+2
| |/ |/|
* | helis done + cheatsNikolay Korolev2020-04-251-0/+2
|/
* implemented skinned peds, no cutscene hands yetaap2020-04-241-0/+1
|
* ps2 particles, sampman oal startedFire-Head2020-04-231-0/+5
|
* camerapickup ps2 codeFire-Head2020-04-201-0/+1
|
* beta OddJob(unique jump etc) sliding textFire-Head2020-04-201-0/+1
|
* Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-191-1/+1
|
* Hide Vehicle/Zone name during Wasted/Busted...gennariarmando2020-04-181-0/+1
| | | | Fixed little mistake in my latest commit.
* rem refsFire-Head2020-04-171-0/+1
|
* Increase alpha entity list capacity for wide screenSergeanur2020-04-161-1/+2
|
* first fake RW implementation workingaap2020-04-161-0/+1
|
* Default native resolution mode and small camera fixesSergeanur2020-04-151-0/+1
|
* CPacManPickupsSergeanur2020-04-131-0/+1
|
* Frontend fixes + triangle for back as defaulteray orçunus2020-04-121-1/+4
|
* Merge remote-tracking branch 'Fire-Head/master'Sergeanur2020-04-091-0/+1
|\ | | | | | | | | # Conflicts: # src/core/Radar.cpp
| * PS2 Cheats, restored R*namesFire-Head2020-04-091-0/+1
| |
* | Merge pull request #390 from Sergeanur/Explosionaap2020-04-091-1/+3
|\ \ | | | | | | Finished CExplosion
| * | Finished CExplosionSergeanur2020-04-091-1/+3
| |/
* / implemented CSkidmarksaap2020-04-081-0/+1
|/
* Merge pull request #385 from aap/masteraap2020-04-081-0/+3
|\ | | | | implemented CRubbish, CShinyTexts, CBrightLights, CMotionBlurStreaks, CSpecialFX
| * finished CMotionBlurStreaks, CSpecialFXaap2020-04-071-0/+1
| |
| * implemented CRubbishaap2020-04-071-0/+1
| |
| * implemented CShinyTextsaap2020-04-071-0/+1
| |
* | Menu maperay orçunus2020-04-071-1/+1
|/
* Merge pull request #379 from erorcun/erorcunaap2020-04-061-0/+1
|\ | | | | Frontend (last-3)
| * Frontend (last-3)eray orçunus2020-04-041-0/+1
| |
* | Merge branch 'master' into garages_devNikolay Korolev2020-04-061-1/+1
|\ \
| * \ Merge pull request #378 from aap/masteraap2020-04-051-1/+1
| |\ \ | | |/ | |/| finished CCamera
| | * CCamera fixesaap2020-04-031-1/+1
| | |
* | | Merge branch 'master' into garages_devNikolay Korolev2020-04-051-0/+2
|\| |
| * | Merge pull request #377 from Fire-Head/masteraap2020-04-031-0/+2
| |\ \ | | |/ | |/| Glass
| | * Glass doneFire-Head2020-04-011-0/+2
| | |
* | | cranes initNikolay Korolev2020-04-051-1/+3
|/ /
* | timebarsSergeanur2020-03-311-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-03-301-0/+5
|\|
| * Merge pull request #366 from Nick007J/masteraap2020-03-291-0/+2
| |\ | | | | | | Garage part 1
| | * merge with upstreamNikolay Korolev2020-03-291-0/+2
| | |\
| | * \ Merge branch 'master' into garages_devNikolay Korolev2020-03-281-2/+8
| | |\ \
| | * | | garages part 1Nikolay Korolev2020-03-281-0/+2
| | | | |
| * | | | Merge pull request #369 from erorcun/erorcunerorcun2020-03-291-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | | CShotInfo, CWanted done, Frontend fix
| | * | | CShotInfo, CWanted done, Frontend fixeray orçunus2020-03-291-0/+1
| | | |/ | | |/|
| * / | rotating FollowPed cam (disabled by default for now)aap2020-03-291-0/+2
| |/ /
* / / Add russian lang supportSergeanur2020-03-301-0/+1
|/ /
* | XInputSergeanur2020-03-271-0/+1
| |
* | Merge pull request #357 from aap/masteraap2020-03-271-0/+2
|\ \ | | | | | | Finished CCam; various smaller things
| * | Finished CCam; various smaller thingsaap2020-03-271-0/+2
| |/
* / CCopPed 2 and fixeseray orçunus2020-03-261-2/+5
|/
* merge with upstreamNikolay Korolev2020-03-221-6/+17
|\
| * Fixes for reviewFilip Gawin2020-03-221-0/+11
| |
| * Implement ProcessGarages + small cleanupFilip Gawin2020-03-221-5/+7
| |
* | CGame::InitialiseNikolay Korolev2020-03-221-0/+4
|/
* bullet traces fixesNikolay Korolev2020-03-221-0/+1
|
* ProcessButtonPresses and fixeseray orçunus2020-03-211-0/+1
|
* replay bug fixes, script bug fixNikolay Korolev2020-03-151-0/+4
|
* mergeNikolay Korolev2020-02-221-0/+2
|\
| * CPopulation 1eray orçunus2020-02-171-0/+2
| |
* | script 1000-1154Nikolay Korolev2020-02-161-0/+2
|/
* MLO, XtraCompsModelInfo, MovingThing, SolidSergeanur2020-01-201-0/+3
|
* FixesSergeanur2020-01-121-0/+1
|
* CPlayerPed & CMenuManager (#286)erorcun2020-01-071-2/+3
| | | Make Frontend great again!
* script 800-899Nikolay Korolev2020-01-031-0/+1
|
* CCivilianPed done & restore peds running to phoneeray orçunus2019-11-261-0/+2
|
* Readme revision (#268)erorcun2019-11-061-5/+5
|
* Renderer fixeseray orçunus2019-11-031-0/+3
|
* Full C3dMarkersSergeanur2019-10-171-0/+1
|
* Added read/write template functions for save data, small Load/Save arguments unificationSergeanur2019-10-081-0/+1
|
* Pedseray orçunus2019-10-061-2/+3
|
* Fixeseray orçunus2019-10-051-4/+2
|
* Triangular radar blipsSergeanur2019-10-051-1/+4
|
* CDarkel, walkaround fixeray orçunus2019-10-051-2/+17
|
* CPickupsSergeanur2019-10-031-1/+6
|
* Added missed config.hSergeanur2019-10-031-0/+1
|
* Fixes & pedseray orçunus2019-10-031-1/+0
|
* Added CUTSCENEDIRSIZE to Config enum and CUTSCENENAMESIZE macroSergeanur2019-09-281-0/+1
|
* Peds, ProcessObjective and fixeseray orçunus2019-09-261-1/+2
|
* CCarCtrlNikolay Korolev2019-09-151-0/+3
|
* Merge pull request #204 from erorcun/erorcunaap2019-09-121-0/+1
|\ | | | | World and Peds
| * World and Pedseray orçunus2019-09-121-0/+1
| |
* | ccarctrlNikolay Korolev2019-09-111-1/+4
|/
* Fix and cancellable car entereray orçunus2019-09-051-0/+1
|
* AnimViewer messages, Particle fix, Pedseray orçunus2019-08-171-0/+1
|
* finished CPathFindaap2019-08-091-0/+6
|
* Merge pull request #178 from Fire-Head/masteraap2019-08-021-0/+2
|\ | | | | sampman done
| * Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-08-021-2/+4
| |\
| * | sampman doneFire-Head2019-08-021-0/+2
| | |
* | | implemented CPlaneaap2019-07-311-0/+1
| |/ |/|
* | cargen + some scriptNikolay Korolev2019-07-271-0/+2
| |
* | fixed dinputaap2019-07-251-2/+2
|/
* Merge branch 'master' into masterFire_Head2019-07-241-1/+2
|\
| * shadows doneFire-Head2019-07-241-1/+2
| |
* | more CWanted; added CEventListaap2019-07-121-0/+1
|/
* more CAutomobileaap2019-07-081-0/+2
|
* IntoTheScripts!Nikolay Korolev2019-07-071-0/+1
|
* the great reorganizationaap2019-07-071-0/+116