Commit Graph

3787 Commits

Author SHA1 Message Date
shfil
dc72729a40
Merge pull request #895 from ShFil119/miami_audio
More audio
2020-12-25 14:02:47 +01:00
Filip Gawin
cf8799d116 More audio enums 2020-12-25 13:51:09 +01:00
Sergeanur
c0be4a3f7d Fix cMusicManager::SetRadioChannelByScript 2020-12-25 12:06:08 +02:00
erorcun
3b85457020
Merge pull request #894 from erorcun/miami
signed/unsigned fixes, and some other fixes
2020-12-25 12:56:31 +03:00
erorcun
a50244dc16 signed/unsigned fixes, and some other fixes 2020-12-25 12:54:41 +03:00
Nikolay Korolev
5f98b4fdca Merge remote-tracking branch 'upstream/miami' into miami 2020-12-25 12:12:09 +03:00
Sergeanur
4846564c78 cMusicManager::ServiceGameMode fix 2020-12-25 11:11:37 +02:00
Nikolay Korolev
86f04884de fix garage 2020-12-25 12:11:22 +03:00
Sergeanur
bf52620175 Fix debug menu memory leak 2020-12-25 10:57:39 +02:00
Sergeanur
e14ed9c7dd Restore original Cheat_strncmp 2020-12-25 10:44:20 +02:00
Sergeanur
74276ae878 More type fix 2020-12-25 09:29:23 +02:00
Sergeanur
1cc8a1d247 Small audio code fix 2020-12-25 09:13:01 +02:00
Sergeanur
6a2edcea46 Small type use fixes
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/vehicles/Cranes.cpp
2020-12-25 09:03:13 +02:00
Sergeanur
0768026938 Fix chainsaw sounds lol 2020-12-25 08:33:43 +02:00
Filip Gawin
19cc1d7854 fixes 2020-12-25 01:29:18 +01:00
aap
450cd17d16 make screen droplets not crash without neo.txd 2020-12-24 09:41:18 +01:00
Filip Gawin
35473e653d More audio 2020-12-22 14:53:45 +01:00
aap
aefaa17a84 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-21 20:49:03 +01:00
aap
88b0134e72 option for PC controls 2020-12-21 20:48:28 +01:00
shfil
c0260b4167
Fix char encoding 2020-12-21 14:53:45 +01:00
aap
b574996334 fix sizeof 2020-12-21 13:33:35 +01:00
aap
adcfb30d7d fix name shadowing 2020-12-21 13:29:09 +01:00
aap
f251803f55 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-21 12:34:36 +01:00
aap
fb97335d9f push/pop memids 2020-12-21 12:34:29 +01:00
erorcun
05fb47bdb0 Fix wrong call on free cam (now it's faster) 2020-12-21 02:36:09 +03:00
erorcun
9b9545b92a Car entering cancel test 2020-12-21 02:06:00 +03:00
erorcun
26aed6611e fix auto duck cancel bug 2020-12-21 01:15:40 +03:00
erorcun
ca4602d788 Fix free cam aiming 2 2020-12-20 21:53:06 +03:00
aap
f60b450ee8 main.cpp mostly checked against ps2 now 2020-12-20 19:13:37 +01:00
aap
036263993e ps2 fixes 2020-12-20 17:35:46 +01:00
aap
b48445cc7e Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-20 14:27:56 +01:00
aap
fc312113d2 some PS2 things 2020-12-20 14:27:48 +01:00
Sergeanur
2e90ce9cc5 uncomment InitRadioStationPositionList 2020-12-20 13:41:29 +02:00
Sergeanur
be92b57b54 buildings directory
# Conflicts:
#	premake5.lua
2020-12-20 12:40:59 +02:00
aap
6697ab6b63
Merge pull request #890 from aap/miami
anim compression
2020-12-20 11:31:22 +01:00
aap
2a51e1da04 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-19 17:27:01 +01:00
Nikolay
867133e93d
Merge pull request #891 from Nick007J/miami
merge master to miami
2020-12-19 19:15:52 +03:00
Nikolay Korolev
b6298915dd fixed cmakelists 2020-12-19 16:21:33 +03:00
Nikolay Korolev
196a13b1cc removed renderer stuff 2020-12-19 14:52:32 +03:00
Nikolay Korolev
76a564df2e fixed review stuff 2020-12-19 14:33:22 +03:00
Nikolay Korolev
17efc38e35 removed cullzones stuff from renderer 2020-12-19 12:27:16 +03:00
Nikolay Korolev
bf90fed2b7 fixes 2020-12-19 11:49:19 +03:00
Nikolay Korolev
e3aac6263f Merge remote-tracking branch 'upstream/miami' into miami 2020-12-19 03:21:32 +03:00
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
9982f1f21b anim compression 2020-12-18 23:46:51 +01:00
aap
73d080bcc8 silly mistake 2020-12-18 23:39:59 +01:00
aap
c17ccc50ab get rid of all PED_SKIN defines 2020-12-18 17:27:18 +01:00
aap
75a9976cbc memorymgr fix 2020-12-18 14:33:54 +01:00
aap
f3a356375e added MemoryHeap from III, MemoryMgr 2020-12-18 14:19:03 +01:00
aap
a080fbfbd4 little cleanup of templates 2020-12-18 13:58:59 +01:00