mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-01-18 13:06:37 +00:00
Code Issues Projects Releases Wiki Activity
4752 commits 3 branches 0 tags 63 MiB
Commit graph

3988 commits

Author SHA1 Message Date
withmorten
82322293fe rename error strings to RELCS 2021-02-18 23:01:46 +01:00
withmorten
4eea06e620 name error strings to REVC 2021-02-18 22:59:40 +01:00
withmorten
781617d484 add NoMovies ini option, rename gDrawVersionText, always save ini after loading 2021-02-18 22:55:26 +01:00
erorcun
946be081b0 Get keyboard input from X11 on Linux 2021-02-19 00:23:14 +03:00
aap
11bc8ea602 update librw; render groups only if extension supported 2021-02-18 20:31:53 +01:00
aap
3457ff48ce d3d9 debug render groups 2021-02-18 13:08:29 +01:00
aap
146ad3b4a1 fix last commit 2021-02-18 12:23:33 +01:00
aap
996772faf2 add debug render groups 2021-02-18 12:21:52 +01:00
Sergeanur
cba1f85026 Add russian support 2021-02-18 11:34:23 +02:00
withmorten
037c332158 Merge remote-tracking branch 'origin/miami' into lcs 2021-02-18 02:38:12 +01:00
aap
73612215d8 update librw; gl cleanup 2021-02-18 01:58:59 +01:00
aap
59bf3a1cc4 update librw; gl cleanup 2021-02-18 01:58:42 +01:00
Sergeanur
ac88a00f06 Fix endless vibration in pause menu 2021-02-17 15:09:16 +02:00
erorcun
691c8e7702 Fix fuzzy #ifdef 2021-02-17 15:59:05 +03:00
erorcun
75d8dd2bf2 Show Radio Off on interiors that don't want radio 2021-02-17 15:58:52 +03:00
Steve Wills
2b6628aa65 Fix seg fault when configuring controller 2021-02-17 01:12:39 +03:00
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
Sergeanur
0f46c8904d Fix 2021-02-16 19:32:43 +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
erorcun
1bfd7c0345 Fix FindClose->closedir 2021-02-16 18:31:00 +03: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
Fire-Head
78f4e8fdca fix mailbox particle 2021-02-15 21:29:11 +03:00
Fire-Head
63e5afda0b fix mailbox particle 2021-02-15 21:25:18 +03:00
aap
08f0f275af removed some f suffixes from shaders 2021-02-15 15:08:19 +01:00
aap
adf688635a removed some f suffixes from shaders 2021-02-15 15:06:37 +01:00
withmorten
a58d76d27d Revert "always console for windows Debug builds" 
This reverts commit a76c962aa3.
 2021-02-15 14:58:19 +01:00
withmorten
a76c962aa3 always console for windows Debug builds 2021-02-15 14:27:35 +01:00
erorcun
5ce5000b14 Try to fix streams stop after a while 2 2021-02-15 05:09:46 +03:00
Fire-Head
0681fe3eca cannon fix 2021-02-14 20:11:58 +03:00
Nikolay Korolev
3d90a146d8 Merge remote-tracking branch 'upstream/miami' into miami 2021-02-14 20:09:16 +03:00
Nikolay Korolev
6ba0d2e6bd fail 2021-02-14 20:08:55 +03:00
erorcun
70b919137d (Test) Try to fix streams stop after a while 2021-02-14 18:07:21 +03:00
Sergeanur
9f6f9a7af3
Merge pull request #1024 from IlDucci/miami 
[Miami] Updating font widths.
 2021-02-14 07:53:45 +02:00
withmorten
e5d5160492 glfw window icon 2021-02-13 17:09:12 +01:00
IlDucci
ae8b2198e2 Redone the entire grouping to follow the textures, added ifdefs, added a small legend for the Pricedown characters in EFIGS font1 2021-02-13 16:50:28 +01:00
aap
333530e260 new icon 2021-02-13 14:54:51 +01: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
aadc39eccd Add missing rtpng.h 2021-02-12 08:46:32 +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
998d88763d Fix RC cars detonation button 2021-02-11 18:03:47 +02:00
Sergeanur
e4320c02cf Enable BIND_VEHICLE_FIREWEAPON 2021-02-11 17:16:01 +02:00
Sergeanur
579ad052ed Fix black screen during credits 2021-02-11 13:30:04 +02:00
Nikolay Korolev
7c74c01741 fixed attractors 2021-02-11 13:35:56 +03:00
Sergeanur
9d8e32d9b2
Merge pull request #1026 from Sergeanur/VC/ControllerMenu 
Controller menu
 2021-02-11 12:31:13 +02:00
