Commit Graph

40 Commits

Author SHA1 Message Date
Sergeanur
0d20f1c364 Merge branch 'master' into miami
# 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
2020-10-18 17:15:49 +03:00
eray orçunus
f71953077d Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes 2020-09-30 02:41:42 +03:00
eray orçunus
a5d6c952a7 Credits & fixes 2020-09-27 02:36:49 +03:00
eray orçunus
dbc458a4d7 CPed and CCivilianPed funcs done 2020-09-24 01:54:37 +03:00
eray orçunus
3e549a7d44 CGame done, Peds, fixes 2020-08-30 12:40:30 +03:00
Sergeanur
841fa5155c Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
eray orçunus
716740f918 Peds & fixes 2020-07-04 15:31:28 +03:00
eray orçunus
15548758ac Bettah car enter canceling, fix CFO crash, ped objs. renaming 2020-07-03 16:51:33 +03:00
erorcun
eda50bc32b
Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639) 2020-07-01 15:28:43 +03:00
eray orçunus
f3ed6659c3 CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
eray orçunus
2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00
Nikolay Korolev
3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
eray orçunus
84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
Nikolay Korolev
b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Nikolay Korolev
cf5db73117 a few fixes 2020-05-16 11:22:12 +03:00
Nikolay Korolev
03c4a979c8 removed duplicate code 2020-05-16 10:53:20 +03:00
Nikolay Korolev
5491a51daa remove debug 2020-05-16 10:39:18 +03:00
Nikolay Korolev
08b2138c7e ped attractors done 2020-05-16 01:49:30 +03:00
Nikolay Korolev
d031943f2a more pedattractor 2020-05-14 13:46:11 +03:00
aap
e81652c2fc cleaned up MIAMI ifdefs 2020-05-05 18:06:38 +02:00
Sergeanur
c2b9ddc5b8 Revert "Remove Miami stuff"
This reverts commit 9960c41193.
2020-05-05 18:04:43 +03:00
Sergeanur
9960c41193 Remove Miami stuff 2020-05-05 18:04:18 +03:00
aap
b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
eray orçunus
f2995640bd CMenuManager done and CHud fixes 2020-04-12 00:56:27 +03:00
eray orçunus
112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
aap
739e80614d remove include <new> from common.h 2020-03-28 09:37:04 +01:00
eray orçunus
a718e699ad Fixes and cleanup 2020-03-02 03:06:52 +03:00
eray orçunus
ff92b822b6 CPopulation 1 2020-02-17 15:57:50 +03:00
erorcun
d75b9b8257
CPlayerPed continues (#294) 2020-01-23 23:21:50 +03:00
eray orçunus
dad7782ff0 CPhone, CPlayerInfo, CFire, CWorld 2019-12-06 00:55:23 +03:00
eray orçunus
680fe0f7e6 CCivilianPed done & restore peds running to phone 2019-11-26 02:35:05 +03:00
eray orçunus
0f9178568b Peds, a fix and a tad of VC 2019-09-17 23:22:34 +03:00
eray orçunus
72822c20d8 Peds and fixes 2019-07-29 15:01:44 +03:00
aap
9477aca836
Merge branch 'master' into erorcun 2019-07-16 18:31:18 +02:00
eray orçunus
2c138b2b77 Phone, World, Ped 2019-07-15 15:11:40 +03:00
Nikolay Korolev
41dbd754de Partial RunningScript part2 2019-07-14 12:49:03 +03:00
aap
12af85ca3d cleaned up patching of virtual functions; started CAutomobile 2019-07-08 08:46:42 +02:00
aap
53023eb65b the great reorganization 2019-07-07 13:09:11 +02:00