Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | sync with upstream | Nikolay Korolev | 2020-05-17 | 3 | -70/+72 |
|\ | |||||
| * | Merge pull request #555 from erorcun/miami | aap | 2020-05-17 | 3 | -7/+8 |
| |\ | | | | | | | Weapon fixes and thingies | ||||
| | * | Weapon fixes and thingies | eray orçunus | 2020-05-17 | 3 | -7/+8 |
| | | | |||||
| * | | Fix compilation errors | Sergeanur | 2020-05-16 | 1 | -61/+61 |
| | | | |||||
| * | | Merge branch 'master' into miami | Sergeanur | 2020-05-16 | 1 | -1/+2 |
| |\ \ | | |/ | |/| | | | | | | | | | | # Conflicts: # src/animation/AnimManager.cpp # src/audio/AudioManager.cpp | ||||
| | * | Remove magic consts from ms_aAnimAssocDefinitions | Sergeanur | 2020-05-16 | 1 | -25/+28 |
| | | | |||||
* | | | full script basic support | Nikolay Korolev | 2020-05-17 | 1 | -1/+3 |
|/ / | |||||
* | | Weapon layer in Peds | eray orçunus | 2020-05-15 | 5 | -189/+661 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-05-12 | 2 | -3/+8 |
|\| | | | | | | | | | | | | | | | | | | | | | # 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 | 2 | -3/+8 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-05-12 | 2 | -1/+5 |
|\| | | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp | ||||
| * | Merge pull request #533 from erorcun/master | erorcun | 2020-05-11 | 2 | -1/+5 |
| |\ | | | | | | | Linux build support | ||||
| | * | Linux build support | eray orçunus | 2020-05-11 | 2 | -1/+5 |
| | | | |||||
* | | | Merge branch 'master' into miami | Sergeanur | 2020-05-11 | 4 | -4/+7 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimBlendAssociation.h # src/animation/AnimBlendClumpData.h # src/animation/AnimManager.h # src/animation/FrameUpdate.cpp # src/control/AutoPilot.h # src/control/PathFind.h # src/core/PlayerInfo.h # src/entities/Building.h # src/entities/Dummy.h # src/entities/Entity.h # src/entities/Physical.h # src/entities/Treadable.h # src/modelinfo/BaseModelInfo.h # src/modelinfo/ClumpModelInfo.cpp # src/modelinfo/ClumpModelInfo.h # src/modelinfo/PedModelInfo.h # src/modelinfo/SimpleModelInfo.h # src/modelinfo/TimeModelInfo.h # src/modelinfo/VehicleModelInfo.h # src/objects/CutsceneHead.h # src/objects/CutsceneObject.h # src/objects/DummyObject.h # src/objects/Object.h # src/peds/DummyPed.h # src/peds/PedIK.cpp # src/rw/VisibilityPlugins.cpp # src/vehicles/Automobile.h # src/vehicles/Boat.h # src/vehicles/Heli.h # src/vehicles/Plane.h # src/vehicles/Train.h # src/vehicles/Vehicle.h | ||||
| * | | few fixes | aap | 2020-05-11 | 2 | -9/+41 |
| |/ | |||||
| * | Merge remote-tracking branch 'upstream/master' | bigbossbro08 | 2020-05-10 | 1 | -1/+1 |
| |\ | |||||
| | * | some fixes and cosmetic changes | aap | 2020-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed typos and made all assert functions optional | bigbossbro08 | 2020-05-10 | 5 | -12/+7 |
| | | | |||||
| * | | defined out asserts. | bigbossbro08 | 2020-05-10 | 3 | -0/+9 |
| |/ | |||||
| * | fixes for anims | aap | 2020-05-09 | 1 | -2/+2 |
| | | |||||
| * | named anim assoc flags | aap | 2020-05-09 | 2 | -37/+35 |
| | | |||||
* | | RpAnimBlend and frame updates | aap | 2020-05-10 | 6 | -53/+117 |
| | | |||||
* | | some updates for script | Nikolay Korolev | 2020-05-10 | 1 | -1/+1 |
| | | |||||
* | | added some anim groups | aap | 2020-05-10 | 2 | -9/+70 |
| | | |||||
* | | CWeaponModelInfo | aap | 2020-05-10 | 1 | -1/+2 |
| | | |||||
* | | back to ped.ifp | aap | 2020-05-09 | 1 | -2/+1 |
| | | |||||
* | | accidentally swapped reft and light | aap | 2020-05-09 | 1 | -10/+10 |
| | | |||||
* | | peds starting to work | aap | 2020-05-09 | 4 | -80/+85 |
| | | |||||
* | | removed cutscene heads | aap | 2020-05-09 | 4 | -19/+3 |
| | | |||||
* | | named anim assoc flags | aap | 2020-05-09 | 2 | -37/+35 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-05-09 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimBlendAssocGroup.cpp # src/animation/AnimBlendAssociation.cpp # src/animation/AnimManager.cpp # src/core/Streaming.cpp | ||||
| * | more small fixes | aap | 2020-05-08 | 7 | -11/+18 |
| | | |||||
* | | anims streaming | aap | 2020-05-08 | 1 | -0/+1 |
| | | |||||
* | | most of animation system done; little stuff here and there | aap | 2020-05-08 | 18 | -207/+465 |
|/ | |||||
* | SetPosition, part 1 | Sergeanur | 2020-05-02 | 1 | -2/+2 |
| | |||||
* | real names (from LCS) | aap | 2020-04-25 | 1 | -12/+12 |
| | |||||
* | few fixes | aap | 2020-04-25 | 1 | -0/+6 |
| | |||||
* | implemented skinned peds, no cutscene hands yet | aap | 2020-04-24 | 6 | -43/+399 |
| | |||||
* | Crossplatform work continues | eray orçunus | 2020-04-22 | 1 | -2/+1 |
| | |||||
* | Try to build with mingw | Filip Gawin | 2020-04-20 | 5 | -184/+197 |
| | |||||
* | Revert "Part one" | Filip Gawin | 2020-04-18 | 1 | -13/+7 |
| | | | | This reverts commit 63951d9b957b30a110f42a03edb4833cbbaf380e. | ||||
* | Part one | Filip Gawin | 2020-04-17 | 1 | -7/+13 |
| | |||||
* | Remove patches | Sergeanur | 2020-04-17 | 10 | -160/+10 |
| | |||||
* | Merge remote-tracking branch 'Fire-Head/master' into Standalone | Sergeanur | 2020-04-17 | 2 | -2/+2 |
|\ | | | | | | | | | # Conflicts: # src/render/Coronas.cpp | ||||
| * | rem refs | Fire-Head | 2020-04-17 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'samler/world' into Standalone | Sergeanur | 2020-04-17 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' into world | saml1er | 2020-04-16 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | # Conflicts: # src/core/World.cpp # src/core/World.h | ||||
| * | | Reverse CWorld | saml1er | 2020-04-16 | 1 | -0/+1 |
| | | | |||||
* | | | Some refs removed, little fixes and teleport | eray orçunus | 2020-04-16 | 4 | -38/+38 |
| |/ |/| | |||||
* | | More refs removed | Sergeanur | 2020-04-16 | 2 | -2/+2 |
|/ | |||||
* | Fix cutscene camera latency | Sergeanur | 2020-04-11 | 1 | -1/+1 |
| | |||||
* | fix | Nikolay Korolev | 2020-04-10 | 1 | -0/+1 |
| | |||||
* | Fixing mixed IsCutsceneProcessing and IsRunning | Sergeanur | 2020-04-10 | 2 | -0/+490 |
| | |||||
* | remove include <new> from common.h | aap | 2020-03-28 | 4 | -13/+24 |
| | |||||
* | Fixes for Serge's review | Filip Gawin | 2020-03-22 | 1 | -3/+3 |
| | |||||
* | Frontend, Peds & logic and overflow fixes | eray orçunus | 2019-11-12 | 1 | -1/+1 |
| | |||||
* | Merge pull request #263 from Sergeanur/strcmp | erorcun | 2019-11-09 | 3 | -10/+13 |
|\ | | | | | Implemented faststrcmp, faststricmp, strcasecmp | ||||
| * | Implemented faststrcmp, faststricmp, strcasecmp | Sergeanur | 2019-10-30 | 3 | -10/+13 |
| | | |||||
* | | The Peds | eray orçunus | 2019-10-30 | 1 | -2/+2 |
|/ | |||||
* | Peds | eray orçunus | 2019-09-20 | 1 | -2/+3 |
| | |||||
* | World and Peds | eray orçunus | 2019-09-12 | 1 | -0/+1 |
| | |||||
* | Cleanup | Filip Gawin | 2019-08-27 | 2 | -3/+3 |
| | |||||
* | More more more audio | Filip Gawin | 2019-08-27 | 6 | -37/+37 |
| | |||||
* | Cleanup | Filip Gawin | 2019-08-27 | 2 | -3/+3 |
| | |||||
* | More audio ped | Filip Gawin | 2019-08-27 | 2 | -3/+3 |
| | |||||
* | bit more CAutomobile | aap | 2019-07-23 | 1 | -0/+2 |
| | |||||
* | couple of fixes | aap | 2019-07-20 | 1 | -7/+6 |
| | |||||
* | ComputeDopplerEffectedFrequency | Filip Gawin | 2019-07-19 | 1 | -1/+1 |
| | |||||
* | and of course the last commit didnt fix everything | aap | 2019-07-10 | 3 | -6/+6 |
| | |||||
* | General fixes | eray orçunus | 2019-07-07 | 2 | -2/+2 |
| | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com> | ||||
* | More CPed | eray orçunus | 2019-07-01 | 1 | -0/+1 |
| | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com> | ||||
* | Cleanup project a bit | Filip Gawin | 2019-06-30 | 2 | -2/+2 |
| | |||||
* | Footsteps | eray orçunus | 2019-06-28 | 1 | -1/+1 |
| | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com> | ||||
* | Fix 3 bugs | eray orçunus | 2019-06-27 | 1 | -1/+1 |
| | | | | | | | | * Footsteps doesn't play while sprinting * Player doesn't kick ped in ground at first time * Looking around with numpad is problematic Signed-off-by: eray orçunus <erayorcunus@gmail.com> | ||||
* | CPed, CVehicle, mostly entering/exiting car | eray orçunus | 2019-06-24 | 1 | -2/+3 |
| | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com> | ||||
* | Big CPed update | eray orçunus | 2019-06-20 | 1 | -0/+2 |
| | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com> | ||||
* | fixed anim bug | aap | 2019-06-17 | 2 | -2/+2 |
| | |||||
* | CdStream RwFreeAlign/RwMallocAlign | Fire-Head | 2019-06-17 | 2 | -7/+3 |
| | |||||
* | implemented CutsceneObject; little fixes | aap | 2019-06-12 | 3 | -9/+9 |
| | |||||
* | animation fixes | aap | 2019-06-12 | 1 | -1/+2 |
| | |||||
* | added animation system (with skin support for now) | aap | 2019-06-11 | 18 | -0/+2927 |