Sergeanur
d37dc246eb
Merge remote-tracking branch 'origin/miami' into lcs
...
* origin/miami:
Fix buffer overflow on re3_sem_open/close
2021-02-16 19:41:02 +02:00
Adrian Graber
88c11e92d3
Fix buffer overflow on re3_sem_open/close
2021-02-16 18:26:07 +01:00
Sergeanur
21278356ec
Merge remote-tracking branch 'origin/miami' into lcs
...
* origin/miami:
Fix FindClose->closedir
Only include sys/syscall.h when __linux__ is defined
Add unnamed semaphore define toggle for CdStreamPosix
Fix rare stream deadlock on Windows
2021-02-16 18:08:34 +02:00
Sergeanur
e38467ef3a
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# premake5.lua
# src/animation/AnimManager.cpp
# src/animation/AnimationId.h
# src/audio/MusicManager.cpp
# src/audio/audio_enums.h
# src/control/Script7.cpp
# src/core/FileLoader.cpp
# src/core/re3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
# src/extras/postfx.cpp
# src/extras/shaders/colourfilterVC.frag
# src/extras/shaders/colourfilterVC_PS.hlsl
# src/extras/shaders/make_hlsl.cmd
# src/extras/shaders/obj/colourfilterVC_PS.cso
# src/extras/shaders/obj/colourfilterVC_PS.inc
# src/extras/shaders/obj/colourfilterVC_frag.inc
# src/peds/PedFight.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Particle.cpp
# src/render/WaterCannon.cpp
# src/skel/win/gtavc.ico
# 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-02-16 18:08:19 +02:00
Adrian Graber
ee287f6120
Only include sys/syscall.h when __linux__ is defined
2021-02-16 18:29:55 +03:00
Adrian Graber
48227bd350
Add unnamed semaphore define toggle for CdStreamPosix
2021-02-16 18:29:41 +03:00
erorcun
4368841f02
Fix rare stream deadlock on Windows
2021-02-16 17:55:42 +03:00
aap
65f9917b65
clean up debug menu
2021-02-13 14:22:34 +01:00
erorcun
035f0010d8
fix
2021-02-12 21:26:03 +03:00
erorcun
0ec16a5b0e
Fix XInput hotplug
2021-02-12 21:10:52 +03:00
Filip Gawin
0c60ceeb33
Cmake version for hash
2021-02-12 21:09:46 +03:00
erorcun
2c784d979a
Remove version text, add toggleable debug info(with commit hash!)
2021-02-12 21:09:23 +03:00
Sergeanur
e98164ec41
Sync aspect ratio setting with master
2021-02-12 18:00:20 +02:00
Sergeanur
c5042dcdf6
Add english strings to translations as stubs, also translation notice
2021-02-12 08:14:10 +02:00
Sergeanur
9e22eaf798
Fix RW34
2021-02-12 08:06:34 +02:00
aap
879838c9f2
enable screenshots with F12
2021-02-12 00:29:09 +01:00
Sergeanur
e4320c02cf
Enable BIND_VEHICLE_FIREWEAPON
2021-02-11 17:16:01 +02:00
Sergeanur
4f27a28762
More fixes
2021-02-11 05:03:41 +02:00
Sergeanur
9f3f0ee2d2
Fix borders
2021-02-11 04:36:00 +02:00
aap
8fb3a3ff23
fix typo
2021-02-10 15:10:27 +01:00
Sergeanur
3c7a7bc8a7
Fixes
2021-02-10 13:42:59 +02:00
Sergeanur
5f3e68ec45
Save vibration setting
2021-02-10 09:16:04 +02:00
Sergeanur
d6068c421d
Add undef
2021-02-10 09:08:02 +02:00
Sergeanur
b6af7393e8
Merge remote-tracking branch 'origin/miami' into VC/ControllerMenu
...
* origin/miami:
fix clouds
Use our synonyms for attack anims again
Detect joystick menu for XInput
reorganize shaders; use modulate flag; update librw
fix generic.txd crash
Use original animation names from VCS
# Conflicts:
# src/core/MenuScreensCustom.cpp
2021-02-10 09:01:53 +02:00
Sergeanur
12330e38cb
Controller menu
2021-02-10 08:57:51 +02:00
aap
26bbbe0037
fix clouds
2021-02-09 20:02:29 +01:00
aap
031df36935
CColModel
2021-02-09 17:45:02 +01:00
erorcun
94eed33940
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2021-02-08 13:24:49 +03:00
erorcun
b464bb7fd4
Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanim
2021-02-08 13:23:19 +03:00
erorcun
675aef29cf
Detect joystick menu for XInput
2021-02-07 19:50:17 +03:00
aap
cc435ea711
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2021-02-06 10:23:28 +01:00
aap
9125e604b9
fix generic.txd crash
2021-02-05 10:58:01 +01:00
withmorten
a78212ea80
fix MASTER crashes
2021-02-04 23:43:04 +01:00
withmorten
8553120fdb
add missing ASCII_STRCMP stuff
2021-02-04 19:47:47 +01:00
Sergeanur
4f7793a423
Merge pull request #997 from Fire-Head/lcs
...
Lcs WaterCannon
2021-02-03 21:44:21 +02:00
erorcun
713562685a
OAL Loops, fixes
2021-02-02 22:30:13 +03:00
withmorten
1b293a3cfb
no advanced script log when log level is 0
2021-02-02 11:32:20 +01:00
erorcun
1eb77c4d6d
Merge pull request #1016 from erorcun/miami
...
Overhaul MusicManager - fix radio bugs, scroll to prev station, radio…
2021-02-02 05:31:29 +03:00
erorcun
902e539c0d
Overhaul MusicManager - fix radio bugs, scroll to prev station, radio off text
2021-02-01 14:18:17 +03:00
shfil
bb47f3a8e4
fix realloc
2021-01-31 15:02:15 +01:00
shfil
264d7d98d7
fix realloc
2021-01-31 15:01:46 +01:00
Nikolay Korolev
a0c5d75f83
fixed bike bomb
2021-01-30 14:55:00 +03:00
Nikolay Korolev
dbf5c06144
fixed bike bomb
2021-01-30 14:53:51 +03:00
erorcun
f5f153dbfd
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2021-01-29 19:16:40 +03:00
erorcun
c4328afce7
Even more fixes & shorten quit screen
2021-01-29 19:16:26 +03:00
withmorten
7db28f9f7f
fix NewRender typo
2021-01-29 16:43:17 +01:00
withmorten
934aa92a9b
add NewRenderer ini read/write, fix backfaceculling read
2021-01-29 16:41:34 +01:00
erorcun
982b024c5c
CdStreamPosix fixes
2021-01-29 16:25:32 +03:00
aap
595a000f6a
fix shutdown
2021-01-29 13:43:50 +01:00
erorcun
810bad9fd8
Fix some UBs
2021-01-29 01:44:33 +03:00