| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| |\
| |
| |
| |
| |
| | |
# Conflicts:
# src/control/Darkel.cpp
# src/core/main.cpp
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| | |
# Conflicts:
# premake5.lua
# src/render/Coronas.cpp
# src/render/Timecycle.cpp
# src/render/Timecycle.h
|
| | | |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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
|
| | | |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| | |
# Conflicts:
# src/modelinfo/ClumpModelInfo.cpp
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| | |
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
