Commit graph

96 commits

Author SHA1 Message Date
Roman Masanin
417646819c Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-12 13:42:57 +03:00
Roman Masanin
7a3e1ef19a SpecialFX almost done 2020-10-11 21:40:11 +03:00
majestic
e7ef45a606 CWaterCreatures 2020-10-10 17:49:54 -07:00
Nikolay Korolev
3c5624bc56 fixed tabs 2020-09-26 21:16:55 +03:00
Nikolay Korolev
f7d5021ac5 VC replays 2020-09-26 21:10:23 +03:00
majestic
03c90b7c40 stable CScriptPaths 2020-08-20 09:44:26 -07:00
eray orçunus
732b760829 64-bit on Windows 2020-07-24 20:26:33 +03:00
Sergeanur
d0f5464200 Merge branch 'master' into miami
# 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
2020-07-13 18:10:17 +03:00
Sergeanur
841fa5155c Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
eray orçunus
e44704dc82 Ped, Weapon and fixes 2020-06-17 21:24:59 +03:00
Fire-Head
9c0adf6a8f Revert "FONT_BANK renamed to FONT_STANDARD"
This reverts commit 552205dfba.
2020-06-07 05:03:06 +03:00
Sergeanur
1c01899799 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
2020-06-07 04:15:10 +03:00
Sergeanur
552205dfba FONT_BANK renamed to FONT_STANDARD 2020-06-07 04:10:06 +03:00
Nikolay Korolev
e3291b0cb1 gangs, script and replay fixes 2020-05-16 17:00:40 +03:00
Nikolay Korolev
4defd8b75c minimal weather stuff + multiple bugfixes 2020-05-16 13:31:23 +03:00
aap
989ded6052 removed cutscene heads 2020-05-09 13:00:39 +02:00
aap
05a1d64fbb VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
aap
e0568a19d5 new zone stuff 2020-05-06 12:23:57 +02:00
aap
cbfc45b3f7 some work on zones 2020-05-06 12:23:26 +02:00
Sergeanur
84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03: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
Sergeanur
7bf45124e6 Fix use of integers instead of enum/bool/nil 2020-04-27 12:41:34 +03: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
Sergeanur
b9c8ce0d37 Merge remote-tracking branch 'Fire-Head/master' into Standalone
# Conflicts:
#	src/render/Coronas.cpp
2020-04-17 10:17:38 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03: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
aap
90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02:00
Fire-Head
590ff32469 PS2 Cheats, restored R*names 2020-04-09 06:20:44 +03:00
Sergeanur
560fc65538 Small camera fixes 2020-04-08 09:58:08 +03:00
Sergeanur
97ffa1a658 Wrappers cleanup 2020-03-29 08:58:08 +03:00
eray orçunus
112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
Nikolay Korolev
7d213a1f32 bullet traces fixes 2020-03-22 13:20:36 +03:00
Nikolay Korolev
c2f5dfdb1e bullet traces 2020-03-21 20:14:29 +03:00
Nikolay Korolev
ac610b7e6e fixed erroneous assumption 2020-03-21 15:13:38 +03:00
Nikolay Korolev
152d8c2f40 replay bug fixes, script bug fix 2020-03-15 18:47:21 +03:00
eray orçunus
ff92b822b6 CPopulation 1 2020-02-17 15:57:50 +03:00
Sergeanur
c8f7732832 Replay crash fix 2020-02-01 23:01:25 +02:00
eray orçunus
dad7782ff0 CPhone, CPlayerInfo, CFire, CWorld 2019-12-06 00:55:23 +03:00
Sergeanur
d5a72fa597 Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode 2019-10-26 15:20:12 +03:00
Sergeanur
5b1ffb0912 Some CPool and CPools funcs, restoring original logic of pool lookup loops 2019-10-17 00:53:25 +03:00
Nikolay Korolev
57f24ad533 more CCarCtrl 2019-09-14 20:53:04 +03:00
eray orçunus
24d9773ae0 Peds 2019-09-07 01:27:07 +03:00
Filip Gawin
01ac2929cd Cleanup 2019-08-27 22:29:23 +02:00
Filip Gawin
2fabbc3b4c More more more audio 2019-08-27 21:18:47 +02:00
Filip Gawin
458fc63f01 Cleanup 2019-08-27 21:14:28 +02:00
Filip Gawin
af5bd951ae More audio ped 2019-08-27 21:13:17 +02:00