Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | WaterLevel (Beachtoys) | erorcun | 2020-10-24 | 1 | -4/+4 |
| | |||||
* | Merge branch 'master' into miami | Sergeanur | 2020-10-18 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/control/RoadBlocks.cpp # src/entities/Entity.h # src/entities/Physical.cpp # src/peds/Ped.cpp # src/render/Renderer.cpp # src/vehicles/Automobile.cpp # src/vehicles/CarGen.cpp # src/weapons/BulletInfo.cpp # src/weapons/Weapon.cpp | ||||
| * | Setter for bIsStatic (became virtual in SA) | Sergeanur | 2020-10-18 | 1 | -1/+1 |
| | | |||||
* | | Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes | eray orçunus | 2020-09-30 | 1 | -182/+842 |
| | | |||||
* | | CGame done, Peds, fixes | eray orçunus | 2020-08-30 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-08-19 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | Call CWorld::Remove before the delete, the original game does this and its safer. | Jack Powell | 2020-08-18 | 1 | -2/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-08-07 | 1 | -0/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | Squeeze performance option, minor fixes | eray orçunus | 2020-08-03 | 1 | -0/+11 |
| | | | | | | | | Fixes are already in miami | ||||
* | | 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 | -5/+5 |
| | | |||||
| * | small fixes | aap | 2020-05-19 | 1 | -18/+2 |
| | | |||||
| * | some work on zones | aap | 2020-05-06 | 1 | -1/+1 |
| | | |||||
* | | VC fighting, Peds, many fixes including ghost bikes | eray orçunus | 2020-07-09 | 1 | -23/+34 |
| | | |||||
* | | Some wait states | eray orçunus | 2020-06-06 | 1 | -0/+6 |
| | | |||||
* | | Bike riding anims, SA bike/heli cam | eray orçunus | 2020-06-05 | 1 | -1/+1 |
| | | |||||
* | | Peds, eSound and PedState enum, fixes | eray orçunus | 2020-06-03 | 1 | -0/+13 |
| | | |||||
* | | Merge pull request #569 from aap/miami | aap | 2020-05-20 | 1 | -18/+4 |
|\ \ | | | | | | | CEntity and friends | ||||
| * | | CEntity and friends | aap | 2020-05-19 | 1 | -18/+4 |
| | | | |||||
* | | | Melee weapons(half-working), Ped and Hud bits | eray orçunus | 2020-05-19 | 1 | -8/+6 |
|/ / | |||||
* | | Merge pull request #555 from erorcun/miami | aap | 2020-05-17 | 1 | -22/+4 |
|\ \ | | | | | | | Weapon fixes and thingies | ||||
| * | | Weapon fixes and thingies | eray orçunus | 2020-05-17 | 1 | -22/+4 |
| | | | |||||
* | | | gangs, script and replay fixes | Nikolay Korolev | 2020-05-16 | 1 | -13/+1 |
|/ / | |||||
* | | more attractor fixes | Nikolay Korolev | 2020-05-16 | 1 | -1/+2 |
| | | |||||
* | | Weapon layer in Peds | eray orçunus | 2020-05-15 | 1 | -6/+27 |
| | | |||||
* | | more car control | Nikolay Korolev | 2020-05-10 | 1 | -5/+10 |
| | | |||||
* | | CCarCtrl::GenerateOneRandomCar | Nikolay Korolev | 2020-05-08 | 1 | -1/+59 |
| | | |||||
* | | sync with upstream | Nikolay Korolev | 2020-05-07 | 1 | -4/+2 |
|\ \ | |||||
| * | | CZoneInfo mostly done; not its dependencies | aap | 2020-05-07 | 1 | -4/+2 |
| | | | |||||
* | | | sync with upstream | Nikolay Korolev | 2020-05-07 | 1 | -1/+2 |
|\| | | |||||
| * | | VC vehicles just barely working now | aap | 2020-05-07 | 1 | -1/+2 |
| | | | |||||
* | | | car control and friends | Nikolay Korolev | 2020-05-07 | 1 | -0/+1 |
|/ / | |||||
* | | new zone stuff | aap | 2020-05-06 | 1 | -1/+1 |
| | | |||||
* | | getting the vice city map to work | aap | 2020-05-05 | 1 | -41/+6 |
| | | |||||
* | | cleaned up MIAMI ifdefs | aap | 2020-05-05 | 1 | -84/+0 |
| | | |||||
* | | Revert "Remove Miami stuff" | Sergeanur | 2020-05-05 | 1 | -0/+2 |
|/ | | | | This reverts commit 9960c411933f9a804eb5f6840d75ad00fd255252. | ||||
* | Remove Miami stuff | Sergeanur | 2020-05-05 | 1 | -2/+0 |
| | |||||
* | merged master | aap | 2020-05-05 | 1 | -8/+7 |
|\ | |||||
| * | More use of GetModelIndex | Sergeanur | 2020-05-05 | 1 | -8/+7 |
| | | |||||
* | | implemented most of streamed collisions and big buildings | aap | 2020-05-05 | 1 | -0/+2 |
|/ | |||||
* | SetPosition, final part | Sergeanur | 2020-05-05 | 1 | -14/+14 |
| | |||||
* | Adding getters and setters for type and status | Sergeanur | 2020-04-30 | 1 | -2/+2 |
| | |||||
* | Try to build with mingw | Filip Gawin | 2020-04-20 | 1 | -2/+2 |
| | |||||
* | Various fixes | eray orçunus | 2020-04-18 | 1 | -3/+3 |
| | |||||
* | Remove patches | Sergeanur | 2020-04-17 | 1 | -14/+1 |
| | |||||
* | Fixed bridge despawns | Nikolay Korolev | 2020-04-16 | 1 | -6/+6 |
| | |||||
* | Many fixes and cleanup | eray orçunus | 2020-04-15 | 1 | -30/+30 |
| | |||||
* | Some cleanup | erorcun | 2020-04-14 | 1 | -33/+48 |
| | |||||
* | Merge pull request #399 from saml1er/master | Nikolay Korolev | 2020-04-12 | 1 | -1/+1 |
|\ | | | | | CObject complete | ||||
| * | CObject complete | saml1er | 2020-04-10 | 1 | -1/+1 |
| | | |||||
* | | disabling the code that freezes gang members | Sergeanur | 2020-04-10 | 1 | -0/+3 |
|/ | |||||
* | CCopPed done and #include cleanup | eray orçunus | 2020-03-28 | 1 | -3/+7 |
| | |||||
* | CCopPed 2 and fixes | eray orçunus | 2020-03-26 | 1 | -1/+1 |
| | |||||
* | fix and cleanup in AddToPopulation | aap | 2020-03-24 | 1 | -11/+11 |
| | |||||
* | Fixes for Serge's review | Filip Gawin | 2020-03-22 | 1 | -1/+1 |
| | |||||
* | ProcessButtonPresses and fixes | eray orçunus | 2020-03-21 | 1 | -5/+6 |
| | |||||
* | CPopulation done, CCopPed and fixes | eray orçunus | 2020-03-11 | 1 | -21/+174 |
| | |||||
* | fixed dummyobject bug | Nikolay Korolev | 2020-03-04 | 1 | -2/+2 |
| | |||||
* | fixes | eray orçunus | 2020-03-01 | 1 | -6/+5 |
| | |||||
* | CPopulation 3 and fixes | eray orçunus | 2020-02-27 | 1 | -8/+297 |
| | |||||
* | merge + bug fix | Nikolay Korolev | 2020-02-22 | 1 | -0/+2 |
| | |||||
* | CPopulation 2 | eray orçunus | 2020-02-19 | 1 | -6/+342 |
| | |||||
* | CPopulation 1 | eray orçunus | 2020-02-17 | 1 | -0/+393 |