mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-27 09:53:45 +00:00
Code Issues Projects Releases Wiki Activity
4185 commits 3 branches 0 tags 63 MiB
Commit graph

3529 commits

Author SHA1 Message Date
withmorten
ce9eafcd51 sync WaterLevelInit with master, and other small fixes 2020-12-15 21:55:04 +01:00
Walied K. Yassen
55414f7ef2
Few bug fixes in CAutomobile 2020-12-15 18:05:37 +02:00
erorcun
b834d92585 radio scroll fix 2020-12-15 18:37:21 +03:00
erorcun
cac7516d39 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-15 17:55:33 +03:00
erorcun
64b509af52 Make free cam collision code readable by aap, fixes 2020-12-15 17:49:43 +03:00
erorcun
970f84514a Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-15 17:45:06 +03:00
erorcun
59caa98c43 Make free cam collision code readable by aap, fixes 2020-12-15 17:33:51 +03:00
aap
6d3adf57e8 fixed water.dat code 2020-12-15 14:36:30 +01:00
aap
e594f1d81d
Merge pull request #883 from withmorten/waterlevel 
add dev build code for generating waterpro.dat
 2020-12-15 11:43:29 +01:00
Walied K. Yassen
37d3188ce7
Few bug fixes in CAutomobile 2020-12-15 12:20:55 +02:00
Sergeanur
8f2abc6750 fix 2020-12-15 05:11:45 +02:00
Sergeanur
f76dfaee82 Use SetPedState 2020-12-15 05:11:02 +02:00
erorcun
984b8efccc Radio scroll to prev. station & radio off text 2020-12-15 05:51:53 +03:00
Sergeanur
e970e5f246 Use SetMoveState 2020-12-15 04:25:12 +02:00
Sergeanur
ac95138c18 More fixes 2020-12-15 04:16:29 +02:00
Sergeanur
ab3e258f19 SetPedState fixes 2020-12-15 03:25:05 +02:00
withmorten
7be7845db0 add dev build code for generating waterpro.dat 2020-12-15 00:05:02 +01:00
shfil
3b8ac474a2
Implement COMMAND_IS_CAR_PASSENGER_SEAT_FREE 
Fixes 881
 2020-12-14 15:33:16 +01:00
Seemann
0563478de0 Fix some formatting issues 2020-12-14 11:18:46 +02:00
Sergeanur
f42a01f653 CPed::SetWeaponLockOnTarget 2020-12-14 09:47:07 +02:00
erorcun
c0652b8203 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-14 02:52:14 +03:00
erorcun
0448ae662f Fix language initialization call order 2020-12-14 02:50:34 +03:00
erorcun
0f5893ed60 Fix language initialization call order 2020-12-14 02:46:55 +03:00
erorcun
91902a031e Enable our Linux joystick handling 2020-12-14 02:43:07 +03:00
aap
e8fe09cf23 another fix for new renderer 2020-12-13 23:09:19 +01:00
aap
9be5bfe75b sync vis-plugins with miami 2020-12-13 12:58:15 +01:00
aap
e3616c1ce1 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-13 12:53:27 +01:00
aap
35cac6b93b some rendering things 2020-12-13 12:53:19 +01:00
Nikolay Korolev
8fb461b873 removed obsolete ifdef (since we have GTA_REPLAY) 2020-12-13 00:20:44 +03:00
Nikolay Korolev
6d61f9d2e1 fixed replay bugs 2020-12-12 23:17:16 +03:00
Nikolay Korolev
f5330990b1 Merge remote-tracking branch 'upstream/master' 2020-12-12 23:05:47 +03:00
Nikolay Korolev
01c95378e1 fixed some replay bugs 2020-12-12 23:05:12 +03:00
Nikolay Korolev
bfe382c315 better fix 2020-12-12 21:06:14 +03:00
erorcun
b3f97cdce4 style change 2020-12-12 20:39:34 +03:00
Nikolay Korolev
229b8f304a fixed a bug 2020-12-12 20:37:26 +03:00
erorcun
347e1da364 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-12 20:37:12 +03:00
erorcun
c74f03b180 Kill obj. fix & style change 2020-12-12 20:36:58 +03:00
Nikolay Korolev
82c40b73ca fixed a bug 2020-12-12 20:35:17 +03:00
erorcun
3038fba9ca Sync Frontend, Peds with miami 2 2020-12-12 18:20:21 +03:00
Nikolay Korolev
78718700f9 quick fix 2020-12-12 13:00:40 +03:00
aap
4f3be49728
Merge pull request #868 from erorcun/miami 
Frontend cleanup, .INI, CFO, scrollable pages
 2020-12-12 10:43:06 +01:00
Nikolay Korolev
4197498e2d fixed garages + minor fixes 2020-12-12 12:24:55 +03:00
erorcun
fc3cdf3b3b Sync Frontend with miami 1 2020-12-09 21:43:58 +03:00
erorcun
1caf5d087a Sync Stats page style with miami - and a little veh. cam. fix 2020-12-09 15:39:14 +03:00
aap
ccbbde549e
Merge pull request #869 from Nick007J/miami 
garages revision + fixes
 2020-12-09 09:55:50 +01:00
erorcun
c504cf02e4 Vehicle cam object collision fix 2020-12-09 07:15:04 +03:00
erorcun
95fe5004c8 Fix 2020-12-09 06:36:51 +03:00
erorcun
cf4aedd97c Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by default 2020-12-09 06:36:28 +03:00
erorcun
ba0c9e8b29 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-12-09 06:34:04 +03:00
erorcun
b473adcf80 Frontend cleanup, .INI, CFO, scrollable pages 2020-12-09 06:32:33 +03:00
erorcun
33e1f28239 Vehicle cam fixes 
- @ZLau92 's idea to remove 3rd person check on num 2/8.
  It was meaningless on III, probably not on VC tho.
- @Nick007J pointed out that camera wasn't checking objects,
  which was something done by someone to prevent camera to
  collide with traffic lights. Instead I enabled object check again,
  and comparing the result if it's a traffic light after the test.
 2020-12-09 06:09:48 +03:00
erorcun
e1044a7947 AnimViewer fixes, commentary from miami 2020-12-09 05:10:57 +03:00
erorcun
0dfa833610 Fix 2020-12-09 03:55:30 +03:00
erorcun
122c7aa40d Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by default 2020-12-09 03:41:45 +03:00
erorcun
ac3484b82e
Merge pull request #872 from withmorten/sized-enums-miami 
Get rid of sized enums 2: Electric Boogaloo
 2020-12-09 03:31:03 +03:00
erorcun
6b654094a5
Merge pull request #871 from withmorten/sized-enums 
Get rid of sized enums
 2020-12-09 03:15:20 +03:00
aap
c8b0f0bdf8 fix CObject::DeleteAllTempObjectsInArea 2020-12-08 23:16:38 +01:00
aap
f6cc178a50 fix CObject::DeleteAllTempObjectsInArea 2020-12-08 23:15:59 +01:00
erorcun
eaf32190ca Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-08 23:35:27 +03:00
erorcun
fc6f07345e Red delete menu background 2020-12-08 23:33:51 +03:00
Walied K. Yassen
a35c96c5ec
Fix DeleteAllTempObjectsInArea and bunch of random gen ranges 2020-12-08 21:22:05 +02:00
shfil
95094e45af
Merge pull request #873 from madebr/openal_static 
audio: define openal extensions in re3 owned namespace
 2020-12-08 16:40:57 +01:00