Sergeanur
28f9160bca Fix crash when falling from bike while shooting 2021-02-11 12:13:03 +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
erorcun
6d56fb41c6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-02-10 15:27:04 +03:00
erorcun
775db94a96 Ped jump teleport/kill fix 2021-02-10 15:26:42 +03:00
Sergeanur
3c7a7bc8a7 Fixes 2021-02-10 13:42:59 +02:00
Sergeanur
5072c8b6f0 Merge branch 'miami' into VC/ControllerMenu 
* miami:
  Fix repeating pickup sound on revenue pickup
 2021-02-10 12:22:12 +02:00
Sergeanur
ca85e44c9e Fix repeating pickup sound on revenue pickup 2021-02-10 12:21:21 +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
c06b971b65 fix clouds 2021-02-09 20:03:13 +01: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
2cad49940e Use our synonyms for attack anims again 2021-02-07 21:13:54 +03:00
erorcun
675aef29cf Detect joystick menu for XInput 2021-02-07 19:50:17 +03:00
aap
425f360363 reorganize shaders; use modulate flag; update librw 2021-02-06 16:49:52 +01:00
aap
cc435ea711 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-02-06 10:23:28 +01:00
IlDucci
b864103976 Restoring original sorting. 2021-02-05 13:53:24 +01:00
Nikolay Korolev
102d105e0a fix 2021-02-05 14:45:03 +03:00
IlDucci
86513cb2c9 [Miami] Updating font widths. 
- Fixing widths in SF Arborcrest for the characters ¡, Ñ, ñ, ¿.
 - Fixing the ¡ character width in Rage font.
 - Mapped the characters that are being affected by each width size.
 2021-02-05 12:44:41 +01:00
aap
9125e604b9 fix generic.txd crash 2021-02-05 10:58:01 +01:00
Nikolay Korolev
09de511c37 fixed plane AI 2021-02-05 11:31:54 +03: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
withmorten
42342745f3 CHud::Draw fix 2021-02-04 18:29:47 +01:00
erorcun
ca48ebcb6e MP3 player fixes 2021-02-03 23:03:00 +03:00
Nikolay Korolev
3584dac5c0 fix 2021-02-03 22:47:25 +03:00
Nikolay Korolev
f6c8225dac Merge remote-tracking branch 'upstream/lcs' into lcs 2021-02-03 22:47:16 +03:00
Nikolay Korolev
ca65c76419 fix 2021-02-03 22:46:04 +03: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
ef28d12d85 fix gcc/clang build by adding -fpermssive and -Wno-address-of-temporary 2021-02-02 14:27:21 +01:00
withmorten
1b293a3cfb no advanced script log when log level is 0 2021-02-02 11:32:20 +01:00
withmorten
4281730b16 fix UB and potential crashes when doing ice cream 2021-02-02 11:27:30 +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
aap
3f60034c39 add w to CVector; adjust col structs a bit 2021-02-01 10:57:55 +01:00
Nikolay Korolev
2343e69ce5 Merge branch 'lcs-dev' into lcs 2021-01-31 23:34:41 +03:00
Nikolay Korolev
251b2aaeb8 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-31 23:34:38 +03:00
Nikolay Korolev
48926fcade multiplayer stuff 2021-01-31 23:34:19 +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
withmorten
2e37001881 fix UB and new renderer crashes 2021-01-31 01:19:25 +01:00
Nikolay Korolev
e5190481e4 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-31 01:46:33 +03:00
Nikolay Korolev
2420325c02 fix 2021-01-31 01:45:07 +03:00
Nikolay Korolev
07a5cc6544 garages 2021-01-31 01:38:00 +03:00
withmorten
5dfe396af3 use macro for waterlevel z offset 2021-01-30 20:13:25 +01:00
Sergeanur
c193ade58b Font fixes 2021-01-30 20:46:37 +02:00
Nikolay Korolev
01d4312251 Merge branch 'lcs' into lcs-dev 2021-01-30 20:27:26 +03:00
Nikolay Korolev
2c29ab5542 fix 2021-01-30 20:27:02 +03:00
Nikolay Korolev
8b08098d4e fix 2021-01-30 20:26:10 +03:00
Nikolay Korolev
c3c2a4269d stuff 2021-01-30 20:23:30 +03: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
withmorten
990637bf52 waterlevel: use macro for 400.0f 2021-01-29 17:57:51 +01: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
withmorten
8482180706 waterlevel fix fix 2021-01-29 01:20:20 +01:00
withmorten
2fc6b542bc waterlevel fix 2021-01-29 01:18:32 +01:00
erorcun
810bad9fd8 Fix some UBs 2021-01-29 01:44:33 +03:00
Nikolay Korolev
4270180b8b fix 2021-01-29 00:05:57 +03:00
Nikolay Korolev
2d5f087041 fix 2021-01-28 23:25:59 +03:00
Nikolay Korolev
7056f9954f fix 2021-01-28 23:25:15 +03:00
aap
9e3c192376 fix some little UB 2021-01-28 15:35:35 +01:00
erorcun
e1e4be9017 Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:57:12 +03:00
Nikolay Korolev
9fc0ec0bf4 I hate ATanOfXY pt 2 2021-01-28 02:41:21 +03:00
erorcun
8150f55dbc
Merge pull request #1002 from kusst/miami 
Change text color in texture conversion dialog so it matches VC colors.
 2021-01-28 02:16:04 +03:00
