1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-10 20:39:15 +00:00
Commit graph

3790 commits

Author SHA1 Message Date
aap 9bcec54291
Merge pull request #599 from Nick007J/master
Mission replay
2020-05-28 10:25:14 +02:00
aap ab7a21e017
Merge pull request #603 from Fire-Head/miami
Miami Water, Seagulls, Ships
2020-05-28 10:23:28 +02:00
Fire-Head 8280e04b23 rem unnecessary asserts 2020-05-28 02:40:23 +03:00
Nikolay Korolev d9d57f12fc
crash fix 2020-05-28 01:00:49 +03:00
Nikolay Korolev 7e4ef2162a Merge remote-tracking branch 'upstream/master' 2020-05-28 00:59:03 +03:00
Fire_Head 7f30a2ae1b
cockbuilding ejaculation fix 2020-05-28 00:45:45 +03:00
Fire-Head fab2c8699c surfacetable included 2020-05-28 00:36:52 +03:00
Fire-Head 98af5e4ddb fix SURFACE_SAND 2020-05-28 00:28:36 +03:00
Fire-Head 895580c724 seagulls, ships 2020-05-28 00:15:37 +03:00
aap 0bc6eef55d bla 2020-05-27 22:34:10 +02:00
aap 2a1b9281e4 automobile fixes 2020-05-27 22:32:57 +02:00
Fire_Head e4649b41e1
Merge pull request #2 from GTAmodding/miami
Miami
2020-05-27 21:51:40 +03:00
Fire-Head 63d0bdc863 VC Water 2020-05-27 21:50:01 +03:00
aap 717b0a6514 librw update 2020-05-27 20:42:15 +02:00
aap d8749c2305 librw update 2020-05-27 20:41:36 +02:00
Sergeanur 53ac163a3e Merge branch 'master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/vehicles/Automobile.h
2020-05-27 20:50:40 +03:00
Sergeanur 3a5a122887 Fix city sound playing on restarting a new game 2020-05-27 20:48:47 +03:00
Nikolay Korolev d4ae40ae99 crash fix 2020-05-27 19:39:04 +03:00
aap 02741dc64f RwCameraGetCurrentCamera 2020-05-27 09:47:57 +02:00
aap 1af4edd43a RwCameraGetCurrentCamera 2020-05-27 09:47:21 +02:00
aap d71cbae9df CVehicle loose ends 2020-05-27 07:43:38 +02:00
aap c068570192
Merge pull request #600 from Fire-Head/miami
Miami Particle
2020-05-27 07:18:47 +02:00
aap 4868bf13a8
Merge pull request #601 from Sergeanur/VC/audio3
Support of original mp3/wav/adf
2020-05-27 07:10:36 +02:00
Sergeanur 591c35d51b OpenAL support 2020-05-27 07:52:45 +03:00
aap d0d060d321 MT function for fakerw 2020-05-27 06:50:05 +02:00
aap 926281f909 MT function for fakerw 2020-05-27 06:49:38 +02:00
Sergeanur 7a79b74778 Restore original logic 2020-05-27 03:33:27 +03:00
Sergeanur 408faf8a66 Support of original mp3/wav/adf 2020-05-27 03:29:54 +03:00
Fire-Head 90947a608f fix linux build 2020-05-27 03:18:02 +03:00
Fire-Head 6a32981ba5 VC CParticle done 2020-05-27 02:16:31 +03:00
Nikolay Korolev 9673ecddad Merge remote-tracking branch 'upstream/master' 2020-05-27 00:25:33 +03:00
Nikolay Korolev ec1d14971c mission replay 2020-05-27 00:25:12 +03:00
aap ea09825d10
Merge pull request #553 from Sergeanur/VC/audio
Very basic compatibility with original sfx.raw/sdt
2020-05-26 22:02:12 +02:00
Fire_Head ae8a377f26
Merge pull request #1 from GTAmodding/miami
Miami
2020-05-26 22:16:56 +03:00
aap 4f1ce8bd42 added some unused enums 2020-05-26 20:44:03 +02:00
aap 0ac3477035 fix UB shit 2020-05-26 18:50:27 +02:00
aap 7f60be9814 fix UB shit 2020-05-26 18:50:19 +02:00
Sergeanur 1991aa388b Very basic compatibility with original sfx.raw/sdt 2020-05-26 18:25:34 +03:00
Sergeanur 0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
2020-05-26 17:24:47 +03:00
aap c83b351887 updated librw 2020-05-26 15:26:54 +02:00
aap 0cd883e2a1 updated librw 2020-05-26 15:26:44 +02:00
Nikolay Korolev f40677c7a4 fixed crash 2020-05-26 16:17:40 +03:00
aap 314e56b7b9 fix2 2020-05-26 12:11:04 +02:00
aap dfa95002aa fix 2020-05-26 12:10:08 +02:00
aap 800d706935
Merge pull request #588 from blingu/miami
fixed compiler errors
2020-05-26 11:39:16 +02:00
aap 7e5dde1f1a eSurfaceType 2020-05-26 11:37:46 +02:00
aap d8528ebbbe eSurfaceType 2020-05-26 11:34:20 +02:00
aap 0b8f045d36
Merge pull request #586 from aap/miami
CVehicle
2020-05-26 11:25:23 +02:00
Nikolay Korolev 5ca0d6c6cf fixed NE bug 2020-05-26 00:45:32 +03:00
Nikolay Korolev 38d2854226 fixed FIX_BUGS 2020-05-26 00:18:04 +03:00