Nikolay Korolev
016ff5b4aa sync with upstream 2020-12-08 12:00:24 +03:00
Sergeanur
f3e9c82432 Pool fixes from master 2020-12-08 07:52:03 +02:00
Sergeanur
778d1381bb Add NUM_LEVELS 2020-12-08 07:50:29 +02:00
Sergeanur
579efc05fc Fix bike's fInAirXRes 2020-12-08 05:26:48 +02:00
Sergeanur
b13b26b5fb GenerateOneRandomCar cleanup 2020-12-08 03:33:56 +02:00
Sergeanur
aae4f3319f Fixes 2020-12-08 03:29:08 +02:00
Sergeanur
8d3864a4e5 Fix CRecordDataForChase::ShouldThisPadBeLeftAlone 2020-12-08 02:56:20 +02:00
Sergeanur
84cc31fea3 Fix wrong define 2020-12-08 02:27:35 +02:00
Sergeanur
8844caf44d Fix vanilla font bug 2020-12-08 02:22:02 +02:00
aap
61c6b28237
Merge pull request #847 from waliedyassen/CObject-fixes 
CObject fixes
 2020-12-07 22:03:12 +01:00
Sergeanur
64049f0f81 Fix font bug 2020-12-07 22:56:22 +02:00
Fire-Head
87bca997a4 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-07 21:50:18 +03:00
Fire-Head
c5fbb594a5 ps2 hud, restore original code 2020-12-07 21:12:13 +03:00
Anonymous Maarten
5a1ea7bcf5 audio: define openal extensions in re3 owned namespace 2020-12-07 19:05:58 +01:00
withmorten
7e11f639aa don't cast script param to uint8 2020-12-07 02:02:59 +01:00
withmorten
4c0744260d uint8 enums fixed 2020-12-07 01:59:17 +01:00
withmorten
912e71be53 int8 enums fixed 2020-12-07 01:30:38 +01:00
withmorten
16ed00aede uint16 enums fixed 2020-12-07 01:22:51 +01:00
withmorten
e6a7a9353c uint32 enums fixed 2020-12-07 01:20:14 +01:00
withmorten
7ad86595e4 int32 enum fixed 2020-12-07 01:19:10 +01:00
withmorten
5e9a433b79 int32 enum fixed 2020-12-07 01:05:45 +01:00
withmorten
9e2ac26a1d uint32 enums fixed 2020-12-07 01:04:23 +01:00
withmorten
b5ffea5c6e uint16 enums fixed 2020-12-07 00:57:34 +01:00
withmorten
afdf8c25a0 int8 enums fixed 2020-12-07 00:56:12 +01:00
withmorten
4696e3f9c8 uint8 enums fixed 2020-12-07 00:36:40 +01:00
Walied K. Yassen
190bcf68f3
Implement DAMAGE_EFFECT_SMASH_VEGPALM and code style fixes 2020-12-07 01:11:40 +02:00
Anonymous Maarten
12d3893fe9 crossplatform is needed for casepath on non-Windows systems 2020-12-06 20:46:11 +01:00
Anonymous Maarten
3a66b17887 inttypes.h is part of the C++ standard, so prefix it 2020-12-06 20:46:11 +01:00
Nikolay Korolev
406f646949 pool stuff fix 2020-12-06 21:28:40 +03:00
Nikolay Korolev
17a939e38d quick fix 2020-12-06 19:34:43 +03:00
Nikolay Korolev
fe918d41c2 garages revision + some fixes 2020-12-06 19:30:51 +03:00
Nikolay
14eb0cd286
fixed parenthesis 2020-12-06 15:27:42 +03:00
Nikolay
efb28b888d
fixed ANCHOR_BOAT 2020-12-05 22:26:45 +03:00
aap
28a942735c fix pMemoryTop 2020-12-05 14:50:54 +01:00
Nikolay Korolev
a82188ac07 lil fix 2020-12-05 12:12:56 +03:00
Nikolay Korolev
0bd373cd56 script from other platforms and unused commands 2020-12-05 02:49:32 +03:00
aap
466eee84e7 typo 2020-12-04 10:23:04 +01:00
aap
9714a37769 bit more GTA_VERSION and GTA_PS2 2020-12-04 01:12:58 +01:00
aap
43fb7fe342 one more original name 2020-12-03 19:11:57 +01:00
aap
5bed7afd79 forgot some junk 2020-12-03 16:56:32 +01:00
aap
a6c4d9b77c forgot to wrap in FIX_BUGS 2020-12-03 16:07:16 +01:00
aap
955698d2d3 kludge to prevent dodo unique jumps 2020-12-03 16:05:28 +01:00
aap
13cefd3293 more PS2 stuff; memory movement done 2020-12-03 16:04:59 +01:00
aap
0d166081ad animviewer fixes 2020-12-03 11:30:46 +01:00
aap
3c24505990 little fixes for animviewer 2020-12-03 09:34:09 +01:00
erorcun
ab3e810a95 AnimViewer done, comment cleanup 2020-12-03 05:22:58 +03:00
erorcun
8b47774aee Stats page 2020-12-03 02:09:35 +03:00
aap
448ba9b7e8 bla 2020-12-02 13:08:30 +01:00
aap
50bf0f27a0 rpDefaultGeometryInstance 2020-12-02 12:58:29 +01:00
erorcun
774aa1570f
Merge pull request #853 from erorcun/miami 
PlayerPed and "Redefine controls" menu done, fixes
 2020-12-02 14:35:06 +03:00
erorcun
bd8b907d13 PlayerPed and "Redefine controls" menu done, fixes 2020-12-02 14:21:46 +03:00
aap
1172056833 cam lod dist fix 2020-12-02 10:39:23 +01:00
aap
f576311814 Merge branch 'master' of github.com:GTAmodding/re3 2020-12-02 10:38:39 +01:00
aap
fba657ff0c better cam lod dist fix 2020-12-02 10:38:27 +01:00
Nikolay Korolev
4b9f1680a3 fast fix 2020-12-02 02:41:05 +03:00
Nikolay Korolev
fda58fb1df added GTA_SCENE_EDIT 2020-12-02 02:34:51 +03:00
Sergeanur
43d5831394 cAudioManager::ProcessPedOneShots + fixes 2020-12-01 23:38:36 +02:00
Sergeanur
a259b6b8ab TexturePools 
# Conflicts:
#	src/core/Game.cpp
#	src/rw/RwHelper.cpp
 2020-12-01 22:54:19 +02:00
Sergeanur
24b5406a1d Add GTA_REPLAY 
# Conflicts:
#	src/control/Replay.cpp
#	src/control/Replay.h
 2020-12-01 22:53:09 +02:00
Sergeanur
0b20fd7e77 Remove ifndef GTA_PS2 around replays 2020-12-01 22:35:53 +02:00
Sergeanur
9461998304 TexturePools 2020-12-01 22:12:46 +02:00
Sergeanur
e33ab44b7d Add GTA_REPLAY 2020-12-01 22:08:05 +02:00
aap
83bbb631d1 some more GTA_VERSIONs and CGame tidy-up (not much actual memory moving yet) 2020-12-01 17:42:18 +01:00
aap
b8bc54640d fix cam-fix 2020-12-01 17:24:56 +01:00
aap
56c471d02e
Merge pull request #854 from Nick007J/master 
small garages + templates revision
 2020-12-01 11:25:02 +01:00
