Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-08-07 | 1 | -18/+1100 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | VU0 collision | aap | 2020-08-03 | 1 | -18/+1100 |
| | | |||||
| * | collision fixes | aap | 2020-07-27 | 1 | -79/+95 |
| | | |||||
* | | CCollision done and fixes | aap | 2020-07-27 | 1 | -9/+2 |
| | | |||||
* | | CCollision done and fixes | aap | 2020-07-27 | 1 | -173/+194 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-07-13 | 1 | -8/+8 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | -16/+16 |
| | | |||||
| * | Remove island loading | Sergeanur | 2020-07-09 | 1 | -2/+27 |
| | | |||||
| * | eSurfaceType | aap | 2020-05-26 | 1 | -14/+14 |
| | | |||||
* | | Ducking, shooting vehicle occupants and weapon fixes | eray orçunus | 2020-06-20 | 1 | -0/+13 |
| | | |||||
* | | Peds, mission switcher & fixes | eray orçunus | 2020-06-14 | 1 | -0/+15 |
| | | |||||
* | | eSurfaceType | aap | 2020-05-26 | 1 | -14/+14 |
| | | |||||
* | | CVehicle | aap | 2020-05-25 | 1 | -3/+6 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-05-12 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | # 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 warnings | Filip Gawin | 2020-05-12 | 1 | -1/+1 |
| | | |||||
* | | CSphere and CBox for CColModel | aap | 2020-05-06 | 1 | -4/+4 |
| | | |||||
* | | cleaned up MIAMI ifdefs | aap | 2020-05-05 | 1 | -149/+0 |
| | | |||||
* | | Revert "Remove Miami stuff" | Sergeanur | 2020-05-05 | 1 | -0/+30 |
|/ | | | | This reverts commit 9960c411933f9a804eb5f6840d75ad00fd255252. | ||||
* | Remove Miami stuff | Sergeanur | 2020-05-05 | 1 | -30/+0 |
| | |||||
* | implemented most of streamed collisions and big buildings | aap | 2020-05-05 | 1 | -0/+32 |
| | |||||
* | Try to build with mingw | Filip Gawin | 2020-04-20 | 1 | -4/+4 |
| | |||||
* | Remove patches | Sergeanur | 2020-04-17 | 1 | -68/+1 |
| | |||||
* | Many fixes and cleanup | eray orçunus | 2020-04-15 | 1 | -2/+3 |
| | |||||
* | finished CCollision | aap | 2020-04-06 | 1 | -2/+81 |
| | |||||
* | remove include <new> from common.h | aap | 2020-03-28 | 1 | -3/+16 |
| | |||||
* | fix typo | Nikolay Korolev | 2019-09-14 | 1 | -1/+1 |
| | |||||
* | DragCarToPoint | Nikolay Korolev | 2019-09-12 | 1 | -0/+2 |
| | |||||
* | fixed collision | Nikolay Korolev | 2019-08-03 | 1 | -1/+1 |
| | |||||
* | implemented CTrain | aap | 2019-07-31 | 1 | -2/+2 |
| | |||||
* | CAutomobile::FireTruckControl and HydraulicControl | aap | 2019-07-26 | 1 | -3/+3 |
| | |||||
* | couple of fixes | aap | 2019-07-20 | 1 | -1/+1 |
| | |||||
* | implemented col line rendering | aap | 2019-07-19 | 1 | -7/+234 |
| | |||||
* | and of course the last commit didnt fix everything | aap | 2019-07-10 | 1 | -1/+1 |
| | |||||
* | added wrappers around math functions | aap | 2019-07-10 | 1 | -10/+10 |
| | |||||
* | more CAutomobile | aap | 2019-07-09 | 1 | -1/+1 |
| | |||||
* | the great reorganization | aap | 2019-07-07 | 1 | -0/+1887 |