kusst
8a7c7efe85
ifdefs + fix progressbar being under dialogbox 2021-01-27 23:56:23 +01:00
Nikolay Korolev
3f8e258055 fix 2021-01-28 01:50:10 +03:00
Nikolay Korolev
fa2eb24ba2 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-28 01:08:18 +03:00
Nikolay Korolev
433baf5f3c fix 2021-01-28 01:08:06 +03:00
erorcun
be88a42bad Fix some Collision NaN/inf's 2021-01-28 00:51:43 +03:00
erorcun
a216bb56ee Attempt to fix input delays on GLFW 2021-01-27 22:19:10 +03:00
erorcun
ab939e059b Clean up POSIX streaming code 2021-01-27 22:19:00 +03:00
Sergeanur
e8a10748a4 fix fix 2021-01-27 20:39:22 +02:00
Sergeanur
97cf189d15 Fix subtitle shadow 2021-01-27 20:19:22 +02:00
Sergeanur
97351ad2c2 Use original animation names from VCS 2021-01-27 18:50:24 +02:00
kusst
e1e13d14a4
Also change progressbar color 2021-01-27 03:36:22 +01:00
kusst
30c26e5a9c
Change text color in texture conversion dialog... 
...so it matches VC style.
 2021-01-27 00:35:57 +01:00
aap
70c1f0640d add missing ferry vehicle desc 2021-01-26 19:24:22 +01:00
Nikolay Korolev
9b1db9709b Merge branch 'lcs' into lcs-dev 2021-01-26 21:10:55 +03:00
Nikolay Korolev
edb50b66a0 enum change 2021-01-26 20:46:42 +03:00
Sergeanur
0862c79b21 Merge branch 'miami' into lcs 
* miami:
  Fix anim id in replay
 2021-01-26 19:39:54 +02:00
Sergeanur
2d2625bf75 Fix anim id in replay 2021-01-26 19:39:05 +02:00
Nikolay Korolev
2fea28f194 fix 2021-01-26 02:27:57 +03:00
Nikolay Korolev
42d9d6abc8 syncd 2021-01-26 02:27:32 +03:00
Nikolay Korolev
46e63da4d8 sync 2021-01-26 02:25:47 +03:00
Nikolay Korolev
d7bd0be53e garage stuff 2021-01-26 02:23:55 +03:00
Fire_Head
0ae6d1fecf
Merge branch 'lcs' into lcs 2021-01-26 01:01:32 +03:00
Fire-Head
d898abf63d config 2021-01-26 00:55:55 +03:00
Fire-Head
ba4028b9dd lcs WaterCannon 2021-01-26 00:52:03 +03:00
Sergeanur
cea8ad4b85 Fix check 2021-01-25 19:40:19 +02:00
Sergeanur
129d7333be Fix function dupe 2021-01-25 19:38:13 +02:00
Sergeanur
9647901ba0 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-01-25 19:35:03 +02:00
Sergeanur
c21e5f5e79 Move CRunningScript 2021-01-25 19:33:02 +02:00
erorcun
202ccd4c56 Support pads without L2-R2, add comments 2021-01-25 16:58:02 +03:00
withmorten
9d4053419b
Merge pull request #977 from withmorten/miami-cw 
make building with Codewarrior 7 possible
 2021-01-25 14:06:53 +01:00