aap
8de7072720
Merge pull request #857 from majesticCoding/miami 
skimmer shadow
 2020-12-01 11:24:24 +01:00
aap
d545246bbf plane fix 2020-12-01 10:19:11 +01:00
aap
d6fab1bc53 cam stuff 2020-12-01 10:12:42 +01:00
aap
6dcbc8f062
Merge pull request #856 from ZLau92/patch-2 
Update Camera.cpp - Vehicle spawning on ultrawide aspect ratios
 2020-12-01 10:00:58 +01:00
majestic
cd23695116 skimmer shadow 2020-11-30 23:52:35 -08:00
Sergeanur
5a3a058ed3 Make texture conversion work a bit faster 
# Conflicts:
#	src/core/config.h
 2020-12-01 03:51:31 +02:00
Sergeanur
16abbad6b2 Add multisampling to librw 
# Conflicts:
#	src/core/config.h
#	vendor/librw
 2020-12-01 03:42:40 +02:00
withmorten
b8d3d8f5e4 add -console cmdline arg instead of #if 0/1 
# Conflicts:
#	src/skel/glfw/glfw.cpp
#	src/skel/win/win.cpp
 2020-12-01 03:41:09 +02:00
erorcun
4ec60676e7
Merge pull request #846 from withmorten/ini 
add -console cmdline arg instead of #if 0/1
 2020-12-01 04:21:00 +03:00
Zach Charo
6eb0fd52d7
Update Camera.cpp 
camdist multiplier is consitently between 1 and 1.4 on 16:9 aspect ratio
On ultrawide, the cam dist multiplier jumps to anywhere between 2 and 3
The preferred distance generator for car objects is the cam dist multiplier * 120. Which puts cars that it's trying to generate outside of the allowed gen/draw distance for new car objects when on ultrawide. This means no new cars can spawn.
This change caps the scaling for the generation distance a bit above what it would be for 16:9 and does not affect the LOD multiplier.
 2020-11-30 19:08:15 -06:00
aap
2c59e1c894 some more GTA_VERSION 2020-12-01 00:22:57 +01:00
aap
4b9fb631fc added a few registered pointers and memory debug 2020-11-30 23:44:58 +01:00
Walied K. Yassen
1dcd7c5b14
Fix the code style issues 2020-11-30 08:36:06 +02:00
Walied K. Yassen
ac7ea2b9fa
Implement the missing damage effects and fix the existing ones 2020-11-30 02:09:35 +02:00
Nikolay Korolev
a3b83a5d2f Merge remote-tracking branch 'upstream/master' 2020-11-30 02:15:35 +03:00
Nikolay Korolev
8f05ccd6c4 small garages revision + small template stuff 2020-11-30 02:15:03 +03:00
aap
d5bc382cb5 GTA_VERSION define and some config.h cleanup 2020-11-29 21:29:48 +01:00
aap
566282057a add debug script hotkey 2020-11-29 11:37:06 +01:00
aap
5282696699 fix backface culling on vehicles 2020-11-29 11:36:26 +01:00
Walied K. Yassen
a1ab82b188
Implement MI_BEACHBALL behaviours 2020-11-29 09:14:15 +02:00
Walied K. Yassen
afe70003f4
Fix MI_RCBOMB gravity force and treat MI_PETROLPUMP2 as explosive 2020-11-29 08:53:54 +02:00
Walied K. Yassen
03ef438a72
Fix CObject::DeleteAllTempObjectsInArea not considering the given point 2020-11-29 04:20:28 +02:00
Nikolay Korolev
8cb3c07151 some nasty FIX_BUGS for SLIDE_OBJECT 2020-11-28 21:26:38 +03:00
aap
c57fee38ca
Merge pull request #841 from aap/master 
start using CMemoryHeap; also some PS2 define cleanup
 2020-11-28 18:52:44 +01:00
withmorten
b1a431a740 add -console cmdline arg instead of #if 0/1 2020-11-28 17:57:10 +01:00
aap
a8035b6466 moved some stuff to MemoryMgr 2020-11-28 17:05:57 +01:00
aap
b23bda6e45 Merge branch 'master' of github.com:GTAmodding/re3 2020-11-28 16:02:21 +01:00
Sergeanur
ad48b9cde0 Make texture conversion work a bit faster 2020-11-28 16:29:45 +02:00
Sergeanur
18d0fd2e48 Add multisampling to librw 2020-11-28 15:13:06 +02:00
Zach Charo
b47c505438 Update Script.cpp 
Case sensitivity fix. Causes compile issue on linux.
 2020-11-28 13:36:38 +02:00
Nikolay Korolev
f50a53e290 fix garages 2020-11-27 19:18:51 +03:00
aap
d857758c16 start using CMemoryHeap 2020-11-26 17:39:59 +01:00
Sergeanur
491274f188 CStreaming::PrintStreamingBufferState 2020-11-26 18:11:55 +02:00
aap
4ddc356341 memory heap starting to work 2020-11-25 22:49:50 +01:00
aap
88baa9ce5f implemented CMemoryHeap, not used or tested yet 2020-11-25 21:34:06 +01:00
Sergeanur
164f16c85b Some TODOs done in Peds code 2020-11-25 19:39:57 +02:00
Sergeanur
8f5e60f787 Original enum name 2020-11-24 17:16:39 +02:00
aap
70d8bdc087 rename badly named camera variable 2020-11-24 15:20:41 +01:00
aap
1906a08f72 cam fix; forgot some shaders 2020-11-24 15:18:39 +01:00
Sergeanur
a35b3b4602 Script commands split to original files 2020-11-24 14:06:48 +02:00
Sergeanur
bd3d09fef5 Script commands split to original files 2020-11-24 12:58:11 +02:00
erorcun
b7783b19d2 Xbox message screen, disabled by default 2020-11-24 01:45:54 +03:00
Sergeanur
833bf4a619 Add some TODO stubs for unused code to be reversed 2020-11-23 18:59:50 +02:00
aap
b2f9b3175b two unused functions 2020-11-23 11:06:16 +01:00
aap
b6da31cfaa two unused functions 2020-11-23 09:38:51 +01:00
aap
9b4cfa618d
Merge pull request #827 from aap/master 
finished cullzones
 2020-11-22 22:49:22 +01:00
Sergeanur
103b8fb426 More audio fix 2020-11-22 23:24:38 +02:00
Sergeanur
3289bfaa87 Darkel done 2020-11-22 23:18:35 +02:00
Sergeanur
87e6edd554 Renderer fix 2020-11-22 23:16:21 +02:00
Nikolay
2b53f267a7 one more fix 
# Conflicts:
#	src/control/Restart.cpp
 2020-11-22 23:13:43 +02:00
Nikolay
6a6551f39b small improvement 
# Conflicts:
#	src/control/Restart.cpp
 2020-11-22 23:13:23 +02:00
Sergeanur
c814a0a1a6 Renderer fix 2020-11-22 23:11:55 +02:00
Sergeanur
f010777e58 Audio fixes 2020-11-22 23:10:41 +02:00
Nikolay
222e7f56ff
one more fix 2020-11-22 02:31:52 +03:00
Nikolay
d24e1ee592
small improvement 2020-11-22 02:29:17 +03:00
aap
07303c62d1 finished cullzones 2020-11-22 00:13:07 +01:00
aap
15ae9e2a3e
Merge pull request #823 from aap/master 
Neo screen droplets
 2020-11-22 00:12:34 +01:00
