Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'miami' into lcs | Sergeanur | 2021-06-30 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/control/Script4.cpp # src/core/Frontend.cpp | ||||
| * | rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake) | withmorten | 2021-06-28 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-22 | 1 | -4/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 comments | withmorten | 2021-01-22 | 1 | -2/+0 |
| | | |||||
| * | m_nWantedLevel -> GetWantedLevel() | withmorten | 2021-01-22 | 1 | -2/+2 |
| | | |||||
* | | some more script | Nikolay Korolev | 2021-01-20 | 1 | -2/+4 |
|/ | |||||
* | rename m_vehEnterType -> m_vehDoor | aap | 2021-01-13 | 1 | -2/+2 |
| | |||||
* | bug of the decade | aap | 2021-01-12 | 1 | -1/+1 |
| | |||||
* | merge attempt | Nikolay Korolev | 2020-12-19 | 1 | -2/+2 |
|\ | |||||
| * | PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes | Sergeanur | 2020-12-18 | 1 | -270/+370 |
| | | |||||
| * | Use SetPedState | Sergeanur | 2020-12-15 | 1 | -1/+1 |
| | | |||||
* | | PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes | Sergeanur | 2020-12-18 | 1 | -271/+355 |
| | | |||||
* | | Fix | Sergeanur | 2020-08-24 | 1 | -1/+1 |
| | | |||||
* | | Wheelie opcode | eray orçunus | 2020-08-14 | 1 | -18/+18 |
| | | |||||
* | | Stats(except displaying), PlayerInfo, marker fix | eray orçunus | 2020-08-14 | 1 | -67/+296 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-07-13 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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_GENERIC | Sergeanur | 2020-07-13 | 1 | -1/+1 |
| | | |||||
| * | Bettah car enter canceling, fix CFO crash, ped objs. renaming | eray orçunus | 2020-07-03 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-06-29 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | updated player control names | Nikolay Korolev | 2020-06-21 | 1 | -2/+2 |
| | | |||||
| * | fixes, mostly from miami | eray orçunus | 2020-06-04 | 1 | -1/+1 |
| | | |||||
* | | CWanted, anim fix, ped objs renaming, remove III beta features | eray orçunus | 2020-06-22 | 1 | -1/+1 |
| | | |||||
* | | killing peds increase chaos level | eray orçunus | 2020-06-20 | 1 | -0/+2 |
| | | |||||
* | | Peds, eSound and PedState enum, fixes | eray orçunus | 2020-06-03 | 1 | -1/+1 |
| | | |||||
* | | game logic | Nikolay Korolev | 2020-05-31 | 1 | -0/+2 |
| | | |||||
* | | new script commands - mostly stubs | Nikolay Korolev | 2020-05-22 | 1 | -2/+3 |
| | | |||||
* | | script revision | Nikolay Korolev | 2020-05-19 | 1 | -2/+2 |
| | | |||||
* | | sync with upstream | Nikolay Korolev | 2020-05-17 | 1 | -0/+1 |
|\ \ | |||||
| * | | Weapon fixes and thingies | eray orçunus | 2020-05-17 | 1 | -0/+1 |
| | | | |||||
* | | | more script stuff | Nikolay Korolev | 2020-05-16 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-05-14 | 1 | -36/+30 |
|\| | | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp | ||||
| * | Changing save/load for CPlayerInfo because of alignment crap | Sergeanur | 2020-05-13 | 1 | -36/+30 |
| | | |||||
* | | VC vehicles just barely working now | aap | 2020-05-07 | 1 | -1/+1 |
|/ | |||||
* | More use of GetModelIndex | Sergeanur | 2020-05-05 | 1 | -2/+2 |
| | |||||
* | SetPosition, final part | Sergeanur | 2020-05-05 | 1 | -3/+3 |
| | |||||
* | Adding getters and setters for type and status | Sergeanur | 2020-04-30 | 1 | -5/+5 |
| | |||||
* | Try to build with mingw | Filip Gawin | 2020-04-20 | 1 | -22/+22 |
| | |||||
* | Merge pull request #474 from Nick007J/master | erorcun | 2020-04-19 | 1 | -0/+8 |
|\ | | | | | Bug fixes, mostly replay; added RegisterReference for player ped pointer | ||||
| * | replays bug fix | Nikolay Korolev | 2020-04-18 | 1 | -0/+8 |
| | | |||||
* | | Struct cleanup, various fixes, enable PS2 rand | eray orçunus | 2020-04-19 | 1 | -2/+2 |
|/ | |||||
* | Revert "Part one" | Filip Gawin | 2020-04-18 | 1 | -1/+1 |
| | | | | This reverts commit 63951d9b957b30a110f42a03edb4833cbbaf380e. | ||||
* | Part one | Filip Gawin | 2020-04-17 | 1 | -1/+1 |
| | |||||
* | Remove patches | Sergeanur | 2020-04-17 | 1 | -18/+1 |
| | |||||
* | normalized line endings to LF | aap | 2020-04-09 | 1 | -450/+450 |
| | |||||
* | CCopPed done and #include cleanup | eray orçunus | 2020-03-28 | 1 | -0/+3 |
| | |||||
* | CPopulation done, CCopPed and fixes | eray orçunus | 2020-03-11 | 1 | -1/+1 |
| | |||||
* | Fixes and cleanup | eray orçunus | 2020-03-02 | 1 | -1/+1 |
| | |||||
* | some changes | Nikolay Korolev | 2020-02-23 | 1 | -2/+2 |
| | |||||
* | CPlayerPed continues (#294) | erorcun | 2020-01-23 | 1 | -10/+10 |
| | |||||
* | fixed vehicle enter crash | Nikolay Korolev | 2020-01-01 | 1 | -1/+1 |
| | |||||
* | CPlayerInfo done | eray orçunus | 2019-12-16 | 1 | -6/+257 |
| | |||||
* | CPhone, CPlayerInfo, CFire, CWorld | eray orçunus | 2019-12-05 | 1 | -9/+236 |
| | |||||
* | script 500-599 plus bugfix | Nikolay Korolev | 2019-10-21 | 1 | -0/+16 |
| | |||||
* | Full CGameLogic | Sergeanur | 2019-10-08 | 1 | -4/+38 |
| | |||||
* | PlayerSkin | Sergeanur | 2019-09-28 | 1 | -1/+23 |
| | |||||
* | World and Peds | eray orçunus | 2019-09-12 | 1 | -0/+1 |
| | |||||
* | Running script part 3 | Nikolay Korolev | 2019-07-25 | 1 | -0/+9 |
| | |||||
* | More frontend inputs. | _AG | 2019-07-10 | 1 | -0/+8 |
| | |||||
* | more CVehicle | aap | 2019-07-09 | 1 | -1/+2 |
| | |||||
* | the great reorganization | aap | 2019-07-07 | 1 | -0/+5 |