Compare commits

...
Sign in to create a new pull request.

1992 commits
master ... lcs

Author SHA1 Message Date
withmorten
82322293fe rename error strings to RELCS 2021-02-18 23:01:46 +01:00
aap
8dabde94bf update librw 2021-02-18 11:11:48 +01:00
withmorten
a2afe54f5a remove generic.txd 2021-02-18 02:45:17 +01: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
Fire-Head
5ce7a0bde4 add updated vanilla-friendly upscale-free ps2 particle 2021-02-18 00:44:52 +03:00
Fire-Head
33a648e5f5 remove particle 2021-02-18 00:30:07 +03:00
aap
f670658407 fix particle.txd 2021-02-17 22:07:01 +01:00
aap
3feca1c530 update particle.txd 2021-02-17 21:55:18 +01:00
withmorten
8dca3182a6 update librw 2021-02-17 14:38:01 +01:00
Sergeanur
ac88a00f06 Fix endless vibration in pause menu 2021-02-17 15:09:16 +02:00
erorcun
a73a3380d7 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-02-17 16:00:22 +03:00
erorcun
691c8e7702 Fix fuzzy #ifdef 2021-02-17 15:59:05 +03:00
withmorten
0b6fad7619 update librw 2021-02-17 13:58:59 +01:00
erorcun
75d8dd2bf2 Show Radio Off on interiors that don't want radio 2021-02-17 15:58:52 +03:00
withmorten
f603f4397d fix premake workflows 2021-02-17 13:40:42 +01:00
aap
0810abd294 update librw; get rid of glew 2021-02-17 13:14:26 +01:00
aap
ed38118008 add hires particle.txd 2021-02-17 11:03:17 +01: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
396326014d Restore old readme 2021-02-16 19:38:43 +02:00
Sergeanur
184f12a214 Remove Vanilla from CI 2021-02-16 19:38:08 +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
erorcun
b451be6c7f PR rules 2021-02-16 16:53:05 +03:00
erorcun
7c382c85b8 Add PR rules to Readme 2021-02-16 16:52:55 +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
6fcea142a2 readme update 2021-02-15 00:54:43 +03:00
erorcun
e604be65d9 More compatible she-bang line 2021-02-14 21:11:15 +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
withmorten
826be7472f
update invite link 2021-02-14 16:03:39 +01:00
withmorten
d6fbfab7b6
update invite link 2021-02-14 16:03:15 +01:00
aap
d0afa692f5 optimize performance -> readme to-do 2021-02-14 09:48:40 +01:00
Sergeanur
9f6f9a7af3
Merge pull request #1024 from IlDucci/miami
[Miami] Updating font widths.
2021-02-14 07:53:45 +02:00
withmorten
49d9aa8188 even more readme fixes 2021-02-14 03:11:52 +01:00
Fire-Head
f5fdb91a43 reVC logo 2021-02-14 01:01:33 +03:00
Sergeanur
83fdad7e0d Update invite link 2021-02-13 20:09:16 +02:00
withmorten
44511e28a8
more readme fixes 2021-02-13 17:16:53 +01: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
withmorten
ddcc19d7cf
readme fixes 2021-02-13 15:00:14 +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
aap
3db0e827e5 add history section to readme 2021-02-12 21:52:51 +01:00
aap
9df19cbac3 license information 2021-02-12 21:08:55 +01:00
aap
0916971584 update librw 2021-02-12 20:12:48 +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
erorcun
80e4b3db55 Fix sha1 on premake linux 2021-02-12 21:10:39 +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
b1698948e6 Update TXDs 2021-02-12 12:59:39 +02:00
Sergeanur
df336f5ba2 Convert TXDs to VC version, delete unused controller shadows 2021-02-12 09:20:35 +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
c3ced5825d improved readme 2021-02-12 00:58:22 +01:00
aap
c5db1e697b improved readme 2021-02-12 00:57:39 +01:00
aap
879838c9f2 enable screenshots with F12 2021-02-12 00:29:09 +01:00
withmorten
031195f11d better controller menu txds 2021-02-11 21:51:22 +01:00
withmorten
46e229c069 use better quality button textures, add generic.txd 2021-02-11 21:36:55 +01:00
Sergeanur
438277408b Use VEHICLE_FIREWEAPON in GXTs 2021-02-11 18:36:40 +02: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
Sergeanur
7c485560c5 Translated string fix 2021-02-11 04:28:21 +02:00
withmorten
84ede57205
startproject now depends on librw 2021-02-10 18:48:43 +01:00
withmorten
a2c2a364a4
readme fix 2021-02-10 18:16:14 +01: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
bf8687590e Add textures 2021-02-10 09:03:13 +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
Nikolay
410eb19ce6
Merge pull request #1013 from Nick007J/lcs
garages
2021-02-06 01:04:06 +03: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
withmorten
958c828a2c
readme fix 2021-02-04 01:42:42 +01:00
withmorten
1525b105e2 reduce warnings in msvc librw build 2021-02-03 23:29:25 +01:00
withmorten
bba01a42e1
sync readme with master 2021-02-03 21:40:04 +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
Sergeanur
2e7726c574
Merge pull request #1022 from IlDucci/miami
[miami] Adding strings to re3's GXT, recompiling GXT files
2021-02-03 21:44:00 +02:00
withmorten
edc3c48e05 add gamefiles and dlls to premake workflows 2021-02-03 20:28:34 +01:00
IlDucci
1ffa9bb30f Adding strings to re3's GXT, recompiling GXT files
Contains the same new elements as #1017
2021-02-03 19:41:17 +01:00
erorcun
2ea365e5da
Merge pull request #1018 from erorcun/miami
OAL Loops, fixes
2021-02-02 22:40:32 +03: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
Sergeanur
3e0dbf42d4 Add radio off text 2021-01-31 23:46:45 +02: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
3677749935 Merge branch 'lcs-dev' into lcs 2021-01-31 01:38:48 +03:00
Nikolay Korolev
75a20216d9 sync 2021-01-31 01:38:43 +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
Sergeanur
d69b73eaa8
Merge pull request #998 from IlDucci/lcs
Updating Spanish.txt FOLLOWING the existing strings on master and mia…
2021-01-30 05:19:40 +02: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
erorcun
0d7e0d351a
Merge pull request #1000 from withmorten/miami-vanilla
miami: add Vanilla config to premake and premake CI
2021-01-28 02:44:43 +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
9c2f067403 Change joystick DB with latest offical one 2021-01-27 22:19:17 +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
withmorten
3948a1f726 add Vanilla config to premake and premake CI 2021-01-26 11:30:46 +01: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
IlDucci
3f80e92f2c Updating Spanish.txt FOLLOWING the existing strings on master and miami, undoing LATAM contents
@ForeverL95 attempted to add Latin American Spanish elements into what's an originally European Spanish translation. If you want a Latin American Version, you should do a entire new file and not step into the existing one.
 - Restoring all the new reLCS elements following what was done on miami, adding the new particularities/uppercasings currently in use.
 - Removing all Latin American Spanish details (using íconos and not iconos, mouse instead of ratón, video instead of vídeo, Latin American Spanish verbal tense usage...)
2021-01-25 23:35:06 +01: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
fb64bb314c
Merge pull request #992 from ForeverL95/ForeverL95-patch-1
Add spanish translation for new strings
2021-01-25 22:50:52 +02:00
ForeverL95
bc5f3abd3c
closer to the source text... 2021-01-25 14:46:54 -03:00
ForeverL95
1934bedde2
go back to the source...
New fixes, trying to respect the source format.
Some improvisations, especially at the controls.
2021-01-25 14:45:29 -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
Sergeanur
c5ff13abca Update OpenAL 2021-01-25 18:50:27 +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
ForeverL95
a01a9e5943
A necessary step back, again. 2021-01-25 01:44:06 -03:00
ForeverL95
ed4edb93e7
A necessary step back.
I changed some text strings that I had modified, to a format more similar to the original.
2021-01-25 01:43:26 -03:00
ForeverL95
8869f4ca4d
spanish gxt fixed
Fixes and order in the file.
2021-01-25 00:08:52 -03:00
ForeverL95
b137dba5db
a better txt work
The same TXT file that I uploaded, but better ordered, so that it can work better.
2021-01-25 00:06:28 -03:00
ForeverL95
ed2b985245
Add spanish translation for new strings.
I have added missing text strings, mainly in the menu.
And I made some modifications to some translated strings.
2021-01-24 20:06:13 -03:00
ForeverL95
d7e38b378e
Add spanish translation for new strings. 2021-01-24 19:59:23 -03: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
Sergeanur
c1f0fe1da6
Merge pull request #987 from Sergeanur/lcsHud
Partial hud
2021-01-24 22:19:31 +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
Nikolay Korolev
e9d58b5a90 Merge branch 'lcs' into lcs-dev 2021-01-24 13:42:48 +03:00
Nikolay Korolev
ee89c485fc sync 2021-01-24 13:42:45 +03: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
Sergeanur
4bde3366c1
Merge pull request #980 from Sergeanur/lcsMID
LCS model indices
2021-01-23 15:09:54 +02:00
Sergeanur
cfac29b0ef Remove restrictions in CGame::Process 2021-01-23 15:09:34 +02:00
erorcun
45c2488e36 Migrate from old .ini to new .ini 2021-01-23 16:04:19 +03:00
erorcun
73f1340afb Store all settings in .INI 2021-01-23 15:59:38 +03:00
Nikolay Korolev
3326603265 added some missing functions 2021-01-23 15:33:01 +03:00
Nikolay Korolev
b5c4866964 added some missing functions 2021-01-23 15:32:07 +03:00
aap
f6fb473cf9 revert accident 2021-01-23 12:59:52 +01:00
aap
a22b6168c6 wrong path node array 2021-01-23 12:50:46 +01:00
aap
2814f2e8cf wrong path node array 2021-01-23 12:49:54 +01:00
aap
20bcd4bd69 colstore done 2021-01-23 12:40:23 +01:00
Nikolay Korolev
552497d71b fix 2021-01-23 14:11:57 +03:00
Nikolay Korolev
8d0100f100 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 12:54:27 +03:00
Nikolay Korolev
a105003a7a I hate GetATanOfXY 2021-01-23 12:54:08 +03:00
Sergeanur
e03aaec030 Add (Don't) walk lights 2021-01-23 04:07:50 +02:00
Sergeanur
0aad73f4a1 Remove size assert 2021-01-23 03:39:24 +02:00
Sergeanur
3565f179af Add TXD mid field 2021-01-23 03:12:01 +02:00
Sergeanur
b35b0c598d Enable GTA_BRIDGE 2021-01-23 03:09:15 +02:00
Sergeanur
6b54d04bfc LCS model indices 2021-01-23 02:56:48 +02:00
erorcun
10120eb12f
Merge pull request #979 from erorcun/miami
Includes overhaul, fix some compiler warnings
2021-01-23 03:34:15 +03:00
erorcun
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
Nikolay Korolev
965a3d6eec Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 02:36:34 +03:00
Nikolay Korolev
917cf44def script coronas 2021-01-23 02:36:13 +03:00
Sergeanur
c884edd923 cSmallHeap 2021-01-23 00:03:12 +02:00
Nikolay Korolev
bdb216bf7c fix 2021-01-22 20:59:57 +03:00
Sergeanur
e019bd91fd Reenable PS2_AUDIO_PATHS 2021-01-22 19:46:50 +02:00
Sergeanur
ea916b6ae5 Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  fix config.h
  small premake fix
2021-01-22 19:45:58 +02:00
withmorten
cc6d5374d5 fix config.h 2021-01-22 18:41:58 +01:00
withmorten
ba0b06f268 small premake fix 2021-01-22 16:40:17 +01:00
withmorten
1d3e84b712
small premake fix 2021-01-22 16:39:28 +01:00
Sergeanur
cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
2021-01-22 15:04:09 +02:00
withmorten
feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
aap
4acc9b08a2
Merge pull request #974 from withmorten/miami-wantedlevel
m_nWantedLevel -> GetWantedLevel()
2021-01-22 10:33:55 +01:00
Sergeanur
8dab92d158 CMessages::GetTokenPadKeyString 2021-01-22 05:49:17 +02:00
Sergeanur
b5deee823c Load LCS radar blips 2021-01-22 04:00:17 +02:00
Sergeanur
7091ab5e75 Fix save/load and brief menus 2021-01-22 02:44:32 +02:00
Sergeanur
0495d0f232 GXT fixes 2021-01-22 02:26:26 +02:00
Sergeanur
e6d9a0d1ad Get rid of outro screen 2021-01-22 02:19:02 +02:00
aap
c8236d0dd2
Merge pull request #976 from Fire-Head/lcs
Lcs pobj
2021-01-22 01:12:03 +01:00
Fire_Head
6bdf005171
Update ParticleObject.h 2021-01-22 03:10:19 +03:00
aap
ce77e80414
Merge pull request #963 from Nick007J/lcs
all LCS script commands
2021-01-22 00:59:20 +01:00
aap
de10f0dda6
Merge pull request #975 from aap/lcs
loadscreens, not accurate
2021-01-22 00:59:13 +01:00
Fire-Head
37b9ba5bd7 lcs pobj 2021-01-22 02:59:08 +03:00
aap
035d655e47
Merge pull request #972 from Sergeanur/lcsfont
Partial CFont
2021-01-22 00:59:07 +01:00
Sergeanur
06d8860d42 Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  fuck
  bletch
  fixed anisotropic filtering; updated librw
  fix
2021-01-22 01:58:38 +02:00
Sergeanur
9d2509ab5b A bit of frontend and GXT 2021-01-22 01:56:47 +02:00
aap
f7ab5cb7c4 loadscreens, not accurate 2021-01-22 00:41:34 +01:00
aap
8520bbd2c7 higher wheel LOD dist 2021-01-22 00:40:46 +01:00
withmorten
d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
aap
1999427225 fuck 2021-01-21 22:26:44 +01:00
aap
94ff966994 bletch 2021-01-21 22:25:14 +01:00
aap
e99589a3eb fixed anisotropic filtering; updated librw 2021-01-21 22:17:35 +01:00
Nikolay Korolev
50cde66067 fix 2021-01-22 00:14:30 +03:00
Sergeanur
e8db0e3abb Merge branch 'lcs' into lcsfont
* lcs:
  fix
  enable screenshots for librw; update librw
  Get rid of bitfields in CPool
  Sync matrix with master
  free cam inversion fix
  free cam inversion fix
  Fix CFont::PrintStringFromBottom
  pc radar fix
  work on colourfilters
  PSP rendering and shader cleanup
  fix handbrake
  fix
  wrong ifdef
  fix
  some free cam fixes for controller
  sync milessdk with re3mss
  vehicle fixes
  fix
  add the bad crack "features" behind SECUROM define

# Conflicts:
#	src/render/Font.cpp
2021-01-21 23:11:36 +02:00
Nikolay Korolev
46ae5700ee a few fixes 2021-01-21 23:51:15 +03:00
Nikolay Korolev
c8e715c33b Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-21 23:19:12 +03:00
Sergeanur
ed74182cc2 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	vendor/librw
2021-01-21 16:03:27 +02:00
Nikolay Korolev
f0097ff733 fix 2021-01-21 16:09:58 +03:00
aap
24de9f92e8 enable screenshots for librw; update librw 2021-01-21 10:21:47 +01:00
Fire-Head
4ba19c9556 Merge branch 'lcs' of https://github.com/Fire-Head/re3 into lcs 2021-01-21 01:00:39 +03:00
Nikolay Korolev
a5be17d941 Merge branch 'lcs-dev' into lcs 2021-01-20 21:15:03 +03:00
Nikolay Korolev
23831e38e6 sync 2021-01-20 21:14:12 +03:00
Nikolay Korolev
ad745aae63 some more script 2021-01-20 21:12:42 +03:00
Sergeanur
cc94419a72 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script4.cpp
#	src/render/Weather.cpp
#	src/render/Weather.h
#	src/vehicles/Automobile.cpp
2021-01-20 19:32:03 +02:00
Sergeanur
c7c7eff918 Get rid of bitfields in CPool
# Conflicts:
#	src/core/templates.h
2021-01-20 19:24:08 +02:00
Sergeanur
3b52b683e3 Sync matrix with master 2021-01-20 19:20:11 +02:00
Sergeanur
95448eea3d More fonts 2021-01-20 18:40:54 +02:00
withmorten
ba34d72183 free cam inversion fix 2021-01-20 13:59:17 +01:00
withmorten
8590457d41 free cam inversion fix 2021-01-20 13:57:03 +01:00
Sergeanur
9b820cc0b6 Fix CFont::PrintStringFromBottom 2021-01-20 14:23:03 +02:00
Nikolay Korolev
b4b4c996ba Merge branch 'lcs-dev' into lcs 2021-01-20 12:12:56 +03:00
Nikolay Korolev
b1454276ed Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-20 12:12:46 +03:00
Nikolay Korolev
aa0f77043c script fixes 2021-01-20 12:12:26 +03:00
aap
2c1c5debca pc radar fix 2021-01-19 21:35:25 +01:00
Nikolay Korolev