aap
b9b7d5ac21
Merge pull request #825 from aap/miami 
neo screen droplets
 2020-11-22 00:12:31 +01:00
Nikolay
6b6b600cee
no script logging 2020-11-21 21:12:47 +03:00
Sergeanur
fe40f65703 Reorganize CPed functions into their original cpp files 2020-11-20 01:18:37 +02:00
Sergeanur
9e45feb4fa Reorganize CPed functions into their original cpp files 2020-11-19 21:12:20 +02:00
aap
07fe099b4e neo screen droplets 2020-11-19 19:07:32 +01:00
aap
02c7f8381b neo screen droplets 2020-11-19 16:23:52 +01:00
aap
a0a8bb8d92
Merge pull request #822 from aap/master 
CPed review part1,2 re3
 2020-11-19 15:20:53 +01:00
erorcun
808f7c46f1 Infamous XBOX subtitle outline 2020-11-19 02:09:04 +03:00
erorcun
54214dd2c4 Fix mouse lock/high-dpi 2020-11-18 17:42:21 +03:00
Greg V
2ce9e540da Use CLOCK_MONOTONIC_FAST when available (FreeBSD) 
CLOCK_MONOTONIC_FAST is the equivalent of Linux's CLOCK_MONOTONIC_RAW.
 2020-11-18 17:13:03 +03:00
