mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-29 03:35:40 +00:00
Code Issues Projects Releases Wiki Activity
5596 commits 3 branches 0 tags 63 MiB
Commit graph

5596 commits

This branch
This branch
All branches
Author SHA1 Message Date
erorcun
8641e9d0bb Switch PR & remove X11 part from CMakeLists 2021-08-16 20:02:40 +03:00
erorcun
e73e965d5b
Merge pull request #1300 from erorcun/miami 
Auto-detect X11 dependency
 2021-08-16 19:07:03 +03:00
erorcun
4e40c6f2ed Auto-detect X11 dependency 2021-08-16 15:20:40 +03:00
Sergeanur
0c55f331cf Merge branch 'miami' into lcs 2021-08-16 14:32:15 +03:00
Sergeanur
176cadff05 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-08-16 14:31:40 +03:00
Sergeanur
076b324539 Fix ped comments playing at full volume behind the wall 2021-08-16 14:21:51 +03:00
Sergeanur
cd0a765f66 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioCollision.cpp
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.cpp
#	src/audio/AudioManager.h
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/core/Frontend.cpp
#	src/core/MenuScreens.cpp
#	src/core/MenuScreensCustom.cpp
#	src/core/common.h
#	src/core/config.h
#	src/vehicles/Automobile.cpp
 2021-08-16 14:13:31 +03:00
Sergeanur
2633295ada Merge branch 'miami' into lcs 2021-08-16 10:33:54 +03:00
Sergeanur
dc28d52d08 LCS audio reflections values 2021-08-16 10:33:46 +03:00
Sergeanur
76f2191476 Remove not needed entry from config 2021-08-16 10:31:35 +03:00
Sergeanur
bcb5b4f94d Remove not needed entry from config 2021-08-16 10:29:44 +03:00
Sergeanur
d7e764d519 Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	src/audio/AudioLogic.cpp
#	src/core/config.h
#	src/vehicles/Automobile.cpp
#	utils/gxt/american.txt
#	utils/gxt/french.txt
#	utils/gxt/german.txt
#	utils/gxt/italian.txt
#	utils/gxt/spanish.txt
 2021-08-16 10:09:39 +03:00
Sergeanur
d6fbf9fbe7 PS2 audio reflections 2021-08-16 10:02:29 +03:00
Sergeanur
c7e05c74b9 Fix cAudioManager::ProcessVehicleEngine return type, rename Sound Intensity 2021-08-16 10:00:10 +03:00
Sergeanur
ab03fbb6c8 Make UpdateReflections a bit more binary exact + small code changes to sync with miami 2021-08-16 09:59:08 +03:00
Sergeanur
9ed94f310a Fix CW build 2021-08-16 09:57:40 +03:00
aap
77f692c669 some CAutomobile fixes 2021-08-16 00:26:01 +02:00
aap
97aeb85d84 some CAutomobile fixes 2021-08-16 00:25:47 +02:00
aap
f4894952fc Merge branch 'lcs' of github.com:GTAmodding/re3 into lcs 2021-08-16 00:25:14 +02:00
aap
2f92ccecb1 work on CAutomobile 2021-08-16 00:19:09 +02:00
Nikolay Korolev
8e2ed40f66 small revision 2021-08-16 01:03:08 +03:00
Nikolay Korolev
9ba2f7d43c fix 2021-08-15 23:32:10 +03:00
Nikolay Korolev
7d1cfe50af Merge remote-tracking branch 'upstream/miami' into miami 2021-08-15 23:30:52 +03:00
Nikolay Korolev
dec09bde1c fix 2021-08-15 23:30:25 +03:00
erorcun
9deabc7b60
Merge pull request #1295 from erorcun/miami 
Fix impossible bullets
 2021-08-15 18:44:30 +03:00
Nikolay Korolev
495a447c8a merged correct switch 2021-08-15 18:43:30 +03:00
Nikolay Korolev
25075decb2 bruh 2021-08-15 18:43:26 +03:00
Nikolay Korolev
1b178a55d7 actual fix 2021-08-15 18:43:22 +03:00
Nikolay Korolev
e30e1ccccd lil fix 2021-08-15 18:43:19 +03:00
Nikolay Korolev
6bdfb0d386 merged correct switch 2021-08-15 18:41:59 +03:00
Nikolay Korolev
26e5a7eed1 bruh 2021-08-15 18:41:19 +03:00
Nikolay Korolev
4b4aefe339 bruh 2021-08-15 18:40:38 +03:00
Nikolay Korolev
042284de8b actual fix 2021-08-15 18:36:48 +03:00
Nikolay Korolev
c48f6e9bda actual fix 2021-08-15 18:35:47 +03:00
erorcun
435b8fe52e Fix impossible bullets 2021-08-15 18:34:43 +03:00
Nikolay Korolev
3441714a13 lil fix 2021-08-15 18:28:34 +03:00
Nikolay Korolev
5fe04940be lil fix 2021-08-15 18:27:30 +03:00
Sergeanur
854ee12d9d Fix ifdef for audio reflection members 2021-08-15 14:11:20 +03:00
Sergeanur
5ddd0649e3 Fix cAudioManager::ProcessVehicleEngine return type, document PS2 changes, rename Sound Intensity 2021-08-15 13:14:16 +03:00
Sergeanur
886650a887 Fix CW build 2021-08-15 13:12:10 +03:00
erorcun
747ae04279 Fix premature .ini saving leading to missing bindings 2021-08-15 04:07:48 +03:00
erorcun
f4e723e690 Fix .ini fix for glfw 2021-08-15 03:59:12 +03:00
erorcun
0db14d718c All the sliders, unite 2021-08-15 03:39:38 +03:00
erorcun
fd52285074 Fix premature .ini saving leading to missing bindings 2021-08-15 03:29:49 +03:00
Nikolay Korolev
eadf0496bf fixed heli buoyancy 2021-08-14 23:31:32 +03:00
erorcun
4a5f7464c1 Switch PR & remove X11 part from CMakeLists 2021-08-14 18:09:07 +03:00
Nikolay Korolev
39d2c427e5 merge miami 2021-08-14 17:18:34 +03:00
Nikolay Korolev
958e2f36bb ginput script 2021-08-14 16:44:09 +03:00
Nikolay Korolev
ba859dc3b5 fix 2021-08-14 16:31:34 +03:00
erorcun
3a95c77c9e Revert "map memory usage high default" 
This reverts commit 81c6c5e47a.
 2021-08-13 00:51:05 +03:00