summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-11Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap
2020-05-11CVisibilityPluginsaap
2020-05-11Merge remote-tracking branch 'origin/master' into miamiSergeanur
# Conflicts: # src/render/Renderer.cpp
2020-05-11Merge remote-tracking branch 'origin/miami' into miamiSergeanur
2020-05-11Merge branch 'master' into miamiSergeanur
# 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
2020-05-11random fixesaap
2020-05-11CRendereraap
2020-05-11remove aps from premakeSergeanur
2020-05-11Merge pull request #534 from blattersturm/patch/fix-premake-helpaap
fix premake failing if not passing any action (such as with --help)
2020-05-11fix premake failing if not passing any action (such as with --help)blattersturm
2020-05-11few fixesaap
2020-05-11little fix for camaap
2020-05-11Merge pull request #509 from Fire-Head/mastererorcun
OpenAL update
2020-05-10RpAnimBlend and frame updatesaap
2020-05-10vehicle model descriptions; a bit of heli codeaap
2020-05-10Merge pull request #531 from Bigbossbro08/masteraap
Defined all asserts
2020-05-10force load weapons as long as we dont stream em yetaap
2020-05-10update file loader for new VC fieldsaap
2020-05-10Merge remote-tracking branch 'upstream/master'bigbossbro08
2020-05-10fixed few more typosbigbossbro08
2020-05-10Fixed typos and made all assert functions optionalbigbossbro08
2020-05-10Merge pull request #532 from Nick007J/miamiaap
script update
2020-05-10Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev
2020-05-10some fixes and cosmetic changesaap
2020-05-10CVehicleModelInfoaap
2020-05-10some updates for scriptNikolay Korolev
2020-05-10defined out asserts.bigbossbro08
2020-05-10Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev
2020-05-10script changesNikolay Korolev
2020-05-10added some anim groupsaap
2020-05-10CPedModelInfoaap
2020-05-10Merge pull request #530 from Nick007J/miamiaap
more car control + some stuff
2020-05-10fix boatsNikolay Korolev
2020-05-10fix boatNikolay Korolev
2020-05-10Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev
2020-05-10CSimpleModelInfoaap
2020-05-10sync with upstreamNikolay Korolev
2020-05-10more car controlNikolay Korolev
2020-05-10CClumpModelInfo; little fixesaap
2020-05-10Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap
2020-05-10CWeaponModelInfoaap
2020-05-10Merge branch 'master' into miamiSergeanur
# Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h
2020-05-10Small unificationSergeanur
2020-05-10Merge pull request #529 from Nick007J/masterSergeanur
car control fixes
2020-05-09car control fixesNikolay Korolev
2020-05-09Merge pull request #528 from Nick007J/miamiaap
car control, curves, fixes
2020-05-09new curves + boat fixNikolay Korolev
2020-05-09Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev
2020-05-09back to ped.ifpaap
2020-05-09Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev