Commit Graph

2240 Commits

Author SHA1 Message Date
aap
b7037e3cf7 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-01 20:32:32 +02:00
aap
21afcd8767
Merge pull request #602 from aap/miami
CAutomobile
2020-06-01 20:32:24 +02:00
aap
25273485d9 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-01 18:05:24 +02:00
aap
de1018d7a6 gravity 2020-06-01 10:56:15 +02:00
aap
6d3e54369c
Merge pull request #608 from Nick007J/miami
Roadblocks and GameLogic
2020-06-01 10:44:33 +02:00
aap
197c49d740 fixed bumper colmodel 2020-06-01 10:29:46 +02:00
Nikolay Korolev
0631bd9d89 fix 2020-05-31 23:16:24 +03:00
Nikolay Korolev
815d3e0f61 fix 2020-05-31 22:50:32 +03:00
Nikolay Korolev
f945dbc0fb dumb 2020-05-31 21:01:36 +03:00
Nikolay Korolev
c1c163d78c game logic 2020-05-31 20:59:01 +03:00
aap
21ce0a4b28 CAutomobile done 2020-05-31 17:05:59 +02:00
aap
00dc86917e some more CAutomobile 2020-05-31 17:05:59 +02:00
aap
218772c296 gahhh 2020-05-31 17:05:59 +02:00
aap
c1e13177a1 some CAutomobile 2020-05-31 17:05:59 +02:00
Nikolay Korolev
49a897c3b3 better name 2020-05-30 20:09:58 +03:00
Nikolay Korolev
09c9e16cb1 roadblocks 2020-05-30 20:08:31 +03:00
eray orçunus
dd162c3aa0 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-29 22:05:52 +03:00
eray orçunus
529cec5653 R to freeroam, idle anims, weapon and cam enum fix 2020-05-29 22:05:33 +03:00
Nikolay Korolev
627ffb0f82 fix 2020-05-29 16:52:02 +03: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
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
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
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
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