Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into miami | Sergeanur | 2020-07-13 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | Fix displaying stats | Filip Gawin | 2020-07-03 | 1 | -2/+2 |
| | | |||||
| * | fixes for CPhysical and friends | aap | 2020-05-22 | 1 | -9/+9 |
| | | |||||
* | | Noskillx's PR + fix .set loading | eray orçunus | 2020-07-06 | 1 | -4/+0 |
| | | |||||
* | | some stats tweaks; saves dead again | Nikolay Korolev | 2020-06-07 | 1 | -2/+5 |
| | | |||||
* | | some CAutomobile | aap | 2020-05-31 | 1 | -0/+1 |
| | | |||||
* | | VC CParticle done | Fire-Head | 2020-05-27 | 1 | -0/+3 |
| | | |||||
* | | CPhysical | aap | 2020-05-22 | 1 | -9/+10 |
| | | |||||
* | | script revision | Nikolay Korolev | 2020-05-20 | 1 | -0/+1 |
| | | |||||
* | | sync with upstream | Nikolay Korolev | 2020-05-17 | 1 | -1/+1 |
|\ \ | |||||
| * | | Weapon fixes and thingies | eray orçunus | 2020-05-17 | 1 | -0/+1 |
| | | | |||||
* | | | more script stuff | Nikolay Korolev | 2020-05-16 | 1 | -0/+4 |
|/ / | |||||
* | | minimal weather stuff + multiple bugfixes | Nikolay Korolev | 2020-05-16 | 1 | -0/+1 |
| | | |||||
* | | garages + script | Nikolay Korolev | 2020-05-11 | 1 | -0/+2 |
|/ | |||||
* | rem refs | Fire-Head | 2020-04-17 | 1 | -53/+53 |
| | |||||
* | CStats finished | Sergeanur | 2020-04-09 | 1 | -12/+15 |
| | |||||
* | stats fix | Nikolay Korolev | 2020-04-06 | 1 | -3/+0 |
| | |||||
* | Merge branch 'master' into master | Nikolay Korolev | 2020-04-06 | 1 | -0/+2 |
|\ | |||||
| * | garage update part 2 | Nikolay Korolev | 2020-03-28 | 1 | -0/+1 |
| | | |||||
| * | garages part 1 | Nikolay Korolev | 2020-03-28 | 1 | -0/+1 |
| | | |||||
* | | Implement Init for Stats | PerikiyoXD | 2020-03-24 | 1 | -3/+12 |
|/ | |||||
* | CGame::Initialise | Nikolay Korolev | 2020-03-22 | 1 | -0/+2 |
| | |||||
* | Style fixes | Wes Hampson | 2020-03-11 | 1 | -1/+1 |
| | |||||
* | GenericSave complete, still needs some testing | Wes Hampson | 2020-03-11 | 1 | -0/+1 |
| | |||||
* | script 1000-1154 | Nikolay Korolev | 2020-02-16 | 1 | -0/+32 |
| | |||||
* | script 900-999 | Nikolay Korolev | 2020-02-15 | 1 | -0/+2 |
| | |||||
* | Finishing CDarkel | Sergeanur | 2020-01-07 | 1 | -0/+2 |
| | |||||
* | script 800-899 | Nikolay Korolev | 2020-01-03 | 1 | -0/+1 |
| | |||||
* | merge with upstream | Nikolay Korolev | 2020-01-01 | 1 | -0/+2 |
|\ | |||||
| * | CPlayerInfo done | eray orçunus | 2019-12-16 | 1 | -0/+2 |
| | | |||||
* | | some not fully tested stuff | Nikolay Korolev | 2020-01-01 | 1 | -0/+16 |
|/ | |||||
* | Full CGameLogic | Sergeanur | 2019-10-08 | 1 | -0/+4 |
| | |||||
* | AnimViewer messages, Particle fix, Peds | eray orçunus | 2019-08-17 | 1 | -1/+1 |
| | |||||
* | implemented CHeli | aap | 2019-08-04 | 1 | -0/+2 |
| | |||||
* | Fluff | guard3 | 2019-07-17 | 1 | -0/+1 |
| | |||||
* | blah | _AG | 2019-07-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/gtamodding/re3 | _AG | 2019-07-07 | 1 | -3/+8 |
| | |||||
* | the great reorganization | aap | 2019-07-07 | 1 | -0/+9 |