crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity
5,417 Commits 3 Branches 0 Tags 79 MiB
ec22576e49
Commit Graph

4501 Commits

Author SHA1 Message Date
Sergeanur
4da733145e fix 2021-05-10 02:45:29 +03:00
Sergeanur
3dda658e42 Use some GetMatrix/SetMatrix logic based on SA 
# Conflicts:
#	src/control/Pickups.cpp
#	src/control/RoadBlocks.cpp
#	src/core/World.cpp
#	src/entities/Entity.cpp
#	src/objects/CutsceneHead.cpp
#	src/objects/Object.cpp
 2021-05-10 02:45:04 +03:00
Sergeanur
1817727a66 Small Acos fix 2021-05-10 02:36:18 +03:00
Sergeanur
519218572a Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
 2021-04-09 04:31:46 +03:00
erorcun
f6f8a24335 Merge branch 'miami' of http://git.jacksmininetwork.co.uk/re/re3 into miami 2021-03-06 19:31:47 +03:00
erorcun
62b8f0f553 Pool fixes + peds not forming circle fix 2021-03-06 19:28:59 +03:00
aap
ceb22d71dd update librw 2021-03-02 22:23:05 +01:00
erorcun
97008905b6 Fix FPEs 2021-03-02 03:38:41 +03:00
aap
6122f6980b fix new renderer 2021-02-28 19:07:46 +01:00
aap
7c42ed6edb fix postfx fix 2021-02-28 19:04:15 +01:00
aap
ce604c77ba fix postfx 2021-02-28 15:30:13 +01:00
aap
df1ad8e122 fix postfx 2021-02-28 15:29:58 +01:00
aap
82245789ed proper radar clipping 2021-02-28 14:55:14 +01:00
aap
931bc690cd proper radar clipping 2021-02-28 14:55:01 +01:00
aap
d2b5a422e4 update librw 2021-02-28 14:17:14 +01:00
aap
087174c6a6 update librw; little fix 2021-02-28 14:15:22 +01:00
erorcun
a311f643f9 Fixes 2021-02-28 15:50:51 +03:00
Sergeanur
9fce8636b0 Fix muzzleflash rotation 2021-02-26 20:37:22 +02:00
Sergeanur
c5303c2ea4 Fix muzzleflash rotation 2021-02-26 20:31:26 +02:00
Sergeanur
478f6e07d4 Uhh, right 
# Conflicts:
#	src/audio/AudioManager.h
 2021-02-26 11:08:32 +02:00
Sergeanur
f6910d35f7 Merge branch 'miami' into lcs 
# Conflicts:
#	README.md
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/extras/postfx.cpp
#	src/render/Font.cpp
 2021-02-26 11:07:32 +02:00
Sergeanur
5bdbb5f802 Uhh, right 2021-02-26 11:05:37 +02:00
Sergeanur
b01d6be3f4 PoliceRadio -> PolRadio (original name) 2021-02-26 10:57:11 +02:00
Sergeanur
59c9ae29cf PoliceRadio -> PolRadio (original name) 2021-02-26 10:56:26 +02:00
Sergeanur
82ebd8aae1 Fix controls 2021-02-22 17:47:58 +02:00
Haydn Trigg
d506f8588c Fix stack corruption in HandleGraphEvent 2021-02-21 17:15:21 +01:00
erorcun
1d336d851d Fix Radio Off text more 2021-02-21 18:22:02 +03:00
Haydn Trigg
620155ac8d Fix stack corruption in HandleGraphEvent 2021-02-21 11:38:32 +00:00
erorcun
71cf666bbd A saner way to remove Stingers, may fix Physical crash 2021-02-20 23:58:08 +03:00
erorcun
040c6f9027 Fix split second Radio Off text 2021-02-19 22:56:39 +03:00
erorcun
14dcd8f04c Fix MP3 player 2021-02-19 22:32:11 +03:00
aap
b88cf7b939 make debug render groups optional 2021-02-19 18:41:47 +01:00
aap
9a7fa47857 make debug render groups optional 2021-02-19 18:41:31 +01:00
withmorten
8128e8e817 tiny sync with miami 2021-02-19 16:33:37 +01:00
withmorten
60bc816af5 nil -> false 2021-02-19 16:32:25 +01:00
withmorten
73fce903b8 nil -> false 2021-02-19 16:23:52 +01:00
erorcun
139c6bfcf3 Fix MP3 player 2021-02-19 14:30:41 +03:00
erorcun
bf7280b55b Get keyboard input from X11 on Linux 2021-02-19 02:36:47 +03:00
erorcun
dfa0c8bf19 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-02-19 02:30:02 +03:00
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
withmorten
48cec4a786 add NoMovies ini option, rename gDrawVersionText, always save ini after loading 2021-02-18 22:40:32 +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
6245a17e16 update librw; render groups only if extension supported 2021-02-18 20:31:46 +01:00
aap
3457ff48ce d3d9 debug render groups 2021-02-18 13:08:29 +01:00
aap
253021866c d3d9 debug render groups 2021-02-18 13:08:22 +01:00
aap
146ad3b4a1 fix last commit 2021-02-18 12:23:33 +01:00
aap
e8b435a624 fix last commit 2021-02-18 12:23:26 +01:00
aap
996772faf2 add debug render groups 2021-02-18 12:21:52 +01:00
aap
9db87fc636 add debug render groups 2021-02-18 12:21:47 +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
aap
a4412e8d63 update librw; gl cleanup 2021-02-18 01:58:36 +01:00
Sergeanur
ac88a00f06 Fix endless vibration in pause menu 2021-02-17 15:09:16 +02:00
Sergeanur
ee6b7152c7 Fix endless vibration in pause menu 2021-02-17 15:04:53 +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
erorcun
4d8f340827
Merge pull request #1050 from swills/controller_config_segfault_fix 
Fix seg fault when configuring controller
 2021-02-16 22:29:55 +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