Greg V
1544acff05 Use GLFW_CURSOR_DISABLED (glfw's native mouse restriction) 
On Wayland, clients cannot move the mouse pointer.
Mouse constraints, as required for 3D camera movement, are an explicit specific thing,
and glfw supports it with GLFW_CURSOR_DISABLED.
Use DISABLED, unless we're in a menu in windowed mode, where HIDDEN is still appropriate.
 2020-11-18 17:10:56 +03:00
Greg V
7c1497a058 glfw: scale cursor position by the ratio of framebuffer to screen size 
This fixes the mouse being constrained to the top left quarter of the window on Wayland HiDPI setups.
 2020-11-18 17:10:49 +03:00
Greg V
d05c50ea74 Use glfwSetFramebufferSizeCallback instead of glfwSetWindowSizeCallback 
Framebuffer size is scaled by the display scale.
This fixes the game being shrunk to the bottom left quarter of the window on Wayland HiDPI setups.

Corresponding change in librw: glfwGetWindowSize -> glfwGetFramebufferSize.
 2020-11-18 17:09:10 +03:00
aap
91f9c7938e CPed review part1,2 re3 2020-11-18 12:38:47 +01:00
aap
9826fdf6d5 more fixes to librw stuff 2020-11-18 11:16:02 +01:00
aap
acb29e0dad more fixes to librw stuff 2020-11-18 11:15:27 +01:00
aap
8c70c2a136 changes to librw layer, GLES now runtime choice 2020-11-18 10:32:18 +01:00
aap
82b0103c67 changes to librw layer, GLES now runtime choice 2020-11-18 10:27:55 +01:00
aap
448c56647f
Merge pull request #821 from aap/miami 
CPed review part2
 2020-11-18 10:04:12 +01:00
erorcun
1d600c640a
Merge pull request #816 from erorcun/miami 
Frontend: Stats, Map, Audio inputs, Radio selector
 2020-11-18 01:45:28 +03:00
erorcun
b58a54527e
Merge pull request #820 from withmorten/mission-switcher 
add mission switcher from miami
 2020-11-18 01:45:12 +03:00
erorcun
c6f53d25b0 Frontend: Stats, Map, Audio inputs, Radio selector 2020-11-18 00:33:45 +03:00
aap
19d9430314 fix flag 2020-11-16 22:57:37 +01:00
aap
46253fbf7d Merge branch 'master' of github.com:GTAmodding/re3 2020-11-16 22:43:35 +01:00
aap
3564b85b4e animation compression from PS2 2020-11-16 22:43:15 +01:00
Nikolay Korolev
b9b9dabd75 lcs car ctrl 2 2020-11-16 22:20:56 +03:00
Sergeanur
e71da86a5c pragma twice 2020-11-16 15:05:29 +02:00
Sergeanur
a802ad5c27 pragma twice 2020-11-16 15:05:02 +02:00
Sergeanur
6bc2ed74fe Add debug code to CPathFind::PreparePathDataForType 2020-11-16 14:56:07 +02:00
erorcun
f33ed2892a Fix mouse lock/high-dpi 2 2020-11-16 15:49:00 +03:00
erorcun
3b1debaa0d Fix mouse lock/high-dpi 2020-11-16 15:28:10 +03:00
erorcun
72c0a6a680
Merge pull request #723 from myfreeweb/master 
Fixes for Wayland (HiDPI and mouse lock) support, FreeBSD
 2020-11-16 15:20:20 +03:00
Nikolay
b508458f37
small fix 2020-11-16 15:13:30 +03:00
Sergeanur
cdd30f4da5 Move ColStore to collision 2020-11-16 12:49:23 +02:00
Nikolay Korolev
ed5a9d5dc1 Merge branch 'miami' into lcs-dev 2020-11-16 12:48:28 +03:00
Nikolay Korolev
15b7126243 small fix of fix 2020-11-16 12:28:20 +03:00
Nikolay Korolev
0ac621588e small fix 2020-11-16 12:22:55 +03:00
Nikolay Korolev
7339ebce60 lcs car ctrl 1 2020-11-16 12:21:50 +03:00
aap
b82b79fa11 CPed review part2; and reverting some stylistic changes 2020-11-16 09:57:33 +01:00
aap
acdf602505 change gl caps.dat constants 2020-11-16 09:48:38 +01:00
aap
6804ad62c6 little fix to ps2 CPad 2020-11-16 09:48:15 +01:00
aap
5335b46cbb little fix to ps2 CPad 2020-11-16 09:48:02 +01:00
aap
8a8f2d4e5b
Merge pull request #815 from aap/miami 
CPed review part 1
 2020-11-16 09:45:47 +01:00
aap
2f9a905c61 change gl caps.dat constants 2020-11-16 09:41:39 +01:00
withmorten
abcda2ce29 add mission switcher from miami 2020-11-16 00:41:03 +01:00
withmorten
207f8576d8 move config.h define to CUSTOM_FRONTEND_OPTIONS 2020-11-16 00:21:04 +01:00
withmorten
f0071c094a remove unneeded ifdef 2020-11-16 00:07:27 +01:00
Sergeanur
9bb8ebaa10 Make collision code placement more like original (+ small fixes) 
# Conflicts:
#	premake5.lua
#	src/CMakeLists.txt
#	src/collision/Collision.cpp
#	src/core/Collision.h
 2020-11-16 00:36:54 +02:00
withmorten
ac29ae6e23 add CFO for invertlook4pad; update american.gxt 2020-11-15 23:06:29 +01:00
withmorten
0669df763c Merge branch 'upstream/master' 2020-11-15 22:08:40 +01:00
withmorten
ad10d3e64e revert frontend changes for invertlook4pad 2020-11-15 22:07:44 +01:00
Sergeanur
a6f5f4634c Make collision code placement more like original (+ small fixes) 2020-11-15 19:51:35 +02:00
Sergeanur
be205d9602
Merge pull request #797 from theR4K/master 
Make code in master same like in audio PR for miami
 2020-11-15 14:55:40 +02:00
Nikolay Korolev
26c6908d25 car AI revision 2020-11-14 14:21:56 +03:00
Sergeanur
8374a346e5 Fix loading island LODs with big buildings 2020-11-13 18:28:15 +02:00
Nikolay Korolev
6682e56f71 small fix 2020-11-13 17:53:03 +03:00
Nikolay Korolev
3048a77a05 fix 2020-11-13 16:02:06 +03:00
aap
257f45c3c3 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-11-13 13:14:56 +01:00
aap
8ab0d25b4a CPed review, part 1 2020-11-13 13:14:22 +01:00
Nikolay Korolev
a3f24d1bbf Merge remote-tracking branch 'upstream/miami' into miami 2020-11-13 13:20:07 +03:00
Nikolay Korolev
2e915780aa some fixes 2020-11-13 13:19:54 +03:00
aap
3d46f2a3af fixed bike collision damage 2020-11-12 20:05:02 +01:00
erorcun
4f8029ad7c Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-11-12 17:37:04 +03:00
erorcun
b67ed1988f Peds: Remove redundant lines 2020-11-12 17:36:41 +03:00
Nikolay Korolev
55c9a81922 fixed zone bug 2020-11-12 17:32:16 +03:00
aap
90b624a3e0
Merge pull request #812 from Nick007J/miami 
CWorld done + top gear fix
 2020-11-12 11:40:19 +01:00
Sergeanur
feeab0b74a Fix ini reader 2020-11-11 20:57:44 +02:00
aap
0115b0827b fix wrong blend mode (original bug) 2020-11-11 19:10:22 +01:00
aap
79432dce20 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-11-11 14:42:12 +01:00
aap
ff44f29616 ped fix for new renderer 2020-11-11 14:42:02 +01:00
Nikolay
a76c6b2307 damn 2020-11-11 13:40:11 +03:00
Nikolay
984708dfd3
damn 2020-11-11 13:36:10 +03:00
Nikolay
a8b5303207
Update src/control/Pickups.cpp 
Co-authored-by: Sergeanur <s.anureev@yandex.ua>
 2020-11-11 13:19:21 +03:00
erorcun
67e57d1368 Fix RestoreDef crash 2020-11-11 13:08:22 +03:00
Nikolay Korolev
35874b5fd2 fix 2020-11-11 12:27:40 +03:00
Nikolay Korolev
a67d4c70d7 Merge remote-tracking branch 'upstream/miami' into miami 2020-11-11 12:22:57 +03:00
Nikolay Korolev
be92957328 fixed top gear 2020-11-11 12:21:30 +03:00
aap
546ed0ff07 changes to RW layer so loading foreign files works 2020-11-11 09:42:30 +01:00
aap
48d0653331 urgh, merge and changes to RW layer in one commit. 2020-11-11 09:38:33 +01:00
Nikolay Korolev
612a6dd06c Merge remote-tracking branch 'upstream/miami' into miami 2020-11-11 00:08:54 +03:00
Nikolay Korolev
ef2089cafb CWorld done 2020-11-11 00:08:32 +03:00
Sergeanur
5c64dba65a
Merge pull request #771 from theR4K/miamiDev 
more audio for god of audio
 2020-11-10 22:32:12 +02:00
erorcun
460f3cea44 Frontend: Scroll for All, some care for PS2-like menu 
Don't show Back button on PS2-like menu
Removed PS2-style reversed fade-in, because it was a hack and taking too much space
 2020-11-10 02:07:02 +03:00
erorcun
59f9c009ef Font: Hud: Use orig. text dimensions, fix right-align calculations 2020-11-10 01:50:34 +03:00
majestic
cf6a9a8341 CGlass indices fix 2020-11-09 06:18:49 -08:00
Sergeanur
51e7f44433 Pickup fix 2020-11-08 22:40:05 +02:00
Roman Masanin
c91d5a90a1 easy way to safe few petaseconds 2020-11-08 23:29:57 +03:00
Sergeanur
23d294fef5 Possibly fix pickup money text 2020-11-08 21:59:13 +02:00
Roman Masanin
fb2173c396 to make Serge and _R4K_ happy 2020-11-08 22:33:30 +03:00
Roman Masanin
363a2c6098 marked stupied code(dotProduct and AudioEvents) 2020-11-08 22:26:14 +03:00
Roman Masanin
612bd98039 return bad code, becouse no one knows what to do with it 2020-11-08 21:30:03 +03:00
Roman Masanin
0853a47a3f returned bad code, becouse no one knows what to do with it 2020-11-08 21:23:29 +03:00
erorcun
f8367ebdef Revert "Font: Fix text dimensions" 
This reverts commit 6729de49b1.
 2020-11-08 21:11:55 +03:00
Roman Masanin
279acfae59 pointers to referencies too 2020-11-08 20:50:46 +03:00
erorcun
fe5d0c9cdf Font: Hud: Use orig. text dimensions, fix right-align calculations 2020-11-08 20:49:47 +03:00
Roman Masanin
e269809bfd Merge branch 'master' of https://github.com/GTAmodding/re3 2020-11-08 20:32:31 +03:00
Roman Masanin
95bd5b073a pointers into referencies! 2020-11-08 20:31:24 +03:00
Roman Masanin
a553ac8716 fix for merge fix 2020-11-08 17:49:10 +03:00
Roman Masanin
f8cc86c227 fix merge 2020-11-08 16:23:20 +03:00
Roman Masanin
23d23f6462 merge upstream 2020-11-08 16:23:05 +03:00
Sergeanur
a2e0373d22 Pickups fix 2020-11-08 15:00:54 +02:00
erorcun
c96ffb05b1
Merge pull request #809 from erorcun/master 
Fix build without CFO, NO_ISLAND_LOADING, save postfx/pipeline mults
 2020-11-07 23:51:07 +03:00
erorcun
163c12608f Fix build without CFO, NO_ISLAND_LOADING, save postfx/pipeline mults 2020-11-07 21:58:23 +03:00
Sergeanur
7f4498e0f0 Check if buttons txd exsist 2020-11-07 20:54:38 +02:00
Sergeanur
7ede8685ec Ped comments fixes 2020-11-07 14:39:53 +02:00
Sergeanur
3b81eaa2d7 Fix cAudioManager::GetPhrase 2020-11-07 13:55:55 +02:00
aap
092f32ba67 move stuff into define 2020-11-07 12:52:11 +01:00
Filip Gawin
e24513d2ad Sfx audio logic 2020-11-06 18:42:52 +01:00
Filip Gawin
f442793d20 Allow to handle larger files via 64bit variables 2020-11-06 18:42:28 +01:00
withmorten
bd78b5ff4e add bInvertLook4Pad from VC (doesn't get saved yet) 2020-11-05 19:57:13 +01:00
aap
ee8366adba RwRenderStateGet 2020-11-05 17:46:28 +02:00
aap
8614f68620 RwRenderStateGet 2020-11-05 16:42:57 +01:00
Sergeanur
8224a6a381 Button icons 2020-11-05 17:05:16 +02:00
Sergeanur
5a59542679 Fix inverted vertical camera 2020-11-05 16:38:41 +02:00
aap
0d55b6182a Merge pull request #795 from withmorten/master 
enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds
# Conflicts:
#	premake5.lua
#	src/core/config.h
 2020-11-05 16:38:02 +02:00
aap
881a3e1091
Merge pull request #795 from withmorten/master 
enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds
 2020-11-05 10:59:02 +01:00
aap
67c894cda9 more fixes to new renderer 2020-11-04 23:11:27 +01:00
aap
0662de5323 fixed vehicle and ped sorting for new renderer 2020-11-04 22:45:01 +01:00
aap
244b91ee80 fixed boats for new renderer 2020-11-04 16:22:15 +01:00
Roman Masanin
89b622eea8 FORMAT 2020-11-04 11:37:17 +03:00
aap
e1279b01bc forget ifdef 2020-11-03 20:40:33 +01:00
aap
6857e26411 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-11-03 20:33:14 +01:00
aap
3c5bb4e8f3 new LCS-style renderer 2020-11-03 20:33:07 +01:00
aap
b3da518ae0 only do backface culling on buildings 2020-11-03 16:59:37 +01:00
aap
ebddb7956c fix mistake in custom menu; update librw 2020-11-03 14:37:00 +01:00
Sergeanur
f08b9cf033 fix build 2020-11-03 15:00:48 +02:00
erorcun
770a1f8012
Merge pull request #789 from erorcun/master 
rewrite CFO + postfx/pipeline options
 2020-11-03 01:43:53 +03:00
Nikolay Korolev
e473123a6a fixes 2020-11-03 00:07:25 +03:00
Nikolay Korolev
0ccc70c843 embarassing 2020-11-02 23:53:52 +03:00
Sergeanur
d4c26396c7 Fix MemoryCard.cpp 2020-11-02 18:17:37 +02:00
Filip Gawin
1df6dda546 Add basic support for cmake on linux 2020-11-02 17:07:04 +01:00
aap
8acc98563e Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-11-02 13:57:58 +01:00
aap
7041f11987 bike bug 2020-11-02 13:57:51 +01:00
Nikolay Korolev
bae6c24209 fix 2020-11-02 15:54:42 +03:00
shfil
e587974759
Fix include in Frontend_PS2.cpp 2020-11-02 13:31:25 +01:00
Roman Masanin
174424c520 fix serviceSoundEffects an cleanup 2020-11-02 12:05:23 +03:00
Roman Masanin
fad0a9507d some "optimizations". same like I did in VC 2020-11-01 23:48:03 +03:00
Roman Masanin
cebf32c46c mark code 2020-11-01 23:38:45 +03:00
Roman Masanin
5ea9285c5b changes in switch, and mark code 2020-11-01 22:42:45 +03:00
Roman Masanin
55c4346610 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev 2020-11-01 22:35:46 +03:00
Nikolay Korolev
5edd9e75da finished script and replay 2020-11-01 18:21:05 +03:00
Nikolay Korolev
45c09224f7 fixed KYFC 2020-11-01 16:34:39 +03:00
Nikolay Korolev
370d693f9d the driver fix 2020-11-01 15:15:23 +03:00
Sergeanur
30d1cbfecd Fix the goddamn spaces for tabs master race 2020-11-01 13:46:12 +02:00
Sergeanur
37943a87cb Show Xbox buttons when playing with a controller 2020-11-01 13:42:02 +02:00
Nikolay Korolev
63a27fbc5f overflow fix 2020-11-01 13:55:29 +03:00
Sergeanur
db84afd263 Revert 2020-11-01 12:31:37 +02:00
Sergeanur
1f5a6dab67 Revert 2020-11-01 12:30:23 +02:00
aap
b8b3292161
Merge pull request #791 from majesticCoding/miami 
CObject::Render
 2020-11-01 10:40:30 +01:00
Nikolay Korolev
f21cfef8fb remove autosave at end of mission under MISSION_REPLAY 2020-11-01 12:33:16 +03:00
aap
9598a90627 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-11-01 10:29:37 +01:00
aap
7f5806b727 tiny cleanup 2020-11-01 10:29:28 +01:00
Sergeanur
20ea2fde84 Also fix SetModelIndex in CAutomobile and CTrain ctors 2020-11-01 09:46:25 +02:00
Sergeanur
5711251b0f Also fix SetModelIndex in CAutomobile and CTrain ctors 2020-11-01 09:46:02 +02:00
Sergeanur
3c4f166a82 Fix virtual SetModelIndex call in CBoat ctor 2020-11-01 09:34:10 +02:00
majestic
c124e7381c CObject::Render 2020-11-01 00:25:35 -07:00
Sergeanur
d370c2076d Fix virtual SetModelIndex call in CBoat ctor 2020-11-01 09:20:37 +02:00
withmorten
e9735f928f add ifdef LIBRW guard for pipelines and colourfilter 2020-11-01 01:09:46 +01:00
aap
30c0f26f17 fix sniper crosshair 2020-10-31 22:09:43 +01:00
aap
32c1135cd4 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-10-31 22:08:43 +01:00
aap
9203a33646 fix sniper/camera crosshair 2020-10-31 22:07:58 +01:00
aap
3665a82418 Merge pull request #792 from withmorten/master 
fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
# Conflicts:
#	src/core/Frontend.cpp
 2020-10-31 19:21:10 +02:00
aap
6eef54e3fc
Merge pull request #792 from withmorten/master 
fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
 2020-10-31 17:06:25 +01:00
aap
7d64698322 foobar! 2020-10-31 14:45:26 +01:00
aap
ea5b86774d couple of fixes and cleanup 2020-10-31 14:33:49 +01:00
Sergeanur
0e1257cf17 Disable loading screen 2020-10-30 20:32:41 +02:00
erorcun
ded7c89602
Update MenuScreensCustom.cpp 2020-10-30 17:36:13 +03:00
erorcun
7784ba052e
Update config.h 2020-10-30 17:24:20 +03:00
Sergeanur
b8d2c4e452 Add VB file list 2020-10-30 10:34:13 +02:00
withmorten
d34d591ed3 fix draw menu version text ifdef location 2020-10-29 19:53:23 +01:00
withmorten
57b01ac476 NO_MOVIES and DEBUGMENU not for MASTER 2020-10-29 19:23:59 +01:00
aap
317393d763 few more fixes to last commit 2020-10-29 19:21:16 +01:00
withmorten
e95516032f fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL, add extra defines for menu and game version text 2020-10-29 19:18:46 +01:00
aap
e97366c023 implemented extra model flags for backface culling and alpha test from mobile 2020-10-29 19:11:47 +01:00
erorcun
922d06ab1f rewrite CFO + postfx/pipeline options 2020-10-28 15:05:04 +03:00
aap
81e462b677 Merge branch 'master' of github.com:GTAmodding/re3 2020-10-28 10:33:46 +01:00
aap
a5447306c4 fixed skin on player head 2020-10-28 10:33:27 +01:00
Sergeanur
86b1d9aea5 OpenAL channels now use their own sound buffers 
# Conflicts:
#	src/audio/sampman_oal.cpp
 2020-10-28 10:09:59 +02:00
Fire-Head
f7b1ba4049 fix FireShotgun missing normalise 2020-10-28 03:10:53 +03:00
Fire-Head
e2dc1ba102 fix rainraindrop 2020-10-27 18:55:28 +03:00
aap
f1c935ac4c stupid bug; update librw 2020-10-27 16:20:47 +01:00
aap
ee222d0384 stupid bug; update librw 2020-10-27 16:15:30 +01:00
aap
a4d198005d boolean for extended pipelines 
(cherry picked from commit 78ac22ee2c)
 2020-10-27 15:57:26 +01:00
aap
78ac22ee2c boolean for extended pipelines 2020-10-27 15:55:07 +01:00
Sergeanur
4cfb3b0984 OpenAL channels now use their own sound buffers 2020-10-27 09:35:09 +02:00
erorcun
ba0c96c39c Revert "(TEST) Try to fix OAL audio problems" 
This reverts commit 19cc6fafe0.
 2020-10-27 00:40:12 +03:00
Sergeanur
d94b36c202 Fixes to OpenAL 2020-10-26 20:13:50 +02:00
Sergeanur
9a3758bfc1 Fix undefined colorId for pickups 2020-10-26 16:39:43 +02:00
Roman Masanin
c3cbf4353d Fix build and use enum in ProcessPlayerMood 2020-10-26 14:02:11 +03:00
erorcun
19cc6fafe0 (TEST) Try to fix OAL audio problems 2020-10-26 12:35:24 +03:00
Roman Masanin
4bcd176944 fix merge 2020-10-26 00:17:21 +03:00
Roman Masanin
44bbcbd14a merge upstream 2020-10-26 00:16:46 +03:00
Roman Masanin
96ccb1333b cleanup processVehicleOneShots, processVehicleX done 2020-10-26 00:14:59 +03:00
Roman Masanin
04b841c719 processVehicleOneShots 2020-10-26 00:11:04 +03:00
erorcun
6729de49b1 Font: Fix text dimensions 2020-10-25 20:57:24 +03:00
Nikolay Korolev
3bdc974ff5 small glass fix 2020-10-25 20:53:05 +03:00
aap
adfa2645bf Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-10-25 16:17:43 +01:00
aap
537c0960fe clean up timebar ifdefs 2020-10-25 16:17:31 +01:00
aap
e3a1041a47 clean up timebar ifdefs 2020-10-25 16:17:30 +01:00
erorcun
0a36629502 Finalize frontend sounds, player setup screen 2020-10-25 18:01:09 +03:00
Roman Masanin
211ab16ddb skiding 2020-10-25 16:14:29 +03:00
erorcun
5b8437172a Fix weapon icon drawing 2020-10-25 15:27:49 +03:00
Sergeanur
6647dd043d Remove redundant includes 2020-10-25 13:08:28 +02:00
Sergeanur
83947e6958 Remove redundant includes 2020-10-25 13:07:44 +02:00
Sergeanur
e0394e6e69 Possible fix of linux build 2020-10-25 12:38:08 +02:00
Sergeanur
a520243563 cAudioManager::ProcessFrontEnd done 2020-10-25 12:00:57 +02:00
Sergeanur
6634410aee Fix build 2020-10-25 09:50:17 +02:00
Sergeanur
93b318cfdf DMAudio fixes 2020-10-25 09:42:24 +02:00
Sergeanur
aac0c3fb67 DMAudio fixes 2020-10-25 09:40:11 +02:00
erorcun
de09a80a35 Messages fix and update librw 2020-10-25 01:21:18 +03:00
erorcun
5e5854b914 Fix bindings not loaded on Linux 2020-10-25 01:10:03 +03:00
erorcun
d0e80e8c97 librw update 2020-10-24 23:56:21 +03:00
Sergeanur
d1394c6994 Fix WindModifiers 2020-10-24 22:28:44 +03:00
Roman Masanin
a12789c632 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev 2020-10-24 22:26:56 +03:00
Roman Masanin
63c7df9f09 mark reflections done 2020-10-24 22:26:45 +03:00
Roman Masanin
c4707fe887 fix merging errors 2020-10-24 22:06:45 +03:00
erorcun
92ae468e00 Messages and CameraSize fix 2020-10-24 21:56:04 +03:00
Sergeanur
04845a72bc Model indices edits 2020-10-24 21:33:15 +03:00
Roman Masanin
a9db60a1d9 jumbo 2020-10-24 20:47:03 +03:00
Roman Masanin
beae41b207 fires 2020-10-24 19:43:11 +03:00
erorcun
29a2d810a7 WaterLevel (Beachtoys) 2020-10-24 19:31:18 +03:00
Roman Masanin
19ffb9c8df model heli 2020-10-24 19:24:48 +03:00
Adrian Graber
28fb26f792 Join CdStream threads to wait for them to exit 2020-10-24 18:14:41 +03:00
erorcun
07d1637342
Merge pull request #779 from Sergeanur/VC/Pickups 
Pickups Done
 2020-10-24 17:56:21 +03:00
erorcun
088065e0a8
Merge pull request #778 from majesticCoding/miami 
Fluff done, FireInstantHit fix
 2020-10-24 17:56:03 +03:00
erorcun
0913abe616
Merge pull request #780 from Sergeanur/VC/ObjectData 
ObjectData
 2020-10-24 17:55:40 +03:00
Adrian Graber
a32c390a95 Join CdStream threads to wait for them to exit 2020-10-24 16:12:10 +02:00
Sergeanur
3d14097bf6 Fix playback of vanilla opus 2020-10-24 16:37:39 +03:00
Sergeanur
a492f8ba0d Fix playback of vanilla opus 2020-10-24 16:37:14 +03:00
Roman Masanin
39b7075502 merge Upstream 2020-10-24 14:20:08 +03:00
Sergeanur
a0efb89aa0 more ScriptSounds 2020-10-23 18:35:37 +03:00
majestic
6a89fe401a Fluff done, FireInstantHit fix 2020-10-23 07:51:24 -07:00
Sergeanur
ca497e2cbd ScriptSounds 2020-10-23 16:56:34 +03:00
Sergeanur
d7b9884f9d Use audio enum 2020-10-23 16:18:46 +03:00
Sergeanur
1544683bdc Missed nil 2020-10-23 13:23:42 +03:00
Sergeanur
9f692ea3ab Missed nil 2020-10-23 13:23:05 +03:00
Sergeanur
d237bb694b Small CPedModelInfo fixes 2020-10-23 13:11:51 +03:00
Sergeanur
f8a7f47fde Small CPedModelInfo fixes 2020-10-23 13:06:40 +03:00
Sergeanur
89a7007c6a ObjectData 2020-10-23 08:41:23 +03:00
Sergeanur
281e45ce01 Timer fix 2020-10-23 08:38:36 +03:00
erorcun
067200dd7e mr.casepath 2 2020-10-23 04:37:01 +03:00
erorcun
08d78fb6ff Timer, main 2020-10-23 04:26:52 +03:00
erorcun
1587815fca satisfy mr.casepath 2020-10-23 04:25:55 +03:00
erorcun
bedc066cfd mr.casepath 2020-10-23 01:56:32 +03:00
Sergeanur
1cdc647324 Fix argument type 2020-10-22 22:05:50 +03:00
Sergeanur
86a7d4415b Fix argument type 2020-10-22 22:04:12 +03:00
Sergeanur
ee61f19253 Police Radio + fixes 2020-10-22 12:38:09 +03:00
Sergeanur
94f0ecfa21 Police Radio fixes 2020-10-22 12:36:47 +03:00
erorcun
70f625d211 Message fix 2020-10-21 21:39:57 +03:00
erorcun
86002b093f EmergencyPed, PedDebug, message fix 2020-10-21 21:27:13 +03:00
Sergeanur
bd8d8b53a3 CTempColModels small fix 2020-10-21 21:26:10 +03:00
Sergeanur
ff2665942e CTempColModels stuff 2020-10-21 21:24:18 +03:00
Sergeanur
2709531f09 Rename CObject flag 2020-10-21 21:14:40 +03:00
Sergeanur
e9a89236a2 Pickups Done 2020-10-21 21:00:13 +03:00
Sergeanur
632569cff3 Pickup fixes 2020-10-21 19:48:13 +03:00
erorcun
0265804003 Cross-platform fix and a little style change 2020-10-21 03:55:35 +03:00
erorcun
af53267b74 Text and cross-platform fix 2020-10-21 03:11:10 +03:00
majestic
1fef3e106c Fluff done 2020-10-20 16:03:41 -07:00
majestic
b36759b586 /c/Users/misha/Documents/GitHub/re3/src/render/Fluff.cpp /c/Users/misha/Documents/GitHub/re3/src/render/Fluff.h 2020-10-20 15:49:29 -07:00
erorcun
0750f04019 Messages, fix Font 2020-10-20 22:24:56 +03:00
erorcun
42fbe7572e Messages, fix Font 2020-10-20 22:19:05 +03:00
Roman Masanin
0594ed5b46 peds 2020-10-18 23:03:03 +03:00
Nikolay Korolev
a1112183de fix 2020-10-18 22:53:25 +03:00
Nikolay Korolev
6173e1dd10 fix 2020-10-18 22:52:49 +03:00
Nikolay Korolev
e2c29a3b28 fix 2020-10-18 22:15:44 +03:00
Nikolay Korolev
fb80236214 fixed ped attractor crash 2020-10-18 21:17:37 +03:00
Filip Gawin
7ae25761d5 Tweak comparison in CFallingGlassPane::Render 2020-10-18 19:57:39 +02:00
erorcun
0eb4aca1d6 Fix build 2020-10-18 20:09:55 +03:00
erorcun
1858904ce0
Merge pull request #769 from Sergeanur/VC/Pickups 
Partial Pickups
 2020-10-18 20:01:32 +03:00
erorcun
10758088ef
Merge pull request #766 from Fire-Head/miami 
Glass
 2020-10-18 19:59:11 +03:00
erorcun
70f9832e14
Merge branch 'miami' into miami 2020-10-18 19:45:11 +03:00
erorcun
497c179245
Merge pull request #772 from Nick007J/miami 
Original save/load support + bugfixes
 2020-10-18 19:37:49 +03:00
erorcun
20ab7d1739 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-18 19:31:39 +03:00
erorcun
937290db09 Fix attractor even more 2020-10-18 19:31:02 +03:00
erorcun
a6aa782d6d Fixes and style changes from miami 2020-10-18 19:16:37 +03:00
Sergeanur
8697eebbc2 Merge branch 'miami' into VC/Pickups 
# Conflicts:
#	src/control/Pickups.cpp
 2020-10-18 17:17:11 +03:00
Sergeanur
0d20f1c364 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/RoadBlocks.cpp
#	src/entities/Entity.h
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/render/Renderer.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/CarGen.cpp
#	src/weapons/BulletInfo.cpp
#	src/weapons/Weapon.cpp
 2020-10-18 17:15:49 +03:00
Sergeanur
cc0ae51631 lil fix 2020-10-18 16:55:11 +03:00
Sergeanur
b91f6a4550 Setter for bIsStatic (became virtual in SA) 2020-10-18 16:40:06 +03:00
erorcun
1b59b2c9bc Attractor obj. fixes 2020-10-18 16:38:36 +03:00
Filip Gawin
23220d799c Cleanup breaks CAutomobile::ProcessOpenDoor 2020-10-18 15:26:20 +02:00
Filip Gawin
747fe7ab67 Merge branch 'master' of github.com:GTAmodding/re3 into master 2020-10-18 15:14:03 +02:00
Filip Gawin
3594b35fbb Add missing breaks in AudioLogic.cpp 2020-10-18 15:13:43 +02:00
Nikolay Korolev
8d92a0681a fix in ped attractor 2020-10-18 15:39:27 +03:00
eray orçunus
ab071163e5 Fix ped buoyancy 2020-10-18 14:34:20 +03:00
eray orçunus
f60e3d667a Minor things 2020-10-18 13:53:17 +03:00
shfil
cafe4e38db Script.cpp missing breaks 2020-10-18 13:37:17 +03:00
Nikolay Korolev
c856d88691 object field renamed 2020-10-18 12:34:34 +03:00
Sergeanur
b3385015e5 Merge remote-tracking branch 'origin/miami' into VC/Pickups 2020-10-18 04:54:01 +03:00
shfil
82f54b946f Script.cpp missing breaks 2020-10-18 00:56:07 +02:00
Roman Masanin
9cf38634b9
ProcessWaterCannon bug and refractoring (#773) 
* fix audio bug and some refractoring

* mark original bugs
 2020-10-17 20:56:42 +02:00
Roman Masanin
1e3aabf654 fix bugs 2020-10-17 21:30:48 +03:00
Nikolay Korolev
720abca826 finished save/load 2020-10-17 20:45:07 +03:00
Roman Masanin
3cbccd2ad3 typo fixes 2020-10-17 19:05:41 +03:00
Nikolay Korolev
cae3990eac Merge remote-tracking branch 'upstream/miami' into miami 2020-10-17 18:50:41 +03:00
Nikolay Korolev
1195f3db7b saves part 1 2020-10-17 18:50:16 +03:00
erorcun
4e4e0e8e04
Merge pull request #765 from erorcun/miami 
Radar, WaterCannon, win/glfw skels
 2020-10-17 18:39:56 +03:00
Sergeanur
588fb26728 Fix player model not changing in cutscenes 2020-10-17 18:26:48 +03:00
eray orçunus
b84dc2bc9b Fix management issue 2020-10-17 18:10:37 +03:00
eray orçunus
dc80884ab5 Fix management issue 2020-10-17 18:07:20 +03:00
Sergeanur
e465cea07b Pickup arrays done 2020-10-17 18:05:23 +03:00
eray orçunus
b98864d134 Radar, WaterCannon, win/glfw skels 2020-10-17 17:35:26 +03:00
Sergeanur
7fc70179ed Pickup save/load 2020-10-17 17:06:38 +03:00
Roman Masanin
eeee5012b7 model cars and other audio stuff 2020-10-17 16:57:36 +03:00
Sergeanur
7f3b51dd17 Small inner fix 2020-10-17 16:04:11 +03:00
Sergeanur
63666391d4 More Pickup stuff 2020-10-17 15:57:12 +03:00
Sergeanur
516a02d2da Fix pickup fix :P 2020-10-17 15:33:22 +03:00
Sergeanur
ca64a49af1 fix build 2020-10-17 14:23:31 +03:00
Nikolay Korolev
0cf2c8505e cranes done 2020-10-17 14:18:20 +03:00
Sergeanur
1f36b78c20 Pickup fixes 2020-10-17 13:48:08 +03:00
Nikolay Korolev
40434eadfd small fix 2020-10-17 12:31:14 +03:00
Sergeanur
ef47dad566 Partial Pickups 2020-10-17 08:23:01 +03:00
Roman Masanin
97fc5224e7 road noise 2020-10-17 02:22:02 +03:00
Roman Masanin
894a1ae93a siren and horn 2020-10-17 00:27:28 +03:00
Roman Masanin
63c2b98c5e fix build 2020-10-15 16:04:03 +03:00
Roman Masanin
07143ee73b SpecialFX fixes 2020-10-15 15:52:37 +03:00