Commit Graph

84 Commits

Author SHA1 Message Date
eray orçunus
e07b6fdce7 Message box, letterbox and ped attaching 2020-06-07 21:44:54 +03:00
Sergeanur
509ca11d76 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
2020-06-03 01:24:08 +03:00
Nikolay Korolev
111d23beab fix 2020-05-28 17:21:00 +03:00
aap
3c3b1aadc0 small fixes 2020-05-25 20:36:23 +02:00
aap
7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
eray orçunus
2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00
aap
0b0ba49abc small fixes 2020-05-19 21:42:55 +02:00
aap
bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02:00
eray orçunus
84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
Nikolay Korolev
21329b8440 sync with upstream 2020-05-16 01:50:45 +03:00
Nikolay Korolev
08b2138c7e ped attractors done 2020-05-16 01:49:30 +03:00
eray orçunus
acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
Sergeanur
7c2b9478d5 Merge branch 'master' into miami
# 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
2020-05-13 00:55:52 +03:00
Filip Gawin
c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
aap
198b80f560 RpAnimBlend and frame updates 2020-05-10 23:47:53 +02:00
aap
f7300c7a27 CPedModelInfo 2020-05-10 13:08:02 +02:00
aap
1b936f6ffb CClumpModelInfo; little fixes 2020-05-10 11:20:27 +02:00
Sergeanur
6ad66fb2d7 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/render/Renderer.cpp
2020-05-06 19:32:57 +03:00
Nikolay Korolev
a24b65cbde IsStatic 2020-05-06 19:17:47 +03:00
aap
f1c1f56b12 CSphere and CBox for CColModel 2020-05-06 17:56:38 +02:00
aap
13c24a310d little cworld bugfix 2020-05-06 14:27:57 +02:00
aap
7c356b08e6 little cworld bugfix 2020-05-06 14:27:41 +02:00
aap
b3b9be5e8c merged master 2020-05-05 14:21:13 +02:00
Sergeanur
e9b334d7bf More use of GetModelIndex 2020-05-05 14:48:35 +03:00
aap
b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Sergeanur
84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03:00
aap
702da55ec9 implemented most of vice city path system 2020-05-03 16:09:37 +02:00
Sergeanur
d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
Sergeanur
7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
aap
f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Nikolay Korolev
c4cd45d47c replays bug fix 2020-04-18 23:50:37 +03:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
saml1er
ac61da3feb Fix CWorld::FindObjectsOfTypeInRangeSectorList bug 2020-04-17 17:04:09 +05:00
saml1er
2a4717fa41 Apply clang format to CWorld 2020-04-17 16:14:59 +05:00
saml1er
ce7d6848ba CWorld fixes 2020-04-17 16:13:55 +05:00
saml1er
e777f24064 More CWorld fixes 2020-04-17 05:38:05 +05:00
saml1er
03247ce98f Fix CWorld::RepositionOneObject bugs 2020-04-17 03:54:22 +05:00
saml1er
6b1093f1c8 CWorld complete 2020-04-17 03:20:34 +05:00
saml1er
e52a02fb9e Merge branch 'master' into world
# Conflicts:
#	src/core/World.cpp
#	src/core/World.h
2020-04-17 00:01:53 +05:00
saml1er
52d0d811b7 Reverse CWorld 2020-04-16 23:46:08 +05:00
Nikolay Korolev
5cb7e2e42a
Merge pull request #440 from Fire-Head/master
CWeapon done, fixes
2020-04-15 23:28:09 +03:00
eray orçunus
4da1879975 Many fixes and cleanup 2020-04-15 19:19:45 +03:00
Fire-Head
daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
Sergeanur
cb262c791e Finished CExplosion 2020-04-09 13:28:17 +03:00
aap
8e3ee096e2
Merge pull request #366 from Nick007J/master
Garage part 1
2020-03-29 19:12:53 +02:00
erorcun
6704a62b32
Merge pull request #369 from erorcun/erorcun
CShotInfo, CWanted done, Frontend fix
2020-03-29 19:03:59 +03:00
eray orçunus
a3b519ea64 CShotInfo, CWanted done, Frontend fix 2020-03-29 19:02:26 +03:00
Nikolay Korolev
24b8c7819c merge with upstream 2020-03-29 18:51:18 +03:00
Fire-Head
194ddc5f40 CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names 2020-03-28 23:55:23 +03:00