aap
785bd8ebcc proper ini fix 2021-01-25 13:02:00 +01:00
aap
a4c5b87b90 more bletcherous stuff 2021-01-25 10:45:38 +01:00
aap
fef87b9219 fix some breakage 2021-01-25 10:43:12 +01:00
aap
4f591aa87a ini fixes 2021-01-25 10:30:57 +01:00
aap
d6544933aa
Merge pull request #984 from aap/lcs 
modelinfos
 2021-01-25 10:30:34 +01:00
aap
453a16c978 modelinfo and visibility plg fixes 2021-01-24 23:25:12 +01:00
aap
ce7f166ba3 CVehicleModelInfo 2021-01-24 22:50:16 +01:00
shfil
1ab96abb91 Add cmake option for sanitizers 2021-01-24 21:36:13 +01:00
shfil
513d418771 Add cmake option for sanitizers 2021-01-24 21:35:53 +01:00
Sergeanur
0ad1426950 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
 2021-01-24 22:22:16 +02:00
erorcun
071e503856 Ped: car enter anim. fix 2021-01-24 20:12:36 +03:00
aap
a202e67349 CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
withmorten
29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
erorcun
b728f8de64 Fix out of bound binding orders 2021-01-24 19:08:07 +03:00
Sergeanur
e79e8b30e0 Partial hud 2021-01-24 17:21:50 +02:00
aap
1bee2caf5c CClumpModelInfo 2021-01-24 15:28:26 +01:00
aap
9361aeb8eb CTimeModelInfo and CWeaponModelInfo 2021-01-24 14:06:16 +01:00
aap
8cbae5d62a CSimpleModelInfo 2021-01-24 13:47:33 +01:00
shfil
d68ec362dd
Fix CCollision::DistToLine 2021-01-24 12:36:43 +01:00
shfil
ca1de3cd17
Fix CCollision::DistToLine 2021-01-24 12:35:45 +01:00
aap
c1a7ded1e4 CBaseModelInfo 2021-01-24 00:07:45 +01:00
Nikolay Korolev
8cdc6b5d7c fix merge failure 2021-01-23 23:53:59 +03:00
Nikolay Korolev
c4f0b4fb6d mission cleanup fix 2021-01-23 23:20:22 +03:00
Nikolay Korolev
4e477a17b2 mission cleanup fix 2021-01-23 23:17:41 +03:00
Nikolay Korolev
de32fbe75e another backport 2021-01-23 23:16:38 +03:00
Nikolay Korolev
4abebbe3b2 use ARRAY_SIZE 2021-01-23 23:12:25 +03:00
aap
4269e613a3
Merge pull request #983 from ZLau92/ZLau92-corrected-plane-pitch 
Fix plane / ccbb cheat flight pitch
 2021-01-23 21:06:33 +01:00
Sergeanur
2d00d9cbe6 More scaling macro 2021-01-23 22:06:17 +02:00
Nikolay Korolev
d28e9a7b62 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 23:04:38 +03:00
Nikolay Korolev
37d1aa4129 script fixes 2021-01-23 23:04:24 +03:00
Zach Charo
77051ddc78
Update Vehicle.cpp 2021-01-23 13:38:45 -06:00
aap
a1d6833bac txd store 2021-01-23 19:23:38 +01:00
Sergeanur
13507d422b Add PSP scaling macros 2021-01-23 18:56:27 +02:00
Sergeanur
de44a17e64 Fix ini name 2021-01-23 18:16:47 +02:00
Sergeanur
e9689a0a07 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/core/re3.cpp
 2021-01-23 17:54:46 +02:00
erorcun
770456d0c8 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-23 16:50:55 +03:00
erorcun
1b32840424 No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-23 16:18:19 +03:00
Sergeanur
defbb01aaa Merge remote-tracking branch 'origin/lcs' into lcs 
* origin/lcs:
  Remove size assert
  Add TXD mid field
  Enable GTA_BRIDGE
  LCS model indices
 2021-01-23 15:14:24 +02:00
Sergeanur
904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
 2021-01-23 15:14:15 +02:00