Adrian Graber
19b39f49fa
Fix buffer overflow on re3_sem_open/close 2021-02-16 18:12:21 +01:00
Steve Wills
e482ab6292 Fix mistake 2021-02-16 11:13:20 -05: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
Steve Wills
20d9498fdb Put fix behind ifdef 2021-02-16 10:55:11 -05: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
1a64053da5
Merge pull request #986 from AGraber/nx-upstream 
Add toggle for (un)named semaphores and prevent linux header inclusion on non-linux paltforms
 2021-02-16 18:27:31 +03:00
erorcun
5ee4931fb6 Fix FindClose->closedir 2021-02-16 18:26:44 +03:00
erorcun
4368841f02 Fix rare stream deadlock on Windows 2021-02-16 17:55:42 +03:00
erorcun
49fd99119d Fix rare stream deadlock on Windows 2021-02-16 17:45:29 +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
edc77d7f00 removed some f suffixes from shaders 2021-02-15 15:06:45 +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
fec39e87c0 Revert "always console for windows Debug builds" 
This reverts commit a826091dc9.
 2021-02-15 14:57:19 +01:00
withmorten
a76c962aa3 always console for windows Debug builds 2021-02-15 14:27:35 +01:00
withmorten
a826091dc9 always console for windows Debug builds 2021-02-15 14:24:07 +01:00
erorcun
5ce5000b14 Try to fix streams stop after a while 2 2021-02-15 05:09:46 +03:00
Steve Wills
a666de46aa Fix seg fault when configuring controller 
Since controllerAction can be -2 (line 2105)
 2021-02-14 14:06:37 -05:00
erorcun
be55085303 Try to fix streams stop after a while 2021-02-14 20:45:58 +03:00
Fire-Head
0681fe3eca cannon fix 2021-02-14 20:11:58 +03:00
Fire-Head
0b6e46b1e4 cannon fix 2021-02-14 20:11:23 +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
withmorten
8d27dba4cd glfw window icon 2021-02-13 17:01:47 +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
Sergeanur
02ac7c309e Disable RANDOMSPLASH only if loading screen is disabled 2021-02-13 16:16:02 +02:00
Sergeanur
4907c56231 Disable RANDOMSPLASH 2021-02-13 16:10:14 +02:00
aap
333530e260 new icon 2021-02-13 14:54:51 +01:00
aap
04345643a0 new icon 2021-02-13 14:54:44 +01:00
aap
65f9917b65 clean up debug menu 2021-02-13 14:22:34 +01:00
aap
9c7d83ebc1 dbg menu again 2021-02-13 14:22:11 +01:00
aap
d0fbba19d1 debugmenu cleanup 2021-02-13 13:47:03 +01:00
aap
0f8614221b debugmenu cleanup 2021-02-13 00:00:02 +01:00
Fire-Head
291cdd4bfb iii icon fix 2021-02-13 01:35:48 +03: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
erorcun
6689b0be02 Fix XInput hotplug 2021-02-12 19:50:26 +03:00
Sergeanur
e98164ec41 Sync aspect ratio setting with master 2021-02-12 18:00:20 +02:00
erorcun
a44d7d86cb
Merge pull request #1029 from erorcun/master 
Remove version text, add toggleable debug info(with commit hash!)
 2021-02-12 18:15:51 +03:00
Filip Gawin
1b8d03f3aa Cmake version for hash 2021-02-12 16:38:03 +03: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
Sergeanur
e7a4a3516f Add english strings to translations as stubs, also translation notice 2021-02-12 07:52:21 +02:00
Sergeanur
2c194df591 Fix RW33 2021-02-12 05:37:30 +02:00
erorcun
9e1c048e20 Remove version text, add toggleable debug info(with commit hash!) 2021-02-12 05:28:08 +03:00
aap
879838c9f2 enable screenshots with F12 2021-02-12 00:29:09 +01:00
aap
f3bfdd7857 imrove readme; enable screenshots with F12 2021-02-12 00:06:54 +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
a6b56e6b7a Merge remote-tracking branch 'origin/master' 
* origin/master:
  startproject now depends on librw
  Ped jump teleport/kill fix
 2021-02-11 06:53:29 +02:00
Sergeanur
c9f804486d Fix setup 4 texts 2021-02-11 06:53:00 +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
Nikolay Korolev
3b0c958600 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-02-10 21:03:20 +03:00
aap
8fb3a3ff23 fix typo 2021-02-10 15:10:27 +01:00
erorcun
a6d402e8fd Ped jump teleport/kill fix 2021-02-10 15:34:48 +03: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
25703b04a2 fix clouds 2021-02-09 19:59:55 +01:00
aap
031df36935 CColModel 2021-02-09 17:45:02 +01:00
erorcun
d460c3863e Also check font textures for new languages 2021-02-08 18:21:00 +03: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
0eb1913713 Merge branch 'master' of https://github.com/GTAmodding/re3 2021-02-08 13:21:53 +03:00
Nikolay Korolev
6db96753d2 botch 2021-02-07 23:33:30 +03:00
Nikolay Korolev
9b9ffc4b13 ferries 2021-02-07 23:29:49 +03:00
erorcun
2cad49940e Use our synonyms for attack anims again 2021-02-07 21:13:54 +03:00
erorcun
d224f8b7ee Don't show menu map and new languages if gamefiles isn't copied 2021-02-07 20:38:53 +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
6662e60b63 reorganize shaders; use modulate flag; update librw 2021-02-06 16:33:17 +01:00
aap
cc435ea711 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-02-06 10:23:28 +01:00
erorcun
c7ba01b034 Detect joystick menu for XInput 2021-02-05 18:23:50 +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
withmorten
2bd8be5872 Fix inverted vertical camera 2021-02-05 12:08:14 +01:00
aap
9125e604b9 fix generic.txd crash 2021-02-05 10:58:01 +01:00
aap
5385d004ec fix generic.txd crash 2021-02-05 10:51:12 +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
bf299e5c17 fix MASTER crashes 2021-02-04 23:41:10 +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
7aaaaa953b CHud::Draw fix 2021-02-04 18:28:24 +01:00
withmorten
263a766d8e
revert Fix RW build 2021-02-04 01:40:45 +01:00
Sergeanur
61618389e1 Fix crash on changing anti aliasing 2021-02-04 01:52:57 +02:00
withmorten
e6d86bfab5 fix VC_PED_PORTS build 2021-02-03 23:37:10 +01:00
Sergeanur
e077a6bf28 Fix RW build 2021-02-03 22:21:16 +02:00
erorcun
c002dd6cba MP3 player fixes 2021-02-03 23:12:55 +03: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
91c3bdfa15
Merge pull request #1019 from Sergeanur/ControllerMenu2 
Controller menu
 2021-02-03 21:43:25 +02:00
Nikolay Korolev
aeccd8c166 Merge remote-tracking branch 'upstream/master' 2021-02-03 15:35:14 +03:00
Nikolay Korolev
f6326606b7 fix 2021-02-03 15:35:06 +03:00
erorcun
f541520040 Merge branch 'master' of https://github.com/gtamodding/re3 2021-02-03 15:12:24 +03:00
erorcun
7ff899bd22 OAL Loops, fixes 2021-02-03 15:10:27 +03:00
erorcun
f42f785c78
Merge pull request #1020 from erorcun/master 
MusicManager fixes
 2021-02-03 14:22:33 +03:00
erorcun
1667ffdd8f MusicManager fixes 2021-02-03 14:08:28 +03:00
Sergeanur
a7e11d134f Add undef 2021-02-03 02:53:54 +02:00
Sergeanur
adf07aab47 Fix compilation 2021-02-03 02:47:45 +02:00
Sergeanur
91612eb45a Controller menu 2021-02-03 02:41:12 +02:00
Sergeanur
b47a23ab79
Merge pull request #1001 from Sergeanur/animNames 
Use original animation names from VCS
 2021-02-03 02:14:48 +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
b65f8a3fe2 no advanced script log when log level is 0 2021-02-02 11:35:16 +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
4afa7b86ae Add radio off text 2021-01-31 23:44:30 +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
Filip Gawin
3d4791f291 Revert "First batch of fixes (CallAndMessage)" 
This reverts commit 7a3b80a9b7.
 2021-01-31 21:06:38 +01:00
Filip Gawin
7a3b80a9b7 First batch of fixes (CallAndMessage) 2021-01-31 20:44:39 +01: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
shfil
5de4e88d7a
fix realloc 2021-01-31 15:00:36 +01:00
Adrian Graber
b60baf46f6 Only include sys/syscall.h when __linux__ is defined 2021-01-31 14:27:06 +01:00
Adrian Graber
d76b58cc72 Add unnamed semaphore define toggle for CdStreamPosix 2021-01-31 14:27:00 +01:00
withmorten
da378077f7 renderer fix from miami 2021-01-31 02:08:42 +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
f61a91c97d Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-29 19:30:27 +03:00
erorcun
d52b917c54 Some regular fixes and UB fixes 2021-01-29 19:23:02 +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
f7fc919d98 add NewRenderer ini read/write 2021-01-29 16:46:03 +01: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
2e7405b76c CdStreamPosix fixes 2021-01-29 16:31:13 +03: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
Nikolay Korolev
7c38e2db24 fix 2021-01-28 23:23:49 +03:00
aap
64a4ed6db6 fixed uninitialized nearclip 2021-01-28 17:40:15 +01:00
aap
9e3c192376 fix some little UB 2021-01-28 15:35:35 +01:00
aap
ebb615d080 fix some little UB 2021-01-28 15:30:32 +01:00
erorcun
e1e4be9017 Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:57:12 +03:00
erorcun
2d0562412e Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:49:50 +03:00
Nikolay Korolev
9fc0ec0bf4 I hate ATanOfXY pt 2 2021-01-28 02:41:21 +03:00
erorcun
2b269ff1c0 Fix some Collision NaN/inf's 2021-01-28 02:18:04 +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
GaryOderNichts
d2cf090ace Fix texture conversion box 2021-01-27 23:06:43 +01: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
erorcun
8846f50cb7 Attempt to fix input delays on GLFW 2021-01-27 18:26:48 +03:00
erorcun
843dd9b5e1 Clean up POSIX streaming code 2021-01-27 18:26:08 +03: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
Sergeanur
0f623c2354 Use original animation names from VCS 2021-01-26 19:35:40 +02:00
Sergeanur
f27e1ec818 Fix doubles in ZoneCull 2021-01-26 19:26:28 +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
erorcun
cb34060f00 Support pads without L2-R2, add comments 2021-01-25 16:48:41 +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
4564f7aeea modelinfo fixes 2021-01-24 23:24:41 +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
shfil
1d3b4d1e9a
Add cmake option for sanitizers 2021-01-24 21:34: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
erorcun
5336620f5c Ped: car enter anim. fix 2021-01-24 20:05:43 +03:00
erorcun
a0bf47cfd2 Fix out of bound binding orders 2021-01-24 19:39:31 +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
shfil
3e6bb267f3
Fix CCollision::DistToLine 2021-01-24 12:34:40 +01:00
aap
c1a7ded1e4 CBaseModelInfo 2021-01-24 00:07:45 +01:00
withmorten
5183d7cf0f enable default resolution for vanilla defines 2021-01-23 23:18:05 +01:00
withmorten
db6b7b473d whitespace fix 2021-01-23 23:02:22 +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
6bdc0365ee another backport 2021-01-23 23:15:50 +03:00
Nikolay Korolev
4abebbe3b2 use ARRAY_SIZE 2021-01-23 23:12:25 +03:00
Nikolay Korolev
921ca7712e use ARRAY_SIZE 2021-01-23 23:10:59 +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
Nikolay Korolev
35258b9b9c added some missing functions 2021-01-23 15:29:00 +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
withmorten
2650fa9a92 VANILLA_BUILD fixes 2021-01-23 02:17:28 +01: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
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
withmorten
6f4e2ab491 get rid of unsupported LIBRW in config.h 2021-01-22 22:47:29 +01:00
withmorten
5988c0e95a fix tabs in crossplatform 2021-01-22 22:01:00 +01:00
erorcun
0ea72af60c Peds reporting to phone changes for GTA3D 2021-01-22 23:58:57 +03:00
erorcun
226e3b83da No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-22 23:43:49 +03:00
withmorten
f6c846d27a fix 2021-01-22 21:27:18 +01:00
withmorten
3b4e79f073 small fix regarding codewarrior and AUDIO_MSS 2021-01-22 21:10:49 +01:00
withmorten
d58f090198 fix RW33 build, undef ANISOTROPIC_FILTERING for vanilla build 2021-01-22 20:33:29 +01:00
Filip Gawin
e9adf8162b fix 2021-01-22 19:59:27 +01:00
Filip Gawin
609cad506f Better output for validating size assert 2021-01-22 19:54:43 +01: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
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
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
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
withmorten
497e0b801f m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:19:44 +01:00
withmorten
a511d79bf0 free cam fixes 2021-01-21 23:21:03 +01:00
aap
69500eed56 how the hell did that happen? 2021-01-21 22:35:11 +01:00
aap
c67273e92a fixed anisotropic filtering; updated librw 2021-01-21 22:30:20 +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
withmorten
ef24783bff
Merge pull request #968 from withmorten/cw 
make building with Codewarrior 7 possible
 2021-01-21 21:55:33 +01: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
withmorten
034df61f3c codewarrior: finishing touches 2021-01-21 19:42:51 +01: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
aap
6df52f06b6 enable screenshots for librw 2021-01-21 10:19:01 +01:00
withmorten
f2596b3759 Merge remote-tracking branch 'upstream/master' into cw 2021-01-21 03:20:31 +01:00
withmorten
ac0f759b27 make building with Codewarrior 7 possible 2021-01-21 03:18:15 +01:00
Nikolay Korolev
8e825fa629 fixed saving 2021-01-20 22:16:11 +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
c54f5c4b4f
Merge pull request #971 from Sergeanur/PoolFlags 
Get rid of bitfields in CPool
 2021-01-20 18:59:49 +02:00
Sergeanur
9b193a47a2
Merge pull request #966 from Sergeanur/matrix 
Get rid of RwMatrix in CMatrix
 2021-01-20 18:59:33 +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
dac4dd560a saves 2021-01-19 23:34:37 +03:00
aap
505438cd90 Merge branch 'master' of github.com:GTAmodding/re3 2021-01-19 21:33:17 +01:00
aap
bb66028e74 pc radar fix 2021-01-19 21:33:09 +01:00
aap
7e136a792f work on colourfilters 2021-01-19 20:42:16 +01:00
Sergeanur
a9b8d30ce0 Get rid of bitfields in CPool 2021-01-19 21:32:55 +02:00
Sergeanur
e6ef164441 Get rid of VuVector 2021-01-19 18:38:10 +02:00
withmorten
25d3066eae fix RWLIBS build without GTA_PS2_STUFF 2021-01-19 12:05:38 +01:00
aap
8baae4c77f PSP rendering and shader cleanup 2021-01-19 11:38:51 +01:00
aap
c295981c5a fix handbrake 2021-01-19 09:06:43 +01:00
Sergeanur
3ebd08e38c Merge branch 'lcs' into lcsfont 
* lcs:
  fix
  some free cam fixes for controller
  initial work on vehicles
 2021-01-19 03:25:00 +02:00
Sergeanur
f38ff074c4 more font 2021-01-19 03:24:02 +02:00
Nikolay Korolev
c124bbe4bf Merge branch 'lcs-dev' into lcs 2021-01-19 02:38:28 +03:00
Nikolay Korolev
061fd25c61 fixes 2021-01-19 02:38:02 +03:00
Nikolay Korolev
923abb94d8 Merge branch 'lcs-dev' into lcs 2021-01-19 00:03:52 +03:00
Nikolay Korolev
03cf1e7535 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-19 00:00:12 +03:00
Nikolay Korolev
8b80a8803b fix 2021-01-18 23:59:54 +03:00
Nikolay Korolev
ef59c623fd Merge remote-tracking branch 'upstream/master' 2021-01-18 23:59:16 +03:00
Nikolay Korolev
8c1f4ba65d fix 2021-01-18 23:59:07 +03:00
Nikolay Korolev
47c697feca fixes 2021-01-18 23:58:26 +03:00
Nikolay Korolev
177680216c fix 2021-01-18 22:30:18 +03:00
Nikolay Korolev
14a1d3d251 Merge branch 'lcs' into lcs-dev 2021-01-18 22:20:27 +03:00
Nikolay Korolev
239dd55146 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-18 22:19:50 +03:00