Commit Graph

3285 Commits

Author SHA1 Message Date
erorcun
05fb47bdb0 Fix wrong call on free cam (now it's faster) 2020-12-21 02:36:09 +03:00
erorcun
9b9545b92a Car entering cancel test 2020-12-21 02:06:00 +03:00
erorcun
26aed6611e fix auto duck cancel bug 2020-12-21 01:15:40 +03:00
erorcun
ca4602d788 Fix free cam aiming 2 2020-12-20 21:53:06 +03:00
aap
43b4c8dd33 some more little ps2 fixes 2020-12-20 19:13:58 +01:00
aap
f60b450ee8 main.cpp mostly checked against ps2 now 2020-12-20 19:13:37 +01:00
aap
84a9ca0524 Merge branch 'master' of github.com:GTAmodding/re3 2020-12-20 17:35:59 +01:00
aap
036263993e ps2 fixes 2020-12-20 17:35:46 +01:00
aap
bfb749d842 ps2 fixes 2020-12-20 17:35:37 +01:00
erorcun
9e1e5d200a disabled PS2_HUD by default 2020-12-20 18:16:56 +03:00
Nikolay Korolev
dcb28bfd53 fix 2020-12-20 17:12:34 +03:00
Nikolay Korolev
db012aa9e0 Merge remote-tracking branch 'upstream/master' 2020-12-20 17:08:21 +03:00
Nikolay Korolev
fc72ff24d0 implemented collectives in script 2020-12-20 17:07:58 +03:00
aap
30c8f870eb little ps2 fixes 2020-12-20 14:28:09 +01:00
aap
b48445cc7e Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-20 14:27:56 +01:00
aap
fc312113d2 some PS2 things 2020-12-20 14:27:48 +01:00
Sergeanur
2e90ce9cc5 uncomment InitRadioStationPositionList 2020-12-20 13:41:29 +02:00
Sergeanur
be92b57b54 buildings directory
# Conflicts:
#	premake5.lua
2020-12-20 12:40:59 +02:00
Sergeanur
affd3c6baa buildings directory 2020-12-20 12:39:44 +02:00
erorcun
ae7cb92437 fixes to last HUD commits 2020-12-20 05:49:55 +03:00
Fire-Head
0bea6d039b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-19 22:33:17 +03:00
Fire-Head
4d4758bc1e scaling 2020-12-19 22:31:54 +03:00
Fire-Head
140fa2a21c restore original code, fixes, ps2 font 2020-12-19 21:25:45 +03:00
erorcun
4c46d24983
style change 2020-12-19 20:39:42 +03:00
aap
2a51e1da04 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-19 17:27:01 +01:00
Nikolay Korolev
b6298915dd fixed cmakelists 2020-12-19 16:21:33 +03:00
Nikolay Korolev
196a13b1cc removed renderer stuff 2020-12-19 14:52:32 +03:00
Nikolay Korolev
76a564df2e fixed review stuff 2020-12-19 14:33:22 +03:00
Nikolay Korolev
17efc38e35 removed cullzones stuff from renderer 2020-12-19 12:27:16 +03:00
Nikolay Korolev
bf90fed2b7 fixes 2020-12-19 11:49:19 +03:00
Nikolay Korolev
e3aac6263f Merge remote-tracking branch 'upstream/miami' into miami 2020-12-19 03:21:32 +03:00
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
df5bafc80c anim fixes 2020-12-18 23:47:38 +01:00
aap
9982f1f21b anim compression 2020-12-18 23:46:51 +01:00
aap
73d080bcc8 silly mistake 2020-12-18 23:39:59 +01:00
aap
c17ccc50ab get rid of all PED_SKIN defines 2020-12-18 17:27:18 +01:00
aap
75a9976cbc memorymgr fix 2020-12-18 14:33:54 +01:00
aap
f3a356375e added MemoryHeap from III, MemoryMgr 2020-12-18 14:19:03 +01:00
aap
a080fbfbd4 little cleanup of templates 2020-12-18 13:58:59 +01:00
aap
55cf1a37cb Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-18 13:50:37 +01:00
aap
a7050458ae little cleanup and synch on templates and config 2020-12-18 13:50:26 +01:00
aap
db752d141b
Merge pull request #889 from aap/miami
CMBlur FX
2020-12-18 13:31:24 +01:00
Sergeanur
cfda5eb148 PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes 2020-12-18 02:58:09 +02:00
Sergeanur
e9a5670348 PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes 2020-12-18 02:57:54 +02:00
aap
cc5af26417 PreAllocateRwObjects 2020-12-17 12:47:00 +01:00
erorcun
dd579c4080 Fix 2020-12-17 02:47:48 +03:00
Sergeanur
2903ebe296 Fix placement of some script functions
# Conflicts:
#	src/control/Script5.cpp
2020-12-16 23:29:17 +02:00
Sergeanur
9a9b1e7574 Fix placement of some script functions 2020-12-16 23:28:06 +02:00
aap
1af5065df7 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-16 21:54:01 +01:00
aap
e9df32a983 finished CMBlur 2020-12-16 21:53:47 +01:00
erorcun
8e45439205 Use scrolling if GRAPHICS_MENU_OPTIONS not defined, like miami 2020-12-16 23:45:18 +03:00
erorcun
12d16ddc06 Fixes and style changes 2020-12-16 23:28:25 +03:00
aap
9200810f60 update librw with stencil states 2020-12-16 15:49:22 +01:00
aap
7d89e955fe ;end of fucking waterlevel 2020-12-16 13:38:09 +01:00
aap
c42463bf4e more tidy water sync 2020-12-16 13:32:13 +01:00
aap
78c7459b3a more tiny water sync 2020-12-16 13:32:03 +01:00
aap
0d97a31ce9 tiny water sync 2020-12-16 13:25:45 +01:00
aap
c4c92c357f tidy water sync 2020-12-16 13:25:23 +01:00
erorcun
23b5e664dc Sync Frontend with miami 3/3 2020-12-16 00:38:26 +03:00
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