1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-18 06:37:46 +00:00
Commit graph

385 commits

Author SHA1 Message Date
Nikolay Korolev 5e10f1fe6a sync with upstream 2021-01-07 18:38:40 +03:00
Nikolay Korolev 9d6db921bd fail 2021-01-07 18:31:54 +03:00
Nikolay Korolev db1bdfd62d minor refactoring 2021-01-07 18:30:35 +03:00
Nikolay Korolev 69d30f2204 some lcs stuff 2021-01-07 15:21:35 +03:00
Nikolay Korolev bec8f6b86c reorder 2021-01-03 22:29:16 +03:00
aap 57677b7b55 slightly better variable name 2021-01-02 20:30:16 +01:00
Nikolay Korolev 29b76fc4f5 small thing 2021-01-01 22:57:17 +03:00
Nikolay Korolev 9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
Nikolay Korolev 2f05c64470 actual struct name 2021-01-01 13:35:23 +03:00
Nikolay Korolev 56ea1c7be7 fixed some bugs (saves might be broken though) 2020-12-31 19:29:13 +03:00
Nikolay Korolev fc72ff24d0 implemented collectives in script 2020-12-20 17:07:58 +03:00
Nikolay Korolev 8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
Seemann 0563478de0 Fix some formatting issues 2020-12-14 11:18:46 +02:00
Nikolay Korolev 4197498e2d fixed garages + minor fixes 2020-12-12 12:24:55 +03:00
withmorten 4c0744260d uint8 enums fixed 2020-12-07 01:59:17 +01:00
withmorten 4696e3f9c8 uint8 enums fixed 2020-12-07 00:36:40 +01:00
Nikolay Korolev 0bd373cd56 script from other platforms and unused commands 2020-12-05 02:49:32 +03:00
aap d5bc382cb5 GTA_VERSION define and some config.h cleanup 2020-11-29 21:29:48 +01:00
Zach Charo b47c505438 Update Script.cpp
Case sensitivity fix. Causes compile issue on linux.
2020-11-28 13:36:38 +02:00
Sergeanur a35b3b4602 Script commands split to original files 2020-11-24 14:06:48 +02:00
Sergeanur bd3d09fef5 Script commands split to original files 2020-11-24 12:58:11 +02:00
withmorten abcda2ce29 add mission switcher from miami 2020-11-16 00:41:03 +01:00
Nikolay Korolev 6682e56f71 small fix 2020-11-13 17:53:03 +03:00
Nikolay 984708dfd3
damn 2020-11-11 13:36:10 +03:00
Nikolay Korolev e473123a6a fixes 2020-11-03 00:07:25 +03:00
Nikolay Korolev 0ccc70c843 embarassing 2020-11-02 23:53:52 +03:00
Nikolay Korolev bae6c24209 fix 2020-11-02 15:54:42 +03:00
Nikolay Korolev 5edd9e75da finished script and replay 2020-11-01 18:21:05 +03:00
Nikolay Korolev 45c09224f7 fixed KYFC 2020-11-01 16:34:39 +03:00
Nikolay Korolev 63a27fbc5f overflow fix 2020-11-01 13:55:29 +03:00
Nikolay Korolev f21cfef8fb remove autosave at end of mission under MISSION_REPLAY 2020-11-01 12:33:16 +03:00
Sergeanur ca497e2cbd ScriptSounds 2020-10-23 16:56:34 +03:00
Sergeanur d7b9884f9d Use audio enum 2020-10-23 16:18:46 +03:00
erorcun 0750f04019 Messages, fix Font 2020-10-20 22:24:56 +03:00
erorcun 10758088ef
Merge pull request #766 from Fire-Head/miami
Glass
2020-10-18 19:59:11 +03:00
erorcun 70f9832e14
Merge branch 'miami' into miami 2020-10-18 19:45:11 +03:00
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
Sergeanur cc0ae51631 lil fix 2020-10-18 16:55:11 +03:00
Sergeanur b91f6a4550 Setter for bIsStatic (became virtual in SA) 2020-10-18 16:40:06 +03:00
shfil cafe4e38db Script.cpp missing breaks 2020-10-18 13:37:17 +03:00
shfil 82f54b946f Script.cpp missing breaks 2020-10-18 00:56:07 +02:00
Fire-Head e4ac934dbf Miami Glass 2020-10-15 00:33:57 +03:00
Nikolay Korolev c4d4821327 Control updates 2020-10-11 12:56:33 +03:00
Roman Masanin 881db86895 CSpecialFX and some other classes 2020-10-09 20:29:38 +03:00
eray orçunus da39624f1c Pad, BulletInfo, ProjectileInfo, fixes 2020-10-08 00:26:24 +03:00
Nikolay Korolev 1666995cd9 fixed bad bug 2020-09-30 16:29:39 +03:00
Nikolay Korolev 0a58e3e430 fixed bad bug 2020-09-30 16:25:21 +03:00
Nikolay Korolev c5699a9b30 now fixed properly 2020-09-26 21:35:09 +03:00
Nikolay Korolev 48a10de41f bug fixed 2020-09-26 21:25:40 +03:00
Nikolay Korolev f7d5021ac5 VC replays 2020-09-26 21:10:23